diff options
author | Callum Prentice <callum@gmail.com> | 2016-12-07 08:43:51 -0800 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2016-12-07 08:43:51 -0800 |
commit | 70a42af076cbe6f12a265d508b4ed96af65d26ba (patch) | |
tree | b8dd5848d4703f6320eb69c0376c492fa3a16bbb /BuildParams | |
parent | 15c043ec20eeaa08de21c0aed4e122b5095a98b0 (diff) | |
parent | 232c3598547913ca6cb66593059497b413a9322c (diff) |
Automated merge with tip of lindenlab/oz_viewer64
Diffstat (limited to 'BuildParams')
-rwxr-xr-x | BuildParams | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/BuildParams b/BuildParams index 5adf249269..a991781c58 100755 --- a/BuildParams +++ b/BuildParams @@ -3,37 +3,16 @@ # Please refer to: # 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" +# Variants (NOTE: 'Release' must be last for uploads to work correctly) +variants = "RelWithDebInfo Release" # Use Public Upload Locations public_build = true build_docs = true -# disable all Debug builds (RelWithDebInfo is sufficient) -build_CYGWIN_Debug = false -build_Linux_Debug = false -build_Darwin_Debug = false -build_Debug = false - # enable Doxygen building on Linux for TeamCity (it can be done manually on any platform) build_Linux_Doxygen = true -# Update Public Inworld Build Status Indicators (setting should mirror "public_build") -email_status_this_is_os = true - -# Limit extent of codeticket updates to revisions after... -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 - # Need viewer-build-variables as well as other shared repositories buildscripts_shared_more_NAMEs="build_variables" build_variables_repostory_url = "https://bitbucket.org/lindenlab/viewer-build-variables" @@ -92,5 +71,9 @@ EDU_viewer_channel_suffix = "edu" # Notifications - to configure email notices use the TeamCity parameter # setting screen for your project or build configuration to set the # environment variable 'email' to a space-separated list of email addresses +email="" - +# 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" |