From 8fa60cf0f49c872402aa72d486e1f900a166d951 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 18 Apr 2013 14:03:24 +1000
Subject: New branch for building with nmake.

This is a branch, coz it's still crap.
---
 linden/scripts/linux/3-compile-SL-source | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'linden/scripts/linux/3-compile-SL-source')

diff --git a/linden/scripts/linux/3-compile-SL-source b/linden/scripts/linux/3-compile-SL-source
index 34395bb..c932340 100755
--- a/linden/scripts/linux/3-compile-SL-source
+++ b/linden/scripts/linux/3-compile-SL-source
@@ -54,10 +54,7 @@ source config-SL-source
 function compile() {
     cd $PATH_TO_SOURCES/indra
     echo "Compiling the client into $TEMP_DIR..."
-    nice -n 19 ionice -c 3 ./develop.py --type=Release build
-#    if (($? == 0)) ; then
-#        mv -f $PATH_TO_SOURCES/indra/viewer-linux-i686*/newview/SecondLife*.tar.bz2 $HOME/
-#    fi
+    nice -n 19 $ionice ./develop.py $os_extra --type=Release build
 }
 
 ########### end of functions ###########
@@ -66,14 +63,7 @@ if [ "$TEMP_DIR" == "" ] ; then
     export TEMP_DIR="/usr/tmp/$USER"
 fi
 
-# Check to see if we simply want to retry a compilation:
-if [ "$1" == "--retry" ] ; then
-    compile
-    exit $?
-fi
-
 # Use the parameter (if any) as the path to the archives:
-
 PATH_TO_ARCHIVES=`pwd`
 if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then
     if [ -d $1 ] ; then
@@ -83,19 +73,4 @@ if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then
 fi
 
 cd $PATH_TO_SOURCES/indra
-
-# Do a clean build
-#./develop.py clean
-
-# Force the vectorization use if we chose so.
-if [ "$FORCE_VECTORIZE" == "yes" ] ; then
-    TUNE_FLAGS="$TUNE_FLAGS -DLL_VECTORIZE=1"
-fi
-if [ "$ALLOW_WARNINGS" == "yes" ] ; then
-    FATAL_WARNINGS="-DGCC_DISABLE_FATAL_WARNINGS:BOOL=TRUE"
-else
-    FATAL_WARNINGS=""
-fi
-
 time compile
-
-- 
cgit v1.1


From 37301a51d2d2f3731ada3ad2170cb9ec91945b62 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 19 Apr 2013 17:12:36 +1000
Subject: Allow the build scripts to build a configurable type, and make that
 type RelWithDebInfo.

---
 linden/scripts/linux/3-compile-SL-source | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/scripts/linux/3-compile-SL-source')

diff --git a/linden/scripts/linux/3-compile-SL-source b/linden/scripts/linux/3-compile-SL-source
index c932340..4ac80a7 100755
--- a/linden/scripts/linux/3-compile-SL-source
+++ b/linden/scripts/linux/3-compile-SL-source
@@ -54,7 +54,7 @@ source config-SL-source
 function compile() {
     cd $PATH_TO_SOURCES/indra
     echo "Compiling the client into $TEMP_DIR..."
-    nice -n 19 $ionice ./develop.py $os_extra --type=Release build
+    nice -n 19 $ionice ./develop.py $os_extra --type=$TYPE build
 }
 
 ########### end of functions ###########
-- 
cgit v1.1