From 038c555fc4254de62a477d1c83a2131970b0b2b5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 21 Feb 2017 17:12:27 -0500 Subject: DRTVWR-418: In viewer64-mac-havok fork, turn on Xcode 8 Havok. This is known not to work yet: the relevant Havok libraries are not being bundled with llphysicsextensions, therefore the viewer can't link with any Havok symbols. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 9ca130b5d5..a8f4158bff 100755 --- a/build.sh +++ b/build.sh @@ -97,14 +97,14 @@ pre_build() # nat 2016-12-20: disable HAVOK on Mac until we get a 64-bit Mac build. RELEASE_CRASH_REPORTING=ON + HAVOK=ON SIGNING=() if [ "$arch" == "Darwin" ] - then HAVOK=OFF + then if [ "$variant" == "Release" ] then SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") fi - else HAVOK=ON fi "$autobuild" configure --quiet -c $variant -- \ -- cgit v1.2.3 From d07751e8de8f9d137db07d62b64e6cf22cfaab7b Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Wed, 29 Mar 2017 16:42:22 -0700 Subject: add version string to ct2 results --- build.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 9ca130b5d5..515b50670f 100755 --- a/build.sh +++ b/build.sh @@ -273,6 +273,13 @@ do else record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'" fi + if [ -r "$build_dir/newview/viewer_version.txt" ] + then + begin_section "Viewer Version" + python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype text/plain \ + || fatal "Upload of viewer version failed" + end_section "Viewer Version" + fi ;; Doxygen) if [ -r "$build_dir/doxygen_warnings.log" ] -- cgit v1.2.3 From c35fde6aafe0900075ce82669536465f1d389caf Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 30 Mar 2017 08:38:45 -0700 Subject: change mimetype to inline-text per review comment from Nat --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 515b50670f..6f11c72f75 100755 --- a/build.sh +++ b/build.sh @@ -276,7 +276,7 @@ do if [ -r "$build_dir/newview/viewer_version.txt" ] then begin_section "Viewer Version" - python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype text/plain \ + python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype inline-text \ || fatal "Upload of viewer version failed" end_section "Viewer Version" fi -- cgit v1.2.3 From 12893fd5ab17f6894652b8916d98cea9b3752952 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 30 Mar 2017 09:47:49 -0700 Subject: redirect file contents to stdout before passing to mimetype --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 6f11c72f75..4eba52d7a2 100755 --- a/build.sh +++ b/build.sh @@ -276,7 +276,7 @@ do if [ -r "$build_dir/newview/viewer_version.txt" ] then begin_section "Viewer Version" - python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$build_dir/newview/viewer_version.txt" --mimetype inline-text \ + python_cmd "$helpers/codeticket.py" addoutput "Viewer Version" "$(<"$build_dir/newview/viewer_version.txt")" --mimetype inline-text \ || fatal "Upload of viewer version failed" end_section "Viewer Version" fi -- cgit v1.2.3