From 9e5e15f0cb126d7b8eed58dbff13b67bc9d7788d Mon Sep 17 00:00:00 2001 From: Andrew de Laix Date: Sat, 22 Jan 2011 00:12:30 +0000 Subject: turn off parallel builds. --- BuildParams | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 0a4271f7a8..5557b8db8a 100644 --- a/BuildParams +++ b/BuildParams @@ -233,5 +233,8 @@ viewer-asset-delivery-metrics.email = monty@lindenlab.com viewer-asset-delivery-metrics.build_server = false viewer-asset-delivery-metrics.build_server_tests = false - +#============================================================================== +# viewer-autobuild +#============================================================================== +viewer-autobuild.build_link_parallel = false # eof -- cgit v1.2.3 From 008938e37292cc8b66e19f2df3f745e9b178b86d Mon Sep 17 00:00:00 2001 From: Alain Linden Date: Wed, 16 Feb 2011 16:39:33 -0800 Subject: turn off parallel linux builds; they don't work for autobuild driven builds. --- BuildParams | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 5557b8db8a..cf837dac70 100644 --- a/BuildParams +++ b/BuildParams @@ -234,7 +234,8 @@ viewer-asset-delivery-metrics.build_server = false viewer-asset-delivery-metrics.build_server_tests = false #============================================================================== -# viewer-autobuild +# autobuild viewers #============================================================================== viewer-autobuild.build_link_parallel = false +viewer-vs2010.build_link_parallel = false # eof -- cgit v1.2.3 From fb94ad7646b5c8a2eaa65e41b0b8b1679652d956 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 17 Feb 2011 12:39:01 -0500 Subject: try disabling parallel builds in TC for Linux --- BuildParams | 58 +--------------------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index e1e91333d0..22cf93ad9c 100644 --- a/BuildParams +++ b/BuildParams @@ -57,14 +57,6 @@ viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true viewer-release.release-viewer.jira = DRTVWR-13 -# ======================================== -# aimee -# ======================================== - -viewer-development-import.build_debug_release_separately = true -viewer-development-fixes.build_debug_release_separately = true -viewer-development-tweaks.build_debug_release_separately = true - # ======================================= # brad # ======================================== @@ -152,55 +144,7 @@ media.build_viewer_update_version_manager = false # oz # ================ -oz_viewer-review1_coverity.coverity_product = viewer - -oz_viewer-review1.build_Linux = true -oz_viewer-review1_debug.build_Linux = false -oz_viewer-review1_coverity.build_Linux = false - -oz_viewer-review1.build_Darwin = true -oz_viewer-review1_debug.build_Darwin = false -oz_viewer-review1_coverity.build_Darwin = false - -oz_viewer-review1.build_CYGWIN = true -oz_viewer-review1.build_CYGWIN_Debug = false -oz_viewer-review1.build_CYGWIN_RelWithDebInfo = false -oz_viewer-review1.build_CYGWIN_Release = true -oz_viewer-review1_debug.build_CYGWIN_Debug = true -oz_viewer-review1_debug.build_CYGWIN_RelWithDebInfo = true -oz_viewer-review1_debug.build_CYGWIN_Release = false -oz_viewer-review1_coverity.build_coverity = true -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 - -# ======================================== -# tofu -# ======================================== - -tofu_viewer-development-staging.email = tofu.linden@lindenlab.com +L-oz_viewer-autobuild.build_link_parallel=false # ======================================== # enus -- cgit v1.2.3 From 76d67b1f78eb4e8dc11c962d998e06fe28653a4b Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 17 Feb 2011 18:46:04 -0500 Subject: adjust parameters for integration build --- BuildParams | 1 + 1 file changed, 1 insertion(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 8a188ad231..26ca976b74 100644 --- a/BuildParams +++ b/BuildParams @@ -145,6 +145,7 @@ media.build_viewer_update_version_manager = false # ================ L-oz_viewer-autobuild.build_link_parallel=false +L-oz_viewer-autobuildvs2010.build_link_parallel=false # ======================================== # enus -- cgit v1.2.3 From 6a10c803d3b7d16c25d085f19fafd404b95eb485 Mon Sep 17 00:00:00 2001 From: Jennifer Leech Date: Tue, 1 Mar 2011 14:26:24 -0800 Subject: Setting TMP env var to be used during builds. Possible collision when using VS2010 with system-wide TMP directory. Also temporarily disabling Debug and Release builds to get a faster loop cyle on TC. --- BuildParams | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index cf837dac70..3f2d74421a 100644 --- a/BuildParams +++ b/BuildParams @@ -238,4 +238,12 @@ viewer-asset-delivery-metrics.build_server_tests = false #============================================================================== viewer-autobuild.build_link_parallel = false viewer-vs2010.build_link_parallel = false + + +#============================================================================== +# vs2010 debug - for TC debugging only +#============================================================================== +viewer-vs2010.build_CYGWIN_Debug = false +viewer-vs2010.build_CYGWIN_Release = false + # eof -- cgit v1.2.3 From c3efc900c612c8222a8112eb3ee5ca78848cf080 Mon Sep 17 00:00:00 2001 From: Jennifer Leech Date: Wed, 2 Mar 2011 14:40:31 -0800 Subject: Make temporary disabling of Debug/Release builds broadened to all builds regardless of name. Need to increase iteration speed. Will revert when finished. --- BuildParams | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 3f2d74421a..067ce91b8b 100644 --- a/BuildParams +++ b/BuildParams @@ -243,7 +243,7 @@ viewer-vs2010.build_link_parallel = false #============================================================================== # vs2010 debug - for TC debugging only #============================================================================== -viewer-vs2010.build_CYGWIN_Debug = false -viewer-vs2010.build_CYGWIN_Release = false +build_CYGWIN_Debug = false +build_CYGWIN_Release = false # eof -- cgit v1.2.3 From 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 Mon Sep 17 00:00:00 2001 From: Jennifer Leech Date: Wed, 2 Mar 2011 16:42:03 -0800 Subject: RelWithDebInfo build succeeded on TeamCity! Re-enabling Degug and Release builds. --- BuildParams | 7 ------- 1 file changed, 7 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 067ce91b8b..5ec8517ccf 100644 --- a/BuildParams +++ b/BuildParams @@ -239,11 +239,4 @@ viewer-asset-delivery-metrics.build_server_tests = false viewer-autobuild.build_link_parallel = false viewer-vs2010.build_link_parallel = false - -#============================================================================== -# vs2010 debug - for TC debugging only -#============================================================================== -build_CYGWIN_Debug = false -build_CYGWIN_Release = false - # eof -- cgit v1.2.3 From 4d11d30a3e241ccc52f099079f597a71142a187e Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Wed, 16 Mar 2011 19:29:14 -0400 Subject: Updated BuildParams in prep for vs2010 project viewer. --- BuildParams | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index ac64b834de..df569b65e0 100644 --- a/BuildParams +++ b/BuildParams @@ -238,6 +238,15 @@ viewer-asset-delivery-metrics.build_server_tests = false # autobuild viewers #============================================================================== viewer-autobuild.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 -- cgit v1.2.3 From 1ce22e11fd5cca67bf7e8d42d11bff7f710cce93 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Thu, 17 Mar 2011 12:49:30 -0400 Subject: Removed trailing spaces that were breaking BuildParams parsing. --- BuildParams | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index df569b65e0..dbaf7d67a2 100644 --- a/BuildParams +++ b/BuildParams @@ -242,11 +242,11 @@ viewer-autobuild.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.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 -- cgit v1.2.3 From cd48598333af1b28e8e5f648feaa9ec3c01c13b0 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 18 Mar 2011 08:25:29 -0400 Subject: configure oz_viewer-autobuild2010 for separate debug builds on windows --- BuildParams | 1 + 1 file changed, 1 insertion(+) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index e162b9bdf2..fe6e77151a 100644 --- a/BuildParams +++ b/BuildParams @@ -156,6 +156,7 @@ media.build_viewer_update_version_manager = false # ================ oz_viewer-devreview.build_debug_release_separately = true +oz_viewer-autobuild2010.build_debug_release_separately = true # ======================================== # enus -- cgit v1.2.3 From c54d5353a6986c2cb5e2b053164052de82088ac5 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 18 Mar 2011 12:46:16 -0400 Subject: add build name parameters --- BuildParams | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index fe6e77151a..aa6c935b7f 100644 --- a/BuildParams +++ b/BuildParams @@ -156,7 +156,7 @@ media.build_viewer_update_version_manager = false # ================ oz_viewer-devreview.build_debug_release_separately = true -oz_viewer-autobuild2010.build_debug_release_separately = true +oz_ # ======================================== # enus @@ -193,6 +193,10 @@ 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-autobuild.build_link_parallel = false #======================================== -- cgit v1.2.3 From 6991eafce8545b4a435913cecda89f6b7f3fd369 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 18 Mar 2011 19:44:54 -0400 Subject: disable parallel linking in autobuild2010 --- BuildParams | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index aa6c935b7f..502abcf58d 100644 --- a/BuildParams +++ b/BuildParams @@ -155,8 +155,7 @@ media.build_viewer_update_version_manager = false # oz # ================ -oz_viewer-devreview.build_debug_release_separately = true -oz_ +viewer-devreview.build_debug_release_separately = true # ======================================== # enus @@ -197,7 +196,7 @@ 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-autobuild.build_link_parallel = false +viewer-autobuild2010.build_link_parallel = false #======================================== # VS2010 -- cgit v1.2.3 From b597bc02d73e412e1a80d1cf6ea7091fa561c106 Mon Sep 17 00:00:00 2001 From: Dessie Linden Date: Thu, 24 Mar 2011 12:51:25 -0700 Subject: Set release-viewer.jira value to DRTVWR-39 --- BuildParams | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 1172fe1c71..a0c8eeaae1 100644 --- a/BuildParams +++ b/BuildParams @@ -61,13 +61,12 @@ 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.release-viewer.jira = DRTVWR-13 viewer-pre-release.viewer_channel = "Second Life Release" 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-13 +viewer-pre-release.release-viewer.jira = DRTVWR-39 # ======================================== # aimee -- cgit v1.2.3