From 809c0575bce07ae408fba1e047a420a3ac1c9c65 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed <nat@lindenlab.com> Date: Tue, 29 Nov 2016 16:22:06 -0500 Subject: DRTVWR-418: Add viewer-build-variables to BuildParams --- BuildParams | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 09cc06e83a..5adf249269 100755 --- a/BuildParams +++ b/BuildParams @@ -34,6 +34,10 @@ 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" + ################################################################ #### Examples of how to set the viewer_channel #### # -- cgit v1.2.3 From 83209ef5c082405e3866d50c4188afd5cfaa7358 Mon Sep 17 00:00:00 2001 From: Oz Linden <oz@lindenlab.com> Date: Mon, 5 Dec 2016 13:28:40 -0500 Subject: remove more bits of the old build system --- BuildParams | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 5adf249269..cbd5be7658 100755 --- a/BuildParams +++ b/BuildParams @@ -3,7 +3,6 @@ # 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" @@ -13,27 +12,9 @@ Linux.symbolfiles = "newview/secondlife-symbols-linux.tar.bz2" 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 +73,4 @@ 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="" -- cgit v1.2.3 From 8a67aaa009f99b858e750433cfbd7901341afad8 Mon Sep 17 00:00:00 2001 From: Oz Linden <oz@lindenlab.com> Date: Mon, 5 Dec 2016 15:20:08 -0500 Subject: limit variants to RelWithDebInfo and Release --- BuildParams | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index cbd5be7658..a991781c58 100755 --- a/BuildParams +++ b/BuildParams @@ -3,10 +3,8 @@ # 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 @@ -74,3 +72,8 @@ EDU_viewer_channel_suffix = "edu" # 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" -- cgit v1.2.3 From 09b88cf4afee0c673671fe36636b1766296570e5 Mon Sep 17 00:00:00 2001 From: Oz Linden <oz@lindenlab.com> Date: Fri, 9 Dec 2016 08:12:15 -0500 Subject: add AUTOBUILD_ADDRSIZE to symbol file name for clarity, change output tag to just "Symbolfile" --- BuildParams | 4 ---- 1 file changed, 4 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index a991781c58..789c7925bd 100755 --- a/BuildParams +++ b/BuildParams @@ -73,7 +73,3 @@ EDU_viewer_channel_suffix = "edu" # 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" -- cgit v1.2.3 From d0e166fe8a803967bac081c9f6ac73e436a684f5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed <nat@lindenlab.com> Date: Tue, 13 Dec 2016 15:30:51 -0500 Subject: DRTVWR-418: Remove build_variables_repository_url from BuildParams. That should be set in TeamCity template hierarchy; don't override it. --- BuildParams | 1 - 1 file changed, 1 deletion(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index a991781c58..f1886077e3 100755 --- a/BuildParams +++ b/BuildParams @@ -15,7 +15,6 @@ build_Linux_Doxygen = true # 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" ################################################################ #### Examples of how to set the viewer_channel #### -- cgit v1.2.3