summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-08-24 09:56:56 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-08-24 09:56:56 -0400
commitc2178bb6ac139d47eb2bfdf9e85811a6f02810ed (patch)
tree7e0bbb76c709e3982a5451e378becee351766cbf /build.sh
parente674f11757ab55c5ca7aab4cb1c8e059fa98f466 (diff)
DRTVWR-447: Introduce explicit CMake BUGSPLAT_DB variable.
Define the CMake cache variable, with empty string as its default. Make build.sh pass the BUGSPLAT_DB environment variable as a CMake command-line variable assignment. Change CMake 'if (DEFINED ENV{BUGSPLAT_DB})' to plain 'if (BUGSPLAT_DB)'. Make CMake pass new --bugsplat switch to every one of SIX different invocations of viewer_manifest.py. Give llmanifest.main() function an argument to allow supplementing the base set of command-line switches with additional application-specific switches. In viewer_manifest.py, define new --bugsplat command-line switch and pass to llmanifest.main(). Instead of consulting os.environ['BUGSPLAT_DB'], consult self.args['bugsplat'].
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/build.sh b/build.sh
index d531c0b046..c38bb6fff4 100755
--- a/build.sh
+++ b/build.sh
@@ -122,6 +122,7 @@ pre_build()
-DPACKAGE:BOOL=ON \
-DHAVOK:BOOL="$HAVOK" \
-DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
+ -DBUGSPLAT_DB:STRING="${BUGSPLAT_DB:-}" \
-DVIEWER_CHANNEL:STRING="${viewer_channel}" \
-DGRID:STRING="\"$viewer_grid\"" \
-DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \