From 5ca8e138be80f67c6be345436bfb9f4feb27c915 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 12:12:07 -0400 Subject: add debugging wrappers to check for dictionaries --- build.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index c7c89fe3c2..90818009c3 100755 --- a/build.sh +++ b/build.sh @@ -59,6 +59,9 @@ pre_build() && [ -r "$master_message_template_checkout/message_template.msg" ] \ && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" + echo -n "Before 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2 + (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + "$AUTOBUILD" configure -c $variant -- \ -DPACKAGE:BOOL=ON \ -DRELEASE_CRASH_REPORTING:BOOL=ON \ @@ -67,6 +70,10 @@ pre_build() -DGRID:STRING="\"$viewer_grid\"" \ -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url + + echo -n "After 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2 + (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + end_section "Pre$variant" } @@ -76,12 +83,19 @@ build() if $build_viewer then begin_section "Viewer$variant" + + echo -n "Before 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2 + (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + if "$AUTOBUILD" build --no-configure -c $variant then echo true >"$build_dir"/build_ok else echo false >"$build_dir"/build_ok fi + echo -n "After 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2 + (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + end_section "Viewer$variant" fi } @@ -177,9 +191,15 @@ eval "$("$AUTOBUILD" source_environment)" env|sort +echo -n "Before 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2 +(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + # Install packages. "$AUTOBUILD" install --skip-license-check +echo -n "After 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2 +(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + # Now run the build succeeded=true build_processes= -- cgit v1.2.3 From e02bf8f90dba7cd7ac8874d7ee1baf782397784f Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 23 Apr 2012 14:00:25 -0400 Subject: add dictionaries to the Hunspell.cmake so that it gets installed --- build.sh | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 90818009c3..c14fdc006f 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,12 @@ # * The basic convention is that the build name can be mapped onto a mercurial URL, # which is also used as the "branch" name. +check_for() +{ + if [ -e "$2" ]; then found_dict='FOUND'; else found_dict='MISSING'; fi + echo "$1 ${found_dict} '$2' " 1>&2 +} + build_dir_Darwin() { echo build-darwin-i386 @@ -59,8 +65,7 @@ pre_build() && [ -r "$master_message_template_checkout/message_template.msg" ] \ && template_verifier_master_url="-DTEMPLATE_VERIFIER_MASTER_URL=file://$master_message_template_checkout/message_template.msg" - echo -n "Before 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "Before 'autobuild configure'" ${build_dir}/packages/dictionaries "$AUTOBUILD" configure -c $variant -- \ -DPACKAGE:BOOL=ON \ @@ -71,10 +76,9 @@ pre_build() -DLL_TESTS:BOOL="$run_tests" \ -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url - echo -n "After 'autobuild configure' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries - end_section "Pre$variant" + end_section "Pre$variant" } build() @@ -84,8 +88,7 @@ build() then begin_section "Viewer$variant" - echo -n "Before 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "Before 'autobuild build'" ${build_dir}/packages/dictionaries if "$AUTOBUILD" build --no-configure -c $variant then @@ -93,8 +96,7 @@ build() else echo false >"$build_dir"/build_ok fi - echo -n "After 'autobuild build' ${build_dir}/packages/dictionaries " 1>&2 - (test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 + check_for "After 'autobuild configure'" ${build_dir}/packages/dictionaries end_section "Viewer$variant" fi @@ -190,15 +192,12 @@ eval "$("$AUTOBUILD" source_environment)" # dump environment variables for debugging env|sort - -echo -n "Before 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2 -(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 +check_for "Before 'autobuild install'" ${build_dir}/packages/dictionaries # Install packages. "$AUTOBUILD" install --skip-license-check -echo -n "After 'autobuild install' ${build_dir}/packages/dictionaries " 1>&2 -(test -d "${build_dir}/packages/dictionaries" && 'found' || echo 'missing' ) 1>&2 +check_for "After 'autobuild install'" ${build_dir}/packages/dictionaries # Now run the build succeeded=true -- cgit v1.2.3 From 8b2ad982d72ade6db7ae45758171fa7b5e30a42a Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Fri, 15 Jun 2012 00:27:45 +0000 Subject: Updating viewer build process to also generate a secondlife-bin.MAP file, tar it, and upload it. --- build.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 8ca3208087..1532e586cb 100755 --- a/build.sh +++ b/build.sh @@ -268,6 +268,10 @@ then else upload_item installer "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream + gzip $build_dir/newview/secondlife-bin-$arch.MAP + mapfile=secondlife-bin-$arch.MAP.gz + upload_item mapfile "$build_dir/newview/$mapfile" binary/octet-stream + echo "Uploaded mapfile" [ -f summary.json ] && upload_item installer summary.json text/plain # Upload crash reporter files. -- cgit v1.2.3 From 357c1f57b4db19b4500b09719e5f96c6a481c403 Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Fri, 15 Jun 2012 18:45:06 +0000 Subject: Fixing build error --- build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 1532e586cb..00a9baec0a 100755 --- a/build.sh +++ b/build.sh @@ -268,9 +268,11 @@ then else upload_item installer "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream - gzip $build_dir/newview/secondlife-bin-$arch.MAP + mapfilepath=$build_dir/newview + gzip $mapfilepath/secondlife-bin.MAP mapfile=secondlife-bin-$arch.MAP.gz - upload_item mapfile "$build_dir/newview/$mapfile" binary/octet-stream + mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile + upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream echo "Uploaded mapfile" [ -f summary.json ] && upload_item installer summary.json text/plain -- cgit v1.2.3 From c0e83b392e4f244f7e4284cfc4285cc27f0b777b Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Wed, 11 Jul 2012 17:13:40 -0700 Subject: Only uploading the map file for Release builds. --- build.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 00a9baec0a..e8d326f003 100755 --- a/build.sh +++ b/build.sh @@ -272,8 +272,13 @@ then gzip $mapfilepath/secondlife-bin.MAP mapfile=secondlife-bin-$arch.MAP.gz mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile - upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream - echo "Uploaded mapfile" + if [ x"$variant" = xRelease ] + then + upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream + echo "Uploaded mapfile for $variant" + else + echo "Skipping mapfile upload for $variant" + fi [ -f summary.json ] && upload_item installer summary.json text/plain # Upload crash reporter files. -- cgit v1.2.3 From cff01d2c5117434693d187ed558d1010d1d6a105 Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Thu, 12 Jul 2012 02:09:44 +0000 Subject: Apparently the hack to get release and debug viewer builds into separate build configs means checking in build.sh is useless. Fixed the conditional around uploading the symbolfile to check instead, which seems to be the correct pattern. --- build.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index e8d326f003..d19d8a5d6b 100755 --- a/build.sh +++ b/build.sh @@ -268,26 +268,26 @@ then else upload_item installer "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream - mapfilepath=$build_dir/newview - gzip $mapfilepath/secondlife-bin.MAP - mapfile=secondlife-bin-$arch.MAP.gz - mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile - if [ x"$variant" = xRelease ] - then - upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream - echo "Uploaded mapfile for $variant" - else - echo "Skipping mapfile upload for $variant" - fi [ -f summary.json ] && upload_item installer summary.json text/plain - # Upload crash reporter files. + # Upload crash reporter files and symbolfile for public llphysicsextensions build. case "$last_built_variant" in Release) for symbolfile in $symbolfiles do upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream done + + mapfilepath=$build_dir/newview + gzip $mapfilepath/secondlife-bin.MAP + mapfile=secondlife-bin-$arch.MAP.gz + mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile + upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream + echo "Uploaded mapfile for $last_built_variant" + + ;; + *) + echo "Skipping mapfile for $last_built_variant" ;; esac -- cgit v1.2.3 From 12b1ec62645e772174cd710a208f59ab823eafe0 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 20 Jul 2012 07:38:12 -0700 Subject: refactor to build llphysicsextensions_tpv package for sublicensees --- build.sh | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 16 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index d19d8a5d6b..bd71de762c 100755 --- a/build.sh +++ b/build.sh @@ -70,19 +70,46 @@ pre_build() end_section "Pre$variant" } +package_llphysicsextensions_tpv() +{ + begin_section "PhysicsExtensions_TPV" + tpv_status=0 + if [ "$variant" = "Release" ] + then + llpetpvcfg=$build_dir/packages/llphysicsextensions/autobuild-tpv.xml + "$AUTOBUILD" build --verbose --config-file $llpetpvcfg -c Tpv + + # capture the package file name for use in upload later... + PKGTMP=`mktemp -t pgktpv.XXXXXX` + trap "rm $PKGTMP* 2>/dev/null" 0 + "$AUTOBUILD" package --verbose --config-file $llpetpvcfg > $PKGTMP + tpv_status=$? + sed -n -e 's/^wrote *//p' $PKGTMP > $build_dir/llphysicsextensions_package + else + echo "Do not provide llphysicsextensions_tpv for $variant" + llphysicsextensions_package="" + fi + end_section "PhysicsExtensions_TPV" + return $tpv_status +} + build() { local variant="$1" if $build_viewer then begin_section "Viewer$variant" - if "$AUTOBUILD" build --no-configure -c $variant + "$AUTOBUILD" build --no-configure -c $variant + viewer_build_ok=$? + end_section "Viewer$variant" + package_llphysicsextensions_tpv + tpvlib_build_ok=$? + if [ $viewer_build_ok -eq 0 -a $tpvlib_build_ok -eq 0 ] then echo true >"$build_dir"/build_ok else echo false >"$build_dir"/build_ok fi - end_section "Viewer$variant" fi } @@ -196,11 +223,6 @@ do mkdir -p "$build_dir" mkdir -p "$build_dir/tmp" - # Install packages. - begin_section "AutobuildInstall" - "$AUTOBUILD" install --verbose --skip-license-check - end_section "AutobuildInstall" - if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1 then if $build_link_parallel @@ -270,21 +292,22 @@ then upload_item quicklink "$package" binary/octet-stream [ -f summary.json ] && upload_item installer summary.json text/plain - # Upload crash reporter files and symbolfile for public llphysicsextensions build. case "$last_built_variant" in Release) + # Upload crash reporter files for symbolfile in $symbolfiles do upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream done - - mapfilepath=$build_dir/newview - gzip $mapfilepath/secondlife-bin.MAP - mapfile=secondlife-bin-$arch.MAP.gz - mv $mapfilepath/secondlife-bin.MAP.gz $mapfilepath/$mapfile - upload_item mapfile "$mapfilepath/$mapfile" binary/octet-stream - echo "Uploaded mapfile for $last_built_variant" - + + # Upload the llphysicsextensions_tpv package, if one was produced + if [ -r "$build_dir/llphysicsextensions_package" ] + then + llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package) + upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream + else + echo "No llphysicsextensions_package" + fi ;; *) echo "Skipping mapfile for $last_built_variant" -- cgit v1.2.3