From 9f10618f304160b207a296e843fabeb8c67e5140 Mon Sep 17 00:00:00 2001 From: William Todd Stinson Date: Wed, 29 Aug 2012 19:48:20 -0700 Subject: Setting up the project viewer for materials. --- BuildParams | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index ebfc640023..258dd43b41 100644 --- a/BuildParams +++ b/BuildParams @@ -136,6 +136,17 @@ viewer-pathfinding.build_debug_release_separately = true viewer-pathfinding.build_CYGWIN_Debug = false viewer-pathfinding.build_viewer_update_version_manager = false +# ======================================== +# viewer-materials +# ======================================== + +viewer-materials.viewer_channel = "Project Viewer - Materials" +viewer-materials.login_channel = "Project Viewer - Materials" +viewer-materials.viewer_grid = aditi +viewer-materials.build_debug_release_separately = true +viewer-materials.build_CYGWIN_Debug = false +viewer-materials.build_viewer_update_version_manager = false + # ================================================================= # asset delivery 2010 projects # ================================================================= -- cgit v1.2.3 From 8808325ced4d380d937c9be1cc81e20a5ebb5f62 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 14 Sep 2012 11:27:04 +0000 Subject: Removed appearance utility from viewer source. Added appearance utility autobuild package. --- BuildParams | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index ebfc640023..cfe21696b0 100644 --- a/BuildParams +++ b/BuildParams @@ -8,9 +8,13 @@ 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=Release + # Use Public Upload Locations public_build = true +clean_on_success = false + # skip windows debug build until we can get a fix in. build_CYGWIN_Debug = false -- cgit v1.2.3 From af3b020f544a71f759b55dee86b8c1f0f6a7f732 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 14 Sep 2012 11:28:16 +0000 Subject: Removed temporary debugging build params --- BuildParams | 4 ---- 1 file changed, 4 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index cfe21696b0..ebfc640023 100644 --- a/BuildParams +++ b/BuildParams @@ -8,13 +8,9 @@ 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=Release - # Use Public Upload Locations public_build = true -clean_on_success = false - # skip windows debug build until we can get a fix in. build_CYGWIN_Debug = false -- cgit v1.2.3 From c06c35609c6683731eaea283468f6b32af18fea2 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 11 Oct 2012 00:09:04 +0000 Subject: Updating linux build to gcc4.6 --- BuildParams | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index ebfc640023..4567f72ede 100644 --- a/BuildParams +++ b/BuildParams @@ -20,6 +20,11 @@ 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.gcc_version = /usr/bin/gcc-4.6 +Linux.cxx_version = /usr/bin/g++-4.6 + # ======================================== # Viewer Development # ======================================== -- cgit v1.2.3 From 5ea68c69a443fb9364c6e86ec373d3bd57382da7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 12 Feb 2013 10:50:47 -0500 Subject: convert to new channel name scheme and remove login_channel build time parameter --- BuildParams | 41 ++++------------------------------------- 1 file changed, 4 insertions(+), 37 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index c8edfeaa2f..547a591310 100644 --- a/BuildParams +++ b/BuildParams @@ -21,50 +21,29 @@ email_status_this_is_os = true # Limit extent of codeticket updates to revisions after... codeticket_since = 3.3.0-release -# ======================================== -# Viewer Development -# ======================================== - # Report changes since... viewer-development.show_changes_since = last_sprint # Build Settings -viewer-development_coverity.coverity_product = viewer -viewer-development_coverity.run_tests = false viewer-development.build_debug_release_separately = true # Notifications - to configure email notices, add a setting like this: # _.email = - -# ================================================================= -# Canonical viewer integration builds - Oz Linden -# ================================================================= -integration_viewer-development.viewer_channel = "Second Life Development" -integration_viewer-development.login_channel = "Second Life Development" -integration_viewer-development.build_viewer_update_version_manager = false -integration_viewer-development.email = viewer-development-builds@lists.secondlife.com -integration_viewer-development.build_enforce_coding_policy = false -integration_viewer-development.codeticket_add_context = false - -viewer-beta.viewer_channel = "Second Life Beta Viewer" -viewer-beta.login_channel = "Second Life Beta Viewer" -viewer-beta.build_debug_release_separately = true -viewer-beta.build_viewer_update_version_manager = true -viewer-beta.codeticket_add_context = false +# Example of how to build a Project Beta for the Bingo Project +#bingo-beta.viewer_channel = "Second Life Beta Bingo" +# Example of how to build a Project Integration build for the Bingo Project +#bingo-beta.viewer_channel = "Second Life Project Bingo" viewer-release.viewer_channel = "Second Life Release" -viewer-release.login_channel = "Second Life Release" viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true viewer-release.codeticket_add_context = false - # ======================================== # mesh-development # ======================================== mesh-development.viewer_channel = "Project Viewer - Mesh" -mesh-development.login_channel = "Project Viewer - Mesh" mesh-development.viewer_grid = aditi mesh-development.build_debug_release_separately = true mesh-development.build_CYGWIN_Debug = false @@ -74,7 +53,6 @@ mesh-development.build_viewer_update_version_manager = false # mesh-development-release-1-candidate # ======================================== mesh-development-release-1-candidate.viewer_channel = "Project Viewer - Mesh" -mesh-development-release-1-candidate.login_channel = "Project Viewer - Mesh" mesh-development-release-1-candidate.viewer_grid = agni mesh-development-release-1-candidate.build_debug_release_separately = true mesh-development-release-1-candidate.build_CYGWIN_Debug = false @@ -84,7 +62,6 @@ mesh-development-release-1-candidate.build_viewer_update_version_manager = false # mesh-development-rc # ======================================== mesh-development-rc.viewer_channel = "Project Viewer - Mesh" -mesh-development-rc.login_channel = "Project Viewer - Mesh" mesh-development-rc.viewer_grid = agni mesh-development-rc.build_debug_release_separately = true mesh-development-rc.build_CYGWIN_Debug = false @@ -94,7 +71,6 @@ mesh-development-rc.build_viewer_update_version_manager = false # mesh-asset-deprecation # ======================================== mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation" -mesh-asset-deprecation.login_channel = "Project Viewer - Mesh Asset Deprecation" mesh-asset-deprecation.viewer_grid = aditi mesh-asset-deprecation.build_debug_release_separately = true mesh-asset-deprecation.build_CYGWIN_Debug = false @@ -112,7 +88,6 @@ viewer-mesh.build_viewer_update_version_manager = false viewer-mesh.build_Debug = false viewer-mesh.build_RelWithDebInfo = false viewer-mesh.viewer_channel = "Project Viewer - Mesh" -viewer-mesh.login_channel = "Project Viewer - Mesh" viewer-mesh.viewer_grid = aditi viewer-mesh.email = shining@lists.lindenlab.com @@ -121,7 +96,6 @@ viewer-mesh.email = shining@lists.lindenlab.com # ======================================== viewer-pathfinding.viewer_channel = "Project Viewer - Pathfinding" -viewer-pathfinding.login_channel = "Project Viewer - Pathfinding" viewer-pathfinding.viewer_grid = agni viewer-pathfinding.build_debug_release_separately = true viewer-pathfinding.build_CYGWIN_Debug = false @@ -131,14 +105,12 @@ viewer-pathfinding.build_viewer_update_version_manager = false # asset delivery 2010 projects # ================================================================= viewer-asset-delivery.viewer_channel = "Second Life Development" -viewer-asset-delivery.login_channel = "Second Life Development" viewer-asset-delivery.build_viewer_update_version_manager = false viewer-asset-delivery.email = monty@lindenlab.com viewer-asset-delivery.build_server = false viewer-asset-delivery.build_server_tests = false viewer-asset-delivery-metrics.viewer_channel = "Second Life Development" -viewer-asset-delivery-metrics.login_channel = "Second Life Development" viewer-asset-delivery-metrics.build_viewer_update_version_manager = false viewer-asset-delivery-metrics.email = monty@lindenlab.com viewer-asset-delivery-metrics.build_server = false @@ -155,34 +127,29 @@ simon_viewer-dev-private.email_status_this_is_os = false # Vir # ======================================== vir-project-1.viewer_channel = "Second Life Release" -vir-project-1.login_channel = "Second Life Release" # ======================================== # THX-1138 / Runway projects # ======================================== viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway" -viewer-thx1138-runway-shared.login_channel = "Project Viewer - THX-1138 Runway" viewer-thx1138-runway-shared.viewer_grid = uma viewer-thx1138-runway-shared.build_debug_release_separately = true viewer-thx1138-runway-shared.build_CYGWIN_Debug = false viewer-thx1138-runway-shared.build_viewer_update_version_manager = false viewer-thx1138.viewer_channel = "Project Viewer - THX-1138" -viewer-thx1138.login_channel = "Project Viewer - THX-1138" viewer-thx1138.viewer_grid = uma viewer-thx1138.build_debug_release_separately = true viewer-thx1138.build_CYGWIN_Debug = false viewer-thx1138.build_viewer_update_version_manager = false runway-merge.viewer_channel = "Project Viewer - Runway Merge" -runway-merge.login_channel = "Project Viewer - Runway Merge" runway-merge.viewer_grid = agni runway-merge.build_debug_release_separately = true runway-merge.build_CYGWIN_Debug = false runway-merge.build_viewer_update_version_manager = false runway.viewer_channel = "Project Viewer - Runway" -runway.login_channel = "Project Viewer - Runway" runway.viewer_grid = agni runway.build_debug_release_separately = true runway.build_CYGWIN_Debug = false -- cgit v1.2.3 From 510c476468132190578e65fe03bfb7f282fe6a60 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 20 Feb 2013 15:52:37 -0500 Subject: clarify how to set viewer_channel for different build types --- BuildParams | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 547a591310..7c77f6c186 100644 --- a/BuildParams +++ b/BuildParams @@ -21,6 +21,25 @@ email_status_this_is_os = true # Limit extent of codeticket updates to revisions after... codeticket_since = 3.3.0-release +################################################################ +#### Examples of how to set the viewer_channel #### +# +# To build a Release or Release candidate in build bingo: +# bingo.viewer_channel = "Second Life Release" +# +# To build a Beta for the 'Bingo' project in build bingo: +# bingo.viewer_channel = "Second Life Beta Bingo" +# +# To build a Project viewer for the 'Bingo' project in build bingo: +# bingo.viewer_channel = "Second Life Project Bingo" +# +# If left unset, viewer_channel defaults to 'Second Life Test', +# which is appropriate for individual developer builds. +# +# All Linden Lab builds (and only Linden Lab builds) +# should use a viewer_channel that begins with "Second Life" +################################################################ + # Report changes since... viewer-development.show_changes_since = last_sprint @@ -30,11 +49,6 @@ viewer-development.build_debug_release_separately = true # Notifications - to configure email notices, add a setting like this: # _.email = -# Example of how to build a Project Beta for the Bingo Project -#bingo-beta.viewer_channel = "Second Life Beta Bingo" -# Example of how to build a Project Integration build for the Bingo Project -#bingo-beta.viewer_channel = "Second Life Project Bingo" - viewer-release.viewer_channel = "Second Life Release" viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true -- cgit v1.2.3 From 0b1d70fd71231c97e3489dfde07e327517cb5d7d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 3 Jan 2013 16:36:39 -0500 Subject: whitespace change to force new codeticket --- BuildParams | 1 - 1 file changed, 1 deletion(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index bb8e2c52a0..45a0b44edb 100644 --- a/BuildParams +++ b/BuildParams @@ -59,7 +59,6 @@ viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true viewer-release.codeticket_add_context = false - # ======================================== # mesh-development # ======================================== -- cgit v1.2.3 From b7cd89da5f74663a9fd547af77afaed06cdb05fd Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 12 Feb 2013 16:43:16 -0500 Subject: change to force new codeticket number --- BuildParams | 1 + 1 file changed, 1 insertion(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 45a0b44edb..fa8238c478 100644 --- a/BuildParams +++ b/BuildParams @@ -200,3 +200,4 @@ runway.build_viewer_update_version_manager = false # eof + -- cgit v1.2.3 From 8397f620593d3a5c96e2480909868c79c0c4de84 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 27 Feb 2013 13:19:50 -0500 Subject: force new codeticket number --- BuildParams | 1 + 1 file changed, 1 insertion(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index fa8238c478..e9d06eb6d7 100644 --- a/BuildParams +++ b/BuildParams @@ -201,3 +201,4 @@ runway.build_viewer_update_version_manager = false # eof + -- cgit v1.2.3 From 89816222d2de855204413700d023fb4102ed6307 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 1 Mar 2013 12:56:20 -0500 Subject: change channel name to new convention --- BuildParams | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index e9d06eb6d7..eb112277ba 100644 --- a/BuildParams +++ b/BuildParams @@ -130,9 +130,8 @@ viewer-pathfinding.build_viewer_update_version_manager = false # viewer-materials # ======================================== -viewer-materials.viewer_channel = "Project Viewer - Materials" -viewer-materials.login_channel = "Project Viewer - Materials" -viewer-materials.viewer_grid = aditi +viewer-materials.viewer_channel = "Second Life Project Materials" +viewer-materials.login_channel = "Second Life Project Materials" viewer-materials.build_debug_release_separately = true viewer-materials.build_CYGWIN_Debug = false viewer-materials.build_viewer_update_version_manager = false -- cgit v1.2.3 From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 29 Mar 2013 07:50:08 -0700 Subject: Update Mac and Windows breakpad builds to latest --- BuildParams | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 BuildParams (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams old mode 100644 new mode 100755 -- cgit v1.2.3 From 2bcc75470dc8a6833a0d75ee7aa6205a67eb1564 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 30 Apr 2013 14:19:34 -0400 Subject: Override default channel from buildscripts project --- BuildParams | 1 + 1 file changed, 1 insertion(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index b91d3d2a80..a4b361261f 100755 --- a/BuildParams +++ b/BuildParams @@ -44,6 +44,7 @@ Linux.cxx_version = /usr/bin/g++-4.6 # All Linden Lab builds (and only Linden Lab builds) # should use a viewer_channel that begins with "Second Life" ################################################################ +viewer_channel = "Second Life Test" # Report changes since... viewer-development.show_changes_since = last_sprint -- cgit v1.2.3 From 4d62a56ff9bc9f2db5d85d5549e6bb7d8a84d04a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 17 May 2013 16:27:17 -0400 Subject: advance project to Beta phase... !!! --- BuildParams | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 863989724d..84d30f651b 100755 --- a/BuildParams +++ b/BuildParams @@ -126,8 +126,7 @@ viewer-pathfinding.build_viewer_update_version_manager = false # viewer-materials # ======================================== -viewer-materials.viewer_channel = "Second Life Project Materials" -viewer-materials.login_channel = "Second Life Project Materials" +viewer-materials.viewer_channel = "Second Life Beta Materials" viewer-materials.build_debug_release_separately = true viewer-materials.build_CYGWIN_Debug = false viewer-materials.build_viewer_update_version_manager = false -- cgit v1.2.3