summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 12:47:19 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 12:47:19 -0400
commit2f74cd32791dc9025e1e396b2f535fdfb6b1ca87 (patch)
tree6d57ab7f0d3ea7717276fca421e98547d52b5124 /BuildParams
parent6bee9532207cfabd1c6315ea00fa7703bc401d2c (diff)
parenta03f6997d8c3519e2c89930a1ed03a787af6f7ae (diff)
merge changes for storm-1130
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams20
1 files changed, 19 insertions, 1 deletions
diff --git a/BuildParams b/BuildParams
index 8e8ffeb447..9f962d45d3 100644
--- a/BuildParams
+++ b/BuildParams
@@ -67,7 +67,6 @@ viewer-pre-release.login_channel = "Second Life Release"
viewer-pre-release.build_debug_release_separately = true
viewer-pre-release.build_viewer_update_version_manager = true
viewer-pre-release.release-viewer.jira = DRTVWR-39
-
# =======================================
# brad
# ========================================
@@ -156,6 +155,7 @@ media.build_viewer_update_version_manager = false
# ================
oz-viewer-devreview.build_debug_release_separately = true
+viewer-devreview.build_debug_release_separately = true
oz_viewer-poreview.build_debug_release_separately = true
oz-project-1.build_debug_release_separately = true
oz-project-2.build_debug_release_separately = true
@@ -193,5 +193,23 @@ viewer-asset-delivery-metrics.email = monty@lindenlab.com
viewer-asset-delivery-metrics.build_server = false
viewer-asset-delivery-metrics.build_server_tests = false
+#==============================================================================
+# autobuild viewers
+#==============================================================================
+viewer-autobuild2010.build_debug_release_separately = true
+viewer-autobuild2010.viewer_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.login_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.viewer_grid = agni
+viewer-autobuild2010.build_link_parallel = false
+
+#========================================
+# VS2010
+#========================================
+viewer-vs2010.viewer_channel = "Project Viewer - VS2010"
+viewer-vs2010.login_channel = "Project Viewer - VS2010"
+viewer-vs2010.viewer_grid = agni
+viewer-vs2010.build_debug_release_separately = true
+viewer-vs2010.build_viewer_update_version_manager = false
+viewer-vs2010.build_link_parallel = false
# eof