From f83801ab59a77a76a5f30e20a2bb02e13318ec57 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Wed, 16 Feb 2011 15:46:34 -0800 Subject: temporarily turn off precompiled header usage to work around Incredibuild issues. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index a612a5c5cd..1eaa4a48b1 100755 --- a/build.sh +++ b/build.sh @@ -51,7 +51,7 @@ pre_build() { local variant="$1" begin_section "Pre$variant" - "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON + "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE end_section "Pre$variant" } -- cgit v1.3 From e713da24e3a591ee91e52ccd45cfe1c05c5dd769 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 17 Feb 2011 09:50:08 -0800 Subject: explicity call python scripts with python so they work on all platforms. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 1eaa4a48b1..eb34665eae 100755 --- a/build.sh +++ b/build.sh @@ -106,7 +106,7 @@ eval '$build_'"$arch" || pass # File no longer exists in code-sep branch, so let's make sure it exists in order to use it. if test -f scripts/update_version_files.py ; then begin_section UpdateVer - scripts/update_version_files.py \ + python scripts/update_version_files.py \ --channel="$viewer_channel" \ --server_channel="$server_channel" \ --revision=$revision \ @@ -117,7 +117,7 @@ fi # Now retrieve the version for use in the version manager # First three parts only, $revision will be appended automatically. -build_viewer_update_version_manager_version=`scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'` +build_viewer_update_version_manager_version=`python scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'` export autobuild_dir="$here/../../../autobuild/bin/" if [ -d "$autobuild_dir" ] -- cgit v1.3 From d9a47b33954010bbb1d52491940004368363641b Mon Sep 17 00:00:00 2001 From: Jennifer Leech Date: Fri, 25 Feb 2011 14:48:13 -0800 Subject: s/build-vc80/build-vc100/ --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index eb34665eae..f0bdc5d78d 100755 --- a/build.sh +++ b/build.sh @@ -27,7 +27,7 @@ build_dir_Linux() build_dir_CYGWIN() { - echo build-vc80 + echo build-vc100 } installer_Darwin() -- cgit v1.3 From a14c5e8f31ede83b0d72aec2ed363ae55b866b09 Mon Sep 17 00:00:00 2001 From: Jennifer Leech Date: Tue, 1 Mar 2011 11:30:47 -0800 Subject: Added 'env|sort' to build.sh for debugging TC builds. --- build.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index f0bdc5d78d..b75823f45f 100755 --- a/build.sh +++ b/build.sh @@ -141,6 +141,10 @@ fi # load autbuild provided shell functions and variables eval "$("$AUTOBUILD" source_environment)" +# dump environment variables for debugging +env|sort + + # Install packages. "$AUTOBUILD" install --skip-license-check -- cgit v1.3 From 6a10c803d3b7d16c25d085f19fafd404b95eb485 Mon Sep 17 00:00:00 2001 From: Jennifer Leech Date: Tue, 1 Mar 2011 14:26:24 -0800 Subject: Setting TMP env var to be used during builds. Possible collision when using VS2010 with system-wide TMP directory. Also temporarily disabling Debug and Release builds to get a faster loop cyle on TC. --- BuildParams | 8 ++++++++ build.sh | 2 ++ 2 files changed, 10 insertions(+) (limited to 'build.sh') diff --git a/BuildParams b/BuildParams index cf837dac70..3f2d74421a 100644 --- a/BuildParams +++ b/BuildParams @@ -238,4 +238,12 @@ viewer-asset-delivery-metrics.build_server_tests = false #============================================================================== viewer-autobuild.build_link_parallel = false viewer-vs2010.build_link_parallel = false + + +#============================================================================== +# vs2010 debug - for TC debugging only +#============================================================================== +viewer-vs2010.build_CYGWIN_Debug = false +viewer-vs2010.build_CYGWIN_Release = false + # eof diff --git a/build.sh b/build.sh index b75823f45f..645c6d05ac 100755 --- a/build.sh +++ b/build.sh @@ -165,6 +165,8 @@ do build_dir_stubs="$build_dir/win_setup/$variant" rm -rf "$build_dir" mkdir -p "$build_dir" + mkdir -p "$build_dir/tmp" + export TMP="$build_dir/tmp" if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 then if $build_link_parallel -- cgit v1.3 From d0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Thu, 3 Mar 2011 11:23:09 -0800 Subject: resolve merge conflict. --- build.sh | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 31820f9058..625a09009b 100755 --- a/build.sh +++ b/build.sh @@ -51,26 +51,7 @@ pre_build() { local variant="$1" begin_section "Pre$variant" -<<<<<<< local - #export PATH="/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/:$PATH" - python develop.py \ - --incredibuild \ - --unattended \ - -t $variant \ - -G "$cmake_generator" \ - configure \ - -DGRID:STRING="$viewer_grid" \ - -DVIEWER_CHANNEL:STRING="$viewer_channel" \ - -DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \ - -DINSTALL_PROPRIETARY:BOOL=ON \ - -DRELEASE_CRASH_REPORTING:BOOL=ON \ - -DLOCALIZESETUP:BOOL=ON \ - -DPACKAGE:BOOL=ON \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DLL_TESTS:BOOL="$run_tests" -======= - "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE ->>>>>>> other + "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE end_section "Pre$variant" } -- cgit v1.3 From c5ce29c871a28c90691eb7391a176c5e0cbead91 Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Wed, 16 Mar 2011 12:30:41 -0700 Subject: Comment out setting of TMP, do not recompute AUTOBUILD if it is already defined. --- build.sh | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 625a09009b..86693a6fdb 100755 --- a/build.sh +++ b/build.sh @@ -119,23 +119,26 @@ fi # First three parts only, $revision will be appended automatically. build_viewer_update_version_manager_version=`python scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'` -export autobuild_dir="$here/../../../autobuild/bin/" -if [ -d "$autobuild_dir" ] +if [ -z "$AUTOBUILD" ] then - export AUTOBUILD="$autobuild_dir"autobuild - if [ -x "$AUTOBUILD" ] + export autobuild_dir="$here/../../../autobuild/bin/" + if [ -d "$autobuild_dir" ] then - # *HACK - bash doesn't know how to pass real pathnames to native windows python - case "$arch" in - CYGWIN) AUTOBUILD=$(cygpath -u $AUTOBUILD.cmd) ;; - esac + export AUTOBUILD="$autobuild_dir"autobuild + if [ -x "$AUTOBUILD" ] + then + # *HACK - bash doesn't know how to pass real pathnames to native windows python + case "$arch" in + CYGWIN) AUTOBUILD=$(cygpath -u $AUTOBUILD.cmd) ;; + esac + else + record_failure "Not executable: $AUTOBUILD" + exit 1 + fi else - record_failure "Not executable: $AUTOBUILD" + record_failure "Not found: $autobuild_dir" exit 1 fi -else - record_failure "Not found: $autobuild_dir" - exit 1 fi # load autbuild provided shell functions and variables @@ -166,7 +169,7 @@ do rm -rf "$build_dir" mkdir -p "$build_dir" mkdir -p "$build_dir/tmp" - export TMP="$build_dir/tmp" + #export TMP="$build_dir/tmp" if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 then if $build_link_parallel -- cgit v1.3 From fea0cefcb3442ca640a7f502ba59398d32de3dbf Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Wed, 16 Mar 2011 16:44:19 -0700 Subject: Add a more precise error check for "autobuild source_environment". --- build.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 86693a6fdb..f0c5dc91fc 100755 --- a/build.sh +++ b/build.sh @@ -142,7 +142,16 @@ then fi # load autbuild provided shell functions and variables -eval "$("$AUTOBUILD" source_environment)" +if "$AUTOBUILD" source_environment > source_environment +then + . source_environment +else + # dump environment variables for debugging + env|sort + record_failure "autobuild source_environment failed" + cat source_environment >&3 + exit 1 +fi # dump environment variables for debugging env|sort -- cgit v1.3 From 92a68f350479cb4319c13e6784fb60e9d9b6d355 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 16 Mar 2011 22:45:50 -0700 Subject: Autobuild: go back to ignoring errors on autobuild source_environment invocation for the moment --- build.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index f0c5dc91fc..e302d95e76 100755 --- a/build.sh +++ b/build.sh @@ -142,16 +142,19 @@ then fi # load autbuild provided shell functions and variables -if "$AUTOBUILD" source_environment > source_environment -then - . source_environment -else +# Merov: going back to the previous code that passes even if it fails catching a failure +# TODO: use the correct code here under and fix the llbase import in python code +#if "$AUTOBUILD" source_environment > source_environment +#then +# . source_environment +#else # dump environment variables for debugging - env|sort - record_failure "autobuild source_environment failed" - cat source_environment >&3 - exit 1 -fi +# env|sort +# record_failure "autobuild source_environment failed" +# cat source_environment >&3 +# exit 1 +#fi +eval "$("$AUTOBUILD" source_environment)" # dump environment variables for debugging env|sort -- cgit v1.3