diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-04 13:15:43 -0500 |
| commit | a373a7442c244712ab17d793072699ef82684816 (patch) | |
| tree | 2ed20e24993c4bfbb4f943ed7794fcd06eeb8a23 /BuildParams | |
| parent | b0c255f4e6141246f3575cb3d5b671af19966de9 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-release
Diffstat (limited to 'BuildParams')
| -rwxr-xr-x | BuildParams | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams index 327530934d..ede2595cd3 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,20 @@ sourceid = "" ################################################################ viewer_channel = "Second Life Test" +# Setup default packaging parameters. +sourceid = "" +additional_packages = "Amazon Desura A B C" +Amazon_sourceid = "1207v_Amazon" +Amazon_viewer_channel_suffix = "Amazon" +Desura_sourceid = "1208_desura" +Desura_viewer_channel_suffix = "Desura" +A_sourceid = "1300_A" +A_viewer_channel_suffix = "A" +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 |