summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
committerBaker Linden <baker@lindenlab.com>2013-12-18 18:25:47 -0500
commit3c521d8207092f1c48e158082b88c5e81cc9c440 (patch)
tree36a18cfaed8fc4e3ee2a84604f3876832522e529 /BuildParams
parent74707f0057c05dc4dd439302e64fe29e8ed91a32 (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
viewer-release merge
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams16
1 files changed, 13 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams
index 327530934d..6b63448c52 100755
--- a/BuildParams
+++ b/BuildParams
@@ -23,12 +23,10 @@ codeticket_since = 3.3.0-release
# Override build system default toolchain
# Note that this will only affect automated builds.
+Linux.distcc_version =
Linux.gcc_version = /usr/bin/gcc-4.6
Linux.cxx_version = /usr/bin/g++-4.6
-# Setup default sourceid so Windows can pick up the TeamCity override
-sourceid = ""
-
################################################################
#### Examples of how to set the viewer_channel ####
#
@@ -49,6 +47,18 @@ sourceid = ""
################################################################
viewer_channel = "Second Life Test"
+# Setup default packaging parameters.
+sourceid = ""
+additional_packages = "Amazon Desura B C"
+Amazon_sourceid = "1207v_Amazon"
+Amazon_viewer_channel_suffix = "Amazon"
+Desura_sourceid = "1208_desura"
+Desura_viewer_channel_suffix = "Desura"
+B_sourceid = "1301_B"
+B_viewer_channel_suffix = "B"
+C_sourceid = "1302_C"
+C_viewer_channel_suffix = "C"
+
# Report changes since...
viewer-development.show_changes_since = last_sprint