From b604e3c45f3e9a348967892d6a595b4268f97b8b Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 25 Aug 2016 10:29:20 -0400 Subject: convert upload_item to new upload_output --- build.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index cd2a9ebf5e..1042cea7da 100755 --- a/build.sh +++ b/build.sh @@ -238,7 +238,7 @@ do if [ -r "$build_dir/autobuild-package.xml" ] then begin_section "Autobuild metadata" - upload_item docs "$build_dir/autobuild-package.xml" text/xml + upload_output "autobuild metadata" "$build_dir/autobuild-package.xml" text/xml if [ "$arch" != "Linux" ] then record_dependencies_graph # defined in buildscripts/hg/bin/build.sh @@ -254,12 +254,12 @@ do if [ -r "$build_dir/doxygen_warnings.log" ] then record_event "Doxygen warnings generated; see doxygen_warnings.log" - upload_item log "$build_dir/doxygen_warnings.log" text/plain + upload_output "doxygen log" "$build_dir/doxygen_warnings.log" text/plain ## TBD fi if [ -d "$build_dir/doxygen/html" ] then tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html" - upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream + upload_output "doxygen" "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream fi ;; *) @@ -319,10 +319,10 @@ then # upload debian package and create repository begin_section "Upload Debian Repository" for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do - upload_item debian $deb_file binary/octet-stream + upload_output "installer" $deb_file binary/octet-stream done for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do - upload_item debian_private $deb_file binary/octet-stream + upload_output debian $deb_file binary/octet-stream have_private_repo=true done @@ -339,7 +339,7 @@ then if [ $have_private_repo = true ]; then eval "$python_command \"$redirect\" '\${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html'"\ >"$build_log_dir/private.html" || fatal generating redirect - upload_item global_redirect "$build_log_dir/private.html" text/html + upload_output global_redirect "$build_log_dir/private.html" text/html private ## TBD fi @@ -367,9 +367,9 @@ then succeeded=$build_coverity else # Upload base package. - upload_item installer "$package" binary/octet-stream - upload_item quicklink "$package" binary/octet-stream - [ -f $build_dir/summary.json ] && upload_item installer $build_dir/summary.json text/plain + upload_output installer "$package" binary/octet-stream + + [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json # Upload additional packages. for package_id in $additional_packages @@ -377,8 +377,7 @@ then package=$(installer_$arch "$package_id") if [ x"$package" != x ] then - upload_item installer "$package" binary/octet-stream - upload_item quicklink "$package" binary/octet-stream + upload_output "installer $package_id" "$package" binary/octet-stream private else record_failure "Failed to find additional package for '$package_id'." fi @@ -389,7 +388,7 @@ then # Upload crash reporter files for symbolfile in $symbolfiles do - upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream + upload_output symbolfile "$build_dir/$symbolfile" binary/octet-stream done # Upload the llphysicsextensions_tpv package, if one was produced @@ -397,7 +396,7 @@ then if [ -r "$build_dir/llphysicsextensions_package" ] then llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package) - upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream + upload_output "llphysicsextensions_package" "$llphysicsextensions_package" binary/octet-stream private fi ;; *) -- cgit v1.2.3 From 7ba028d2f36515649b85d3bbc5030288e94b96dc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 26 Aug 2016 16:28:22 -0400 Subject: rewrap uploads --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 1042cea7da..5610730695 100755 --- a/build.sh +++ b/build.sh @@ -358,7 +358,7 @@ if $succeeded then if $build_viewer then - begin_section Upload Installer + begin_section "Uploads" # Upload installer package=$(installer_$arch) if [ x"$package" = x ] || test -d "$package" @@ -412,7 +412,7 @@ then done fi fi - end_section Upload Installer + end_section "Uploads" else record_event "skipping upload of installer" fi -- cgit v1.2.3 From 2fc670e2dda6c16b314fa626faf9168ebdec8549 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 28 Aug 2016 10:12:10 -0400 Subject: do custom initialize calls so that viewer_channel is taken into account for the buildid --- build.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 5610730695..579db0900d 100755 --- a/build.sh +++ b/build.sh @@ -202,10 +202,9 @@ then export additional_packages= fi -# dump environment variables for debugging -begin_section "Environment" -env|sort -end_section "Environment" +initialize_context +codeticket addinput "${viewer_channel}" "viewer_channel" +initialize_build # Now run the build succeeded=true @@ -338,7 +337,7 @@ then if [ $have_private_repo = true ]; then eval "$python_command \"$redirect\" '\${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html'"\ - >"$build_log_dir/private.html" || fatal generating redirect + >"$build_log_dir/private.html" || fatal "generating global redirect" upload_output global_redirect "$build_log_dir/private.html" text/html private ## TBD fi -- cgit v1.2.3 From ea0242e1cebb7ebb9515e39f9dc78ec207cdce22 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 28 Aug 2016 10:42:52 -0400 Subject: collapse autobuild initialize --- build.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 579db0900d..5f55133d81 100755 --- a/build.sh +++ b/build.sh @@ -182,6 +182,7 @@ then pass fi +begin_section "autobuild initialize" # ensure AUTOBUILD is in native path form for child processes AUTOBUILD="$(native_path "$AUTOBUILD")" # set "$autobuild" to cygwin path form for use locally in this script @@ -194,6 +195,7 @@ fi # load autobuild provided shell functions and variables eval "$("$autobuild" --quiet source_environment)" +end_section "autobuild initialize" # something about the additional_packages mechanism messes up buildscripts results.py on Linux # since we don't care about those packages on Linux, just zero it out, yes - a HACK -- cgit v1.2.3 From 3c9f7121a2801d44e3db81f212a84a25062debe5 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sun, 28 Aug 2016 11:50:47 -0400 Subject: use codeticket addinput parameter to register viewer_channel --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 5f55133d81..80263254eb 100755 --- a/build.sh +++ b/build.sh @@ -205,7 +205,7 @@ then fi initialize_context -codeticket addinput "${viewer_channel}" "viewer_channel" +codeticket addinput parameter "viewer_channel" "${viewer_channel}" initialize_build # Now run the build -- cgit v1.2.3 From 5a7855d4b388bcf3d365d20e54db227591febeba Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 30 Aug 2016 08:49:09 -0400 Subject: remove use of old build_ok variable --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 80263254eb..f74501743c 100755 --- a/build.sh +++ b/build.sh @@ -142,9 +142,10 @@ build() if $build_viewer then "$autobuild" build --no-configure -c $variant || fatal "failed building $variant" - + echo true >"$build_dir"/build_ok + # Run build extensions - if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ] + if [ -d ${build_dir}/packages/build-extensions ] then for extension in ${build_dir}/packages/build-extensions/*.sh do @@ -157,7 +158,6 @@ build() # *TODO: Make this a build extension. package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages" - echo true >"$build_dir"/build_ok else echo "Skipping build due to configuration build_viewer=${build_viewer}" echo true >"$build_dir"/build_ok -- cgit v1.2.3 From f99c3002a1efbd6512094ebd4620c28490c52226 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 30 Aug 2016 16:06:22 -0400 Subject: clean up logging, change debian installer upload name to "deb" --- build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index f74501743c..654ad68ec7 100755 --- a/build.sh +++ b/build.sh @@ -159,7 +159,7 @@ build() package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages" else - echo "Skipping build due to configuration build_viewer=${build_viewer}" + record_event "Skipping build due to configuration build_viewer=${build_viewer}" echo true >"$build_dir"/build_ok fi } @@ -232,6 +232,9 @@ do then begin_section "Build $variant" build "$variant" "$build_dir" + end_section "Build $variant" + + begin_section "post-build $variant" if `cat "$build_dir/build_ok"` then case "$variant" in @@ -270,7 +273,8 @@ do else record_failure "Build of \"$variant\" failed." fi - end_section "Build $variant" + begin_section "post-build $variant" + else record_event "configure for $variant failed: build skipped" fi @@ -320,7 +324,7 @@ then # upload debian package and create repository begin_section "Upload Debian Repository" for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do - upload_output "installer" $deb_file binary/octet-stream + upload_output "deb" $deb_file binary/octet-stream done for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do upload_output debian $deb_file binary/octet-stream -- cgit v1.2.3 From bbbe70d33c5e4c8e54df9bc8e76a8611d4c432e2 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 30 Aug 2016 16:52:43 -0400 Subject: simplify redirect generator --- build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 654ad68ec7..d7b95e8987 100755 --- a/build.sh +++ b/build.sh @@ -342,10 +342,9 @@ then done if [ $have_private_repo = true ]; then - eval "$python_command \"$redirect\" '\${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html'"\ + $python_command $(native_path "$helper/hg/bin/redirect.py") "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\ >"$build_log_dir/private.html" || fatal "generating global redirect" - upload_output global_redirect "$build_log_dir/private.html" text/html private ## TBD - + upload_output global_redirect "$build_log_dir/private.html" text/html private fi end_section "Upload Debian Repository" -- cgit v1.2.3 From bd2005e078b3fa60a0acc72ef06bf7ba073b5fea Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 1 Sep 2016 21:08:26 -0400 Subject: convert redirect to new python convention --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index d7b95e8987..9b0b8399a3 100755 --- a/build.sh +++ b/build.sh @@ -342,7 +342,7 @@ then done if [ $have_private_repo = true ]; then - $python_command $(native_path "$helper/hg/bin/redirect.py") "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\ + python_cmd "$helpers/redirect.py" "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\ >"$build_log_dir/private.html" || fatal "generating global redirect" upload_output global_redirect "$build_log_dir/private.html" text/html private fi -- cgit v1.2.3 From 32d52ec240d77e4a2cdf42b6c1ca5c9d7a9650a8 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 6 Sep 2016 12:08:03 -0400 Subject: display build metadata, remove obsolete private.html --- build.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 9b0b8399a3..ea3e6b6a72 100755 --- a/build.sh +++ b/build.sh @@ -141,9 +141,12 @@ build() local variant="$1" if $build_viewer then + begin_section "autobuild $variant" "$autobuild" build --no-configure -c $variant || fatal "failed building $variant" echo true >"$build_dir"/build_ok - + end_section "autobuild $variant" + + begin_section "extensions $variant" # Run build extensions if [ -d ${build_dir}/packages/build-extensions ] then @@ -157,6 +160,7 @@ build() # *TODO: Make this a build extension. package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages" + end_section "extensions $variant" else record_event "Skipping build due to configuration build_viewer=${build_viewer}" @@ -273,7 +277,7 @@ do else record_failure "Build of \"$variant\" failed." fi - begin_section "post-build $variant" + end_section "post-build $variant" else record_event "configure for $variant failed: build skipped" @@ -340,13 +344,6 @@ then mv $build_log_dir/$debian_repo_type $build_log_dir/${debian_repo_type}_pushed fi done - - if [ $have_private_repo = true ]; then - python_cmd "$helpers/redirect.py" "${private_S3PROXY_URL}${S3PREFIX}repo/$repo/rev/$revision/index.html"\ - >"$build_log_dir/private.html" || fatal "generating global redirect" - upload_output global_redirect "$build_log_dir/private.html" text/html private - fi - end_section "Upload Debian Repository" else @@ -373,7 +370,7 @@ then # Upload base package. upload_output installer "$package" binary/octet-stream - [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json + [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json display # Upload additional packages. for package_id in $additional_packages -- cgit v1.2.3 From 9a1edafbf1e2ec5a4db3085bc5738527c4b090a8 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 6 Sep 2016 12:17:01 -0400 Subject: use debian package names in uploads, set private according to new convention --- build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index ea3e6b6a72..7213bad017 100755 --- a/build.sh +++ b/build.sh @@ -298,7 +298,7 @@ then if $build_viewer_deb && [ "$last_built_variant" == "Release" ] then begin_section "Build Viewer Debian Package" - have_private_repo=false + # mangle the changelog dch --force-bad-version \ --distribution unstable \ @@ -328,11 +328,12 @@ then # upload debian package and create repository begin_section "Upload Debian Repository" for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do - upload_output "deb" $deb_file binary/octet-stream + deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') + upload_output "debian $deb_pkg" $deb_file binary/octet-stream done for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do - upload_output debian $deb_file binary/octet-stream - have_private_repo=true + deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') + upload_output "debian $deb_pkg" $deb_file binary/octet-stream private done create_deb_repo -- cgit v1.2.3 From 9d5bf8df82d6171d2a9957f33ea6e43120d31cef Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 7 Sep 2016 11:34:10 -0400 Subject: directly invoke codeticket for output --- build.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 7213bad017..f5296b9ea1 100755 --- a/build.sh +++ b/build.sh @@ -246,7 +246,7 @@ do if [ -r "$build_dir/autobuild-package.xml" ] then begin_section "Autobuild metadata" - upload_output "autobuild metadata" "$build_dir/autobuild-package.xml" text/xml + python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml --display if [ "$arch" != "Linux" ] then record_dependencies_graph # defined in buildscripts/hg/bin/build.sh @@ -262,12 +262,12 @@ do if [ -r "$build_dir/doxygen_warnings.log" ] then record_event "Doxygen warnings generated; see doxygen_warnings.log" - upload_output "doxygen log" "$build_dir/doxygen_warnings.log" text/plain ## TBD + python_cmd "$helpers/codeticket.py" output --label "doxygen log" --output "$build_dir/doxygen_warnings.log" --mimetype text/plain ## TBD fi if [ -d "$build_dir/doxygen/html" ] then tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html" - upload_output "doxygen" "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream + python_cmd "$helpers/codeticket.py" output --label "doxygen" --output "$build_dir/viewer-doxygen.tar.bz2" fi ;; *) @@ -329,11 +329,11 @@ then begin_section "Upload Debian Repository" for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') - upload_output "debian $deb_pkg" $deb_file binary/octet-stream + python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output $deb_file done for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') - upload_output "debian $deb_pkg" $deb_file binary/octet-stream private + python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output "$deb_file" --private done create_deb_repo @@ -369,9 +369,9 @@ then succeeded=$build_coverity else # Upload base package. - upload_output installer "$package" binary/octet-stream + python_cmd "$helpers/codeticket.py" output --label installer --output "$package" - [ -f $build_dir/summary.json ] && upload_output "installer metadata" $build_dir/summary.json application/json display + [ -f $build_dir/summary.json ] && python_cmd "$helpers/codeticket.py" output --label "installer metadata" --output $build_dir/summary.json --mimetype application/json --display # Upload additional packages. for package_id in $additional_packages @@ -379,7 +379,7 @@ then package=$(installer_$arch "$package_id") if [ x"$package" != x ] then - upload_output "installer $package_id" "$package" binary/octet-stream private + python_cmd "$helpers/codeticket.py" output --label "installer $package_id" --output "$package" --private else record_failure "Failed to find additional package for '$package_id'." fi @@ -390,7 +390,7 @@ then # Upload crash reporter files for symbolfile in $symbolfiles do - upload_output symbolfile "$build_dir/$symbolfile" binary/octet-stream + python_cmd "$helpers/codeticket.py" output --label symbolfile "$build_dir/$symbolfile" done # Upload the llphysicsextensions_tpv package, if one was produced @@ -398,7 +398,7 @@ then if [ -r "$build_dir/llphysicsextensions_package" ] then llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package) - upload_output "llphysicsextensions_package" "$llphysicsextensions_package" binary/octet-stream private + python_cmd "$helpers/codeticket.py" output --label "llphysicsextensions_package" --output "$llphysicsextensions_package" --private fi ;; *) -- cgit v1.2.3 From 65a7a02d296a97257f40c747c1299cbd2616b9ce Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 7 Sep 2016 11:49:52 -0400 Subject: pass autobuild-package.xml to graph generator --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index f5296b9ea1..1edf584b1f 100755 --- a/build.sh +++ b/build.sh @@ -249,7 +249,7 @@ do python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml --display if [ "$arch" != "Linux" ] then - record_dependencies_graph # defined in buildscripts/hg/bin/build.sh + record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh else record_event "TBD - no dependency graph for linux (probable python version dependency)" fi -- cgit v1.2.3 From a388504ed2fb8f6c28f33b0e120e2632f693ec14 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 7 Sep 2016 13:32:49 -0400 Subject: fix symbolfile upload --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 1edf584b1f..6a1b4813a7 100755 --- a/build.sh +++ b/build.sh @@ -390,7 +390,7 @@ then # Upload crash reporter files for symbolfile in $symbolfiles do - python_cmd "$helpers/codeticket.py" output --label symbolfile "$build_dir/$symbolfile" + python_cmd "$helpers/codeticket.py" output --label symbolfile --output "$build_dir/$symbolfile" done # Upload the llphysicsextensions_tpv package, if one was produced -- cgit v1.2.3 From e2855de8bce3b3b38df13d74e7bba87a61f1a241 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 7 Sep 2016 13:33:10 -0400 Subject: do not display the autobuild package data --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 6a1b4813a7..9fc3bc4503 100755 --- a/build.sh +++ b/build.sh @@ -246,7 +246,7 @@ do if [ -r "$build_dir/autobuild-package.xml" ] then begin_section "Autobuild metadata" - python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml --display + python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml if [ "$arch" != "Linux" ] then record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh -- cgit v1.2.3 From 3e16c29edcfea7542e23ec6066882c5264029bb6 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 7 Sep 2016 13:57:34 -0400 Subject: don't upload summary.json --- build.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 9fc3bc4503..4f30fc64fb 100755 --- a/build.sh +++ b/build.sh @@ -371,8 +371,6 @@ then # Upload base package. python_cmd "$helpers/codeticket.py" output --label installer --output "$package" - [ -f $build_dir/summary.json ] && python_cmd "$helpers/codeticket.py" output --label "installer metadata" --output $build_dir/summary.json --mimetype application/json --display - # Upload additional packages. for package_id in $additional_packages do -- cgit v1.2.3 From 0c60dea99e882dc8af94151951a7f6f7d593aecb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 20 Sep 2016 14:31:38 -0400 Subject: update calls to new codeticket --- build.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 4f30fc64fb..30632a9df3 100755 --- a/build.sh +++ b/build.sh @@ -209,7 +209,7 @@ then fi initialize_context -codeticket addinput parameter "viewer_channel" "${viewer_channel}" +python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}" initialize_build # Now run the build @@ -246,7 +246,7 @@ do if [ -r "$build_dir/autobuild-package.xml" ] then begin_section "Autobuild metadata" - python_cmd "$helpers/codeticket.py" output --label "autobuild metadata" --output "$build_dir/autobuild-package.xml" --mimetype text/xml + python_cmd "$helpers/codeticket.py" addoutput "Autobuild Metadata" "$build_dir/autobuild-package.xml" --mimetype text/xml if [ "$arch" != "Linux" ] then record_dependencies_graph "$build_dir/autobuild-package.xml" # defined in buildscripts/hg/bin/build.sh @@ -262,12 +262,12 @@ do if [ -r "$build_dir/doxygen_warnings.log" ] then record_event "Doxygen warnings generated; see doxygen_warnings.log" - python_cmd "$helpers/codeticket.py" output --label "doxygen log" --output "$build_dir/doxygen_warnings.log" --mimetype text/plain ## TBD + python_cmd "$helpers/codeticket.py" addoutput "Doxygen Log" "$build_dir/doxygen_warnings.log" --mimetype text/plain ## TBD fi if [ -d "$build_dir/doxygen/html" ] then tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html" - python_cmd "$helpers/codeticket.py" output --label "doxygen" --output "$build_dir/viewer-doxygen.tar.bz2" + python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" fi ;; *) @@ -329,11 +329,11 @@ then begin_section "Upload Debian Repository" for deb_file in `/bin/ls ../packages_public/*.deb ../*.deb 2>/dev/null`; do deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') - python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output $deb_file + python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" $deb_file done for deb_file in `/bin/ls ../packages_private/*.deb 2>/dev/null`; do deb_pkg=$(basename "$deb_file" | sed 's,_.*,,') - python_cmd "$helpers/codeticket.py" output --label "debian $deb_pkg" --output "$deb_file" --private + python_cmd "$helpers/codeticket.py" addoutput "Debian $deb_pkg" "$deb_file" --private done create_deb_repo @@ -369,7 +369,7 @@ then succeeded=$build_coverity else # Upload base package. - python_cmd "$helpers/codeticket.py" output --label installer --output "$package" + python_cmd "$helpers/codeticket.py" addoutput Installer --output "$package" # Upload additional packages. for package_id in $additional_packages @@ -377,7 +377,7 @@ then package=$(installer_$arch "$package_id") if [ x"$package" != x ] then - python_cmd "$helpers/codeticket.py" output --label "installer $package_id" --output "$package" --private + python_cmd "$helpers/codeticket.py" addoutput "Installer $package_id" "$package" else record_failure "Failed to find additional package for '$package_id'." fi @@ -388,7 +388,7 @@ then # Upload crash reporter files for symbolfile in $symbolfiles do - python_cmd "$helpers/codeticket.py" output --label symbolfile --output "$build_dir/$symbolfile" + python_cmd "$helpers/codeticket.py" addoutput "Symbolfile $(basename "$build_dir/$symbolfile")" "$build_dir/$symbolfile" done # Upload the llphysicsextensions_tpv package, if one was produced @@ -396,7 +396,7 @@ then if [ -r "$build_dir/llphysicsextensions_package" ] then llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package) - python_cmd "$helpers/codeticket.py" output --label "llphysicsextensions_package" --output "$llphysicsextensions_package" --private + python_cmd "$helpers/codeticket.py" addoutput "llphysicsextensions_package" "$llphysicsextensions_package" --private fi ;; *) -- cgit v1.2.3 From 6bd8aac928898f1744fd41d972c59dd864351cbc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 23 Sep 2016 17:21:03 -0400 Subject: adjust initialization function names to the new terminology --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 30632a9df3..b7afdcd7f3 100755 --- a/build.sh +++ b/build.sh @@ -208,9 +208,9 @@ then export additional_packages= fi -initialize_context -python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}" initialize_build +python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}" +initialize_version # Now run the build succeeded=true @@ -396,7 +396,7 @@ then if [ -r "$build_dir/llphysicsextensions_package" ] then llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package) - python_cmd "$helpers/codeticket.py" addoutput "llphysicsextensions_package" "$llphysicsextensions_package" --private + python_cmd "$helpers/codeticket.py" addoutput "Physics Extensions Package" "$llphysicsextensions_package" --private fi ;; *) -- cgit v1.2.3 From ea11d577c124702505f4d10afdfc86e299019e25 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Sat, 3 Dec 2016 10:49:43 -0500 Subject: call standard initialization functions from buildscripts build.sh --- build.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index ab7a1faa37..270775ab48 100755 --- a/build.sh +++ b/build.sh @@ -176,6 +176,8 @@ then exit 1 fi +initialize_build # provided by master buildscripts build.sh + # Check to see if we're skipping the platform if ! eval '$build_'"$arch" then @@ -208,6 +210,8 @@ begin_section "Environment" env|sort end_section "Environment" +initialize_version # provided by buildscripts build.sh; sets version id + # Now run the build succeeded=true build_processes= -- cgit v1.2.3 From fad899fe6c61e40dec98f38a26d0ed544b2f6b39 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 5 Dec 2016 10:14:18 -0500 Subject: correct merge duplications, put source_environment commands into sections --- build.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 15bbe19f66..36ae33ef90 100755 --- a/build.sh +++ b/build.sh @@ -182,13 +182,6 @@ fi initialize_build # provided by master buildscripts build.sh -# Check to see if we're skipping the platform -if ! eval '$build_'"$arch" -then - record_event "building on architecture $arch is disabled" - pass -fi - begin_section "autobuild initialize" # ensure AUTOBUILD is in native path form for child processes AUTOBUILD="$(native_path "$AUTOBUILD")" @@ -201,7 +194,15 @@ then fi # load autobuild provided shell functions and variables -eval "$("$autobuild" --quiet source_environment)" +"$autobuild" --quiet source_environment > "$build_log_dir/source_environment" +begin_section "dump source environment commands" +cat "$build_log_dir/source_environment" +end_section "dump source environment commands" + +begin_section "execute source environment commands" +. "$build_log_dir/source_environment" +end_section "execute source environment commands" + end_section "autobuild initialize" # something about the additional_packages mechanism messes up buildscripts results.py on Linux @@ -211,9 +212,7 @@ then export additional_packages= fi -initialize_build python_cmd "$helpers/codeticket.py" addinput "Viewer Channel" "${viewer_channel}" -initialize_version initialize_version # provided by buildscripts build.sh; sets version id -- cgit v1.2.3 From 83209ef5c082405e3866d50c4188afd5cfaa7358 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 5 Dec 2016 13:28:40 -0500 Subject: remove more bits of the old build system --- build.sh | 3 --- 1 file changed, 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 36ae33ef90..e191794ba0 100755 --- a/build.sh +++ b/build.sh @@ -222,9 +222,6 @@ build_processes= last_built_variant= for variant in $variants do - eval '$build_'"$variant" || continue - eval '$build_'"$arch"_"$variant" || continue - # Only the last built arch is available for upload last_built_variant="$variant" -- cgit v1.2.3