summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-08-30 06:38:44 -0400
committerOz Linden <oz@lindenlab.com>2010-08-30 06:38:44 -0400
commitd84c6625c707b5d61b71749b74f3cc4fb8f02048 (patch)
tree7a31d44dfbd4e8244a9ee4f9504fe45ac3280482 /BuildParams
parentc4acbaf7c4120d4dc6154420c992e3942fd25df3 (diff)
parentb0bf8b9619ec89a37bfc7d8d9e7f7d49904dfb02 (diff)
Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams33
1 files changed, 25 insertions, 8 deletions
diff --git a/BuildParams b/BuildParams
index 6adae15d5f..d481072185 100644
--- a/BuildParams
+++ b/BuildParams
@@ -1,19 +1,15 @@
# BuildParams
#
# Please refer to:
-# https://wiki.lindenlab.com/wiki/Parabuild_with_Mercurial#How_Build_Parameters_Work
+# https://wiki.secondlife.com/wiki/Automated_Build_System
# Global setting for now...
Darwin.symbolfiles = "newview/Release/secondlife-symbols-darwin.tar.bz2"
CYGWIN.symbolfiles = "newview/Release/secondlife-symbols-windows.tar.bz2"
Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2"
-# Public Upload Locations overriding the default private ones
-S3PROXY_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/
-S3INTERNAL_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/
-S3GET_URL = http://automated-builds-secondlife-com.s3.amazonaws.com/
-S3PUT_URL = https://s3.amazonaws.com/automated-builds-secondlife-com/
-S3ACL = public-read
+# Use Public Upload Locations
+public_build = true
# Update Public Inworld Build Status Indicators
email_status_this_is_os = true
@@ -27,7 +23,6 @@ viewer-development.show_changes_since = 2-1-release
# Build Settings
viewer-development_coverity.coverity_product = viewer
-
viewer-development.build_debug_release_separately = true
# Notifications - to configure email notices, add a setting like this:
@@ -155,4 +150,26 @@ oz_viewer-review1_coverity.build_CYGWIN_Debug = false
oz_viewer-review1_coverity.build_CYGWIN_RelWithDebInfo = false
oz_viewer-review1_coverity.build_CYGWIN_Release = false
+oz_viewer-review2_coverity.coverity_product = viewer
+
+oz_viewer-review2.build_Linux = true
+oz_viewer-review2_debug.build_Linux = false
+oz_viewer-review2_coverity.build_Linux = false
+
+oz_viewer-review2.build_Darwin = true
+oz_viewer-review2_debug.build_Darwin = false
+oz_viewer-review2_coverity.build_Darwin = false
+
+oz_viewer-review2.build_CYGWIN = true
+oz_viewer-review2.build_CYGWIN_Debug = false
+oz_viewer-review2.build_CYGWIN_RelWithDebInfo = false
+oz_viewer-review2.build_CYGWIN_Release = true
+oz_viewer-review2_debug.build_CYGWIN_Debug = true
+oz_viewer-review2_debug.build_CYGWIN_RelWithDebInfo = true
+oz_viewer-review2_debug.build_CYGWIN_Release = false
+oz_viewer-review2_coverity.build_coverity = true
+oz_viewer-review2_coverity.build_CYGWIN_Debug = false
+oz_viewer-review2_coverity.build_CYGWIN_RelWithDebInfo = false
+oz_viewer-review2_coverity.build_CYGWIN_Release = false
+
# eof