diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
| commit | f393774caf49313f24d33cb2b33b6ad92c70977f (patch) | |
| tree | ebdaf44b4c3152362f3e9b18c227bd09d39031d5 /BuildParams | |
| parent | 31e16be0daa10e6d66b133c308130524a7a0d881 (diff) | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
Merge from lindenlab/viewer-development
Diffstat (limited to 'BuildParams')
| -rw-r--r-- | BuildParams | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/BuildParams b/BuildParams index 3684a3f641..2cb58755e5 100644 --- a/BuildParams +++ b/BuildParams @@ -61,18 +61,18 @@ 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-46 + # ======================================= # brad # ======================================== - debug-halting.email = cg@lindenlab.com debug-halting.build_server = false debug-halting.build_server_tests = false @@ -156,12 +156,13 @@ media.build_viewer_update_version_manager = false # oz # ================ -oz-viewer-devreview.build_debug_release_separately = true -oz_viewer-poreview.build_debug_release_separately = true -oz-project-1.build_debug_release_separately = true -oz-project-2.build_debug_release_separately = true +oz_viewer-devreview.build_debug_release_separately = true +oz_project-1.build_debug_release_separately = true +oz_project-2.build_debug_release_separately = true oz-project-3.build_debug_release_separately = true + +oz_viewer-beta-review.build_debug_release_separately = true # ======================================== # enus # ======================================== @@ -194,5 +195,23 @@ viewer-asset-delivery-metrics.email = monty@lindenlab.com viewer-asset-delivery-metrics.build_server = false 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-autobuild2010.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 |