diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-03-21 10:38:39 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-03-21 10:38:39 -0400 |
commit | be553242ef706e33260f3f9e62d02f4720f00473 (patch) | |
tree | 553a150a63cd8105f8860780ef7d02f12a69eb23 /BuildParams | |
parent | 9c1c791b29cb5087ebff142d4ad7a55b65be0ad0 (diff) | |
parent | df63c6931e81c034887611711095e3134b9a7318 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'BuildParams')
-rwxr-xr-x | BuildParams | 63 |
1 files changed, 6 insertions, 57 deletions
diff --git a/BuildParams b/BuildParams index c87f5a6034..7011875626 100755 --- a/BuildParams +++ b/BuildParams @@ -53,6 +53,7 @@ viewer-pre-beta.login_channel = "Second Life Beta Viewer" viewer-pre-beta.build_debug_release_separately = true viewer-pre-beta.build_viewer_update_version_manager = true + # ======================================== # Viewer Release # ======================================== @@ -68,14 +69,6 @@ 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 -# ======================================== -# 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 # ======================================== @@ -189,55 +182,11 @@ 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 +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-project-3.build_debug_release_separately = true # ======================================== # enus |