From bcff609fb839dc576c7e4f7529e1c751847ffd32 Mon Sep 17 00:00:00 2001
From: JJ Linden <jj@lindenlab.com>
Date: Mon, 16 Sep 2013 12:58:40 -0700
Subject: changes for additional packages to be packaged from the same build.
 see BuildParams for example environment variables used to specify the
 packages and their channels and sourceids. also updated mac packages to use a
 larger virtual drive and auto-open on download

---
 BuildParams | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index 327530934d..63812d33c1 100755
--- a/BuildParams
+++ b/BuildParams
@@ -26,8 +26,13 @@ codeticket_since = 3.3.0-release
 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
+# Setup default packaging parameters.
 sourceid = ""
+additional_packages = "Amazon Desura"
+Amazon_sourceid = "1207v_Amazon"
+Amazon_viewer_channel_suffix = " Amazon"
+Desura_sourceid = "1208_desura"
+Desura_viewer_channel_suffix = " Desura"
 
 ################################################################
 ####      Examples of how to set the viewer_channel         ####
-- 
cgit v1.2.3


From be84aefc40719dacb9ab2c0ace9a2a706d768ffc Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 18 Sep 2013 10:42:43 -0700
Subject: add experimental packaging

---
 BuildParams | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index 63812d33c1..0d7a0b5a51 100755
--- a/BuildParams
+++ b/BuildParams
@@ -26,14 +26,6 @@ codeticket_since = 3.3.0-release
 Linux.gcc_version = /usr/bin/gcc-4.6
 Linux.cxx_version = /usr/bin/g++-4.6
 
-# Setup default packaging parameters.
-sourceid = ""
-additional_packages = "Amazon Desura"
-Amazon_sourceid = "1207v_Amazon"
-Amazon_viewer_channel_suffix = " Amazon"
-Desura_sourceid = "1208_desura"
-Desura_viewer_channel_suffix = " Desura"
-
 ################################################################
 ####      Examples of how to set the viewer_channel         ####
 #
@@ -54,6 +46,18 @@ Desura_viewer_channel_suffix = " Desura"
 ################################################################
 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
 
-- 
cgit v1.2.3


From 6d6b0edfe2aea7890cb33614723b9842e700cfa8 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 24 Nov 2013 13:16:36 -0500
Subject: normalize format of and add arch to all installer names

---
 BuildParams | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index 31e7e841ad..6b63448c52 100755
--- a/BuildParams
+++ b/BuildParams
@@ -51,13 +51,13 @@ viewer_channel = "Second Life Test"
 sourceid = ""
 additional_packages = "Amazon Desura B C"
 Amazon_sourceid = "1207v_Amazon"
-Amazon_viewer_channel_suffix = " Amazon"
+Amazon_viewer_channel_suffix = "Amazon"
 Desura_sourceid = "1208_desura"
-Desura_viewer_channel_suffix = " Desura"
+Desura_viewer_channel_suffix = "Desura"
 B_sourceid = "1301_B"
-B_viewer_channel_suffix = " B"
+B_viewer_channel_suffix = "B"
 C_sourceid = "1302_C"
-C_viewer_channel_suffix = " C"
+C_viewer_channel_suffix = "C"
 
 # Report changes since...
 viewer-development.show_changes_since = last_sprint
-- 
cgit v1.2.3


From ba39f6e14fa46708bead3eff31a83c2ec2fbe2a2 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 17 Dec 2013 16:42:01 -0500
Subject: add "A" test channel package

---
 BuildParams | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index 6b63448c52..ede2595cd3 100755
--- a/BuildParams
+++ b/BuildParams
@@ -49,11 +49,13 @@ viewer_channel = "Second Life Test"
 
 # Setup default packaging parameters.
 sourceid = ""
-additional_packages = "Amazon Desura B C"
+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"
-- 
cgit v1.2.3


From 8ead3308be87b8c18600731fe5823a366e82f5a3 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 20 Feb 2014 16:44:41 -0500
Subject: remove experimental cdn packages

---
 BuildParams | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'BuildParams')

diff --git a/BuildParams b/BuildParams
index ede2595cd3..7a6542dadc 100755
--- a/BuildParams
+++ b/BuildParams
@@ -49,17 +49,11 @@ viewer_channel = "Second Life Test"
 
 # Setup default packaging parameters.
 sourceid = ""
-additional_packages = "Amazon Desura A B C"
+additional_packages = "Amazon Desura"
 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
-- 
cgit v1.2.3