From b82c6af32ae72d0d29ce312f710ae58136c238a2 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Fri, 14 Jan 2011 15:39:37 -0800 Subject: first crack at getting TC build to work, cross your fingers... --- build.sh | 127 ++++++++++++++++----------------------------------------------- 1 file changed, 31 insertions(+), 96 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index cd1d9df6f3..05b464e43b 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,7 @@ build_dir_Darwin() build_dir_Linux() { - echo viewer-linux-i686-$(echo $1 | tr A-Z a-z) + echo build-linux-i686-$(echo $1 | tr A-Z a-z) } build_dir_CYGWIN() @@ -50,46 +50,19 @@ installer_CYGWIN() pre_build() { local variant="$1" - local build_dir="$2" begin_section "Pre$variant" - #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 + "$AUTOBUILD" install --skip-license-check + "$AUTOBUILD" configure -c $variant end_section "Pre$variant" } build() { local variant="$1" - local build_dir="$2" if $build_viewer then begin_section "Viewer$variant" - if python develop.py \ - --incredibuild \ - --unattended \ - -t $variant \ - -G "$cmake_generator" \ - build package -# && \ -# python develop.py \ -# --incredibuild \ -# --unattended \ -# -t $variant \ -# -G "$cmake_generator" \ -# build package + if "$AUTOBUILD" build -c $variant then echo true >"$build_dir"/build_ok else @@ -109,6 +82,7 @@ build_docs() end_section Docs } + # Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there if [ "x$arch" = x ] then @@ -116,15 +90,11 @@ then if [ -x "$top/../buildscripts/hg/bin/build.sh" ] then exec "$top/../buildscripts/hg/bin/build.sh" "$top" - elif [ -r "$top/README" ] - then - cat "$top/README" - exit 1 else cat <> "$build_log" 2>&1 then - if $build_coverity - then - mkdir -p "$build_dir/cvbuild" - coverity_config=`cygpath --windows "$coverity_dir/config/coverity_config.xml"` - coverity_tmpdir=`cygpath --windows "$build_dir/cvbuild"` - coverity_root=`cygpath --windows "$top/latest"` - case "$variant" in - Release) - begin_section Coverity - begin_section CovBuild - "$coverity_dir"/bin/cov-build\ - --verbose 4 \ - --config "$coverity_config"\ - --dir "$coverity_tmpdir"\ - python develop.py -t $variant -G "$cmake_generator" build "$coverity_product"\ - >> "$build_log" 2>&1\ - &&\ - end_section CovBuild\ - &&\ - begin_section CovAnalyze\ - &&\ - "$coverity_dir"/bin/cov-analyze\ - --security\ - --concurrency\ - --dir "$coverity_tmpdir"\ - >> "$build_log" 2>&1\ - &&\ - end_section CovAnalyze\ - &&\ - begin_section CovCommit\ - &&\ - "$coverity_dir"/bin/cov-commit-defects\ - --stream "$coverity_product"\ - --dir "$coverity_tmpdir"\ - --host "$coverity_server"\ - --strip-path "$coverity_root"\ - --target "$branch/$arch"\ - --version "$revision"\ - --description "$repo: $variant $revision"\ - --user admin --password coverity\ - >> "$build_log" 2>&1\ - || record_failure "Coverity Build Failed" - # since any step could have failed, rely on the enclosing block to close any pending sub-blocks - end_section Coverity - ;; - esac - if test -r "$build_dir"/cvbuild/build-log.txt - then - upload_item log "$build_dir"/cvbuild/build-log.txt text/plain - fi - elif $build_link_parallel + if $build_link_parallel then begin_section BuildParallel ( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) & @@ -228,10 +169,7 @@ do end_section BuildParallel else begin_section "Build$variant" - build "$variant" "$build_dir" >> "$build_log" 2>&1 - begin_section Tests - grep --line-buffered "^##teamcity" "$build_log" - end_section Tests + build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity" if `cat "$build_dir/build_ok"` then echo so far so good. @@ -260,15 +198,13 @@ then begin_section "Build$variant" build_dir=`build_dir_$arch $variant` build_dir_stubs="$build_dir/win_setup/$variant" + tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity" if `cat "$build_dir/build_ok"` then echo so far so good. else record_failure "Parallel build of \"$variant\" failed." fi - begin_section Tests - tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity" - end_section Tests end_section "Build$variant" done end_section WaitParallel @@ -289,7 +225,6 @@ then succeeded=$build_coverity else upload_item installer "$package" binary/octet-stream - upload_item quicklink "$package" binary/octet-stream # Upload crash reporter files. case "$last_built_variant" in -- cgit v1.2.3 From 8bc12ce82fa4d7ce8584a6dbc095a0cfe3ae88e3 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Tue, 18 Jan 2011 15:40:07 -0800 Subject: do packaging stuff and build breakpad symbols. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 05b464e43b..052349da9f 100755 --- a/build.sh +++ b/build.sh @@ -52,7 +52,7 @@ pre_build() local variant="$1" begin_section "Pre$variant" "$AUTOBUILD" install --skip-license-check - "$AUTOBUILD" configure -c $variant + "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON end_section "Pre$variant" } -- cgit v1.2.3 From dd3607cba651439fb1f73e78df38a160a2ef4f5c Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Fri, 21 Jan 2011 22:25:37 +0000 Subject: fix possible races with configures during TC build. --- build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 052349da9f..fb46258f46 100755 --- a/build.sh +++ b/build.sh @@ -51,7 +51,6 @@ pre_build() { local variant="$1" begin_section "Pre$variant" - "$AUTOBUILD" install --skip-license-check "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON end_section "Pre$variant" } @@ -62,7 +61,7 @@ build() if $build_viewer then begin_section "Viewer$variant" - if "$AUTOBUILD" build -c $variant + if "$AUTOBUILD" build -c $variant --no-configure then echo true >"$build_dir"/build_ok else @@ -142,6 +141,9 @@ fi # load autbuild provided shell functions and variables eval "$("$AUTOBUILD" source_environment)" +# Install packages. +"$AUTOBUILD" install --skip-license-check + # Now run the build succeeded=true build_processes= -- cgit v1.2.3 From 685017f282e0eeec177ebd488e44dca81b6885a5 Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Mon, 24 Jan 2011 09:12:18 -0800 Subject: no configure option seems to break something; try without it. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index fb46258f46..3a71cebc51 100755 --- a/build.sh +++ b/build.sh @@ -61,7 +61,7 @@ build() if $build_viewer then begin_section "Viewer$variant" - if "$AUTOBUILD" build -c $variant --no-configure + if "$AUTOBUILD" build -c $variant then echo true >"$build_dir"/build_ok else -- cgit v1.2.3 From 949ff3b10b28e4143f7c9ffb2c11d28cbf6ec522 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Mon, 24 Jan 2011 11:19:20 -0800 Subject: fix linux build directory. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 3a71cebc51..a612a5c5cd 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,7 @@ build_dir_Darwin() build_dir_Linux() { - echo build-linux-i686-$(echo $1 | tr A-Z a-z) + echo build-linux-i686 } build_dir_CYGWIN() -- cgit v1.2.3 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.2.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.2.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.2.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.2.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. --- build.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'build.sh') 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.2.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.2.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.2.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.2.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.2.3 From 6e0a9fb9fbd317b7b9b03d5d7e8eb4bd96200d3a Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 18 Mar 2011 12:28:08 -0400 Subject: Added passing of viewer_channel to the autobuild configure line. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 625a09009b..9248c1f628 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 -DUSE_PRECOMPILED_HEADERS=FALSE + "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE -DVIEWER_CHANNEL:STRING="$viewer_channel" end_section "Pre$variant" } -- cgit v1.2.3 From f5b33904e6eb0c6eca59f3b03be7666cff5bb49a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 18 Mar 2011 12:44:57 -0400 Subject: add upload of version-independent quicklinks --- build.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index e302d95e76..270dede0dc 100755 --- a/build.sh +++ b/build.sh @@ -248,6 +248,7 @@ then succeeded=$build_coverity else upload_item installer "$package" binary/octet-stream + upload_item quicklink "$package" binary/octet-stream # Upload crash reporter files. case "$last_built_variant" in -- cgit v1.2.3 From b6ec94a73b50f240a0c29998f90be2ff9322c7f6 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 18 Mar 2011 19:30:59 -0400 Subject: Fix for broken escaping of viewer_channel variable at configuration time. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 9248c1f628..45c3b622fb 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 -DUSE_PRECOMPILED_HEADERS=FALSE -DVIEWER_CHANNEL:STRING="$viewer_channel" + "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE "-DVIEWER_CHANNEL:STRING=\"$viewer_channel\"" "-DVIEWER_LOGIN_CHANNEL:STRING=\"$viewer_login_channel\"" end_section "Pre$variant" } -- cgit v1.2.3 From 9f2a04f217d54344360edc554456d9804e17eeb7 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 18 Mar 2011 19:35:25 -0400 Subject: Disabled redundant configuration step during the build in build.sh. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 45c3b622fb..532d191572 100755 --- a/build.sh +++ b/build.sh @@ -61,7 +61,7 @@ build() if $build_viewer then begin_section "Viewer$variant" - if "$AUTOBUILD" build -c $variant + if "$AUTOBUILD" build --no-configure -c $variant then echo true >"$build_dir"/build_ok else -- cgit v1.2.3 From 44ad672b9e0a5ba1eef3ef7c71da3eb887f4fe0a Mon Sep 17 00:00:00 2001 From: "Christian Goetze (CG)" Date: Thu, 31 Mar 2011 15:43:47 -0700 Subject: Apply server side code to message template verification onto the viewer tree. --- build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 1c28f5a255..92c2222c73 100755 --- a/build.sh +++ b/build.sh @@ -53,6 +53,8 @@ pre_build() local build_dir="$2" begin_section "Pre$variant" #export PATH="/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/:$PATH" + [ -n "$master_message_template_checkout" ] && [ -r "$master_message_template_checkout/message_template.msg" ]\ + && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" python develop.py \ --incredibuild \ --unattended \ @@ -67,7 +69,8 @@ pre_build() -DLOCALIZESETUP:BOOL=ON \ -DPACKAGE:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ - -DLL_TESTS:BOOL="$run_tests" + -DLL_TESTS:BOOL="$run_tests" \ + -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url end_section "Pre$variant" } -- cgit v1.2.3 From 983b49c31652b00f0659ef1a5a5d189681b1a826 Mon Sep 17 00:00:00 2001 From: Aaron Stone Date: Fri, 1 Apr 2011 16:10:35 -0700 Subject: Attempt at fixing build.sh and improving readability. --- build.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index cb5f74fb3c..6677958716 100755 --- a/build.sh +++ b/build.sh @@ -51,12 +51,20 @@ pre_build() { local variant="$1" begin_section "Pre$variant" - "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE "-DVIEWER_CHANNEL:STRING=\"$viewer_channel\"" "-DVIEWER_LOGIN_CHANNEL:STRING=\"$viewer_login_channel\"" - [ -n "$master_message_template_checkout" ] && [ -r "$master_message_template_checkout/message_template.msg" ]\ - && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" - -DLL_TESTS:BOOL="$run_tests" \ - -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url - end_section "Pre$variant" + [ -n "$master_message_template_checkout" ] \ + && [ -r "$master_message_template_checkout/message_template.msg" ] \ + && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" + + "$AUTOBUILD" configure -c $variant -- \ + -DPACKAGE:BOOL=ON \ + -DRELEASE_CRASH_REPORTING:BOOL=ON \ + -DUSE_PRECOMPILED_HEADERS=FALSE \ + -DVIEWER_CHANNEL:STRING="\"$viewer_channel\"" \ + -DVIEWER_LOGIN_CHANNEL:STRING="\"$viewer_login_channel\"" \ + -DGRID:STRING="\"$viewer_grid\"" \ + -DLL_TESTS:BOOL="$run_tests" \ + -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url + end_section "Pre$variant" } build() -- cgit v1.2.3