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