diff options
Diffstat (limited to 'linden/scripts/linux/3-compile-SL-source')
-rwxr-xr-x | linden/scripts/linux/3-compile-SL-source | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/linden/scripts/linux/3-compile-SL-source b/linden/scripts/linux/3-compile-SL-source index 34395bb..4ac80a7 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 | |||
54 | function compile() { | 54 | function compile() { |
55 | cd $PATH_TO_SOURCES/indra | 55 | cd $PATH_TO_SOURCES/indra |
56 | echo "Compiling the client into $TEMP_DIR..." | 56 | echo "Compiling the client into $TEMP_DIR..." |
57 | nice -n 19 ionice -c 3 ./develop.py --type=Release build | 57 | nice -n 19 $ionice ./develop.py $os_extra --type=$TYPE build |
58 | # if (($? == 0)) ; then | ||
59 | # mv -f $PATH_TO_SOURCES/indra/viewer-linux-i686*/newview/SecondLife*.tar.bz2 $HOME/ | ||
60 | # fi | ||
61 | } | 58 | } |
62 | 59 | ||
63 | ########### end of functions ########### | 60 | ########### end of functions ########### |
@@ -66,14 +63,7 @@ if [ "$TEMP_DIR" == "" ] ; then | |||
66 | export TEMP_DIR="/usr/tmp/$USER" | 63 | export TEMP_DIR="/usr/tmp/$USER" |
67 | fi | 64 | fi |
68 | 65 | ||
69 | # Check to see if we simply want to retry a compilation: | ||
70 | if [ "$1" == "--retry" ] ; then | ||
71 | compile | ||
72 | exit $? | ||
73 | fi | ||
74 | |||
75 | # Use the parameter (if any) as the path to the archives: | 66 | # Use the parameter (if any) as the path to the archives: |
76 | |||
77 | PATH_TO_ARCHIVES=`pwd` | 67 | PATH_TO_ARCHIVES=`pwd` |
78 | if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then | 68 | if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then |
79 | if [ -d $1 ] ; then | 69 | if [ -d $1 ] ; then |
@@ -83,19 +73,4 @@ if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then | |||
83 | fi | 73 | fi |
84 | 74 | ||
85 | cd $PATH_TO_SOURCES/indra | 75 | cd $PATH_TO_SOURCES/indra |
86 | |||
87 | # Do a clean build | ||
88 | #./develop.py clean | ||
89 | |||
90 | # Force the vectorization use if we chose so. | ||
91 | if [ "$FORCE_VECTORIZE" == "yes" ] ; then | ||
92 | TUNE_FLAGS="$TUNE_FLAGS -DLL_VECTORIZE=1" | ||
93 | fi | ||
94 | if [ "$ALLOW_WARNINGS" == "yes" ] ; then | ||
95 | FATAL_WARNINGS="-DGCC_DISABLE_FATAL_WARNINGS:BOOL=TRUE" | ||
96 | else | ||
97 | FATAL_WARNINGS="" | ||
98 | fi | ||
99 | |||
100 | time compile | 76 | time compile |
101 | |||