diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-09 10:38:24 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-09 10:38:24 -0800 |
| commit | 999626e0716db71bac431a4703025a1b1430dcef (patch) | |
| tree | 602d0d7bd252b44d93598ac108e94e8f88f984b3 | |
| parent | 6fb42d7ae8315885fda23da440dce01aeee8eafb (diff) | |
| parent | f712614d7bfb132cf0d4bc5ff5e2e02ea73a9bda (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
| -rw-r--r-- | .hgtags | 3 | ||||
| -rw-r--r-- | BuildParams | 45 |
2 files changed, 16 insertions, 32 deletions
@@ -263,6 +263,8 @@ c6175c955a19e9b9353d242889ec1779b5762522 3.2.5-release 16f8e2915f3f2e4d732fb3125daf229cb0fd1875 3.2.8-beta1 987425b1acf4752379b2e1eb20944b4b35d67a85 DRTVWR-115_3.2.8-beta2 987425b1acf4752379b2e1eb20944b4b35d67a85 3.2.8-beta2 +51b2fd52e36aab8f670e0874e7e1472434ec4b4a DRTVWR-113_3.2.8-release +51b2fd52e36aab8f670e0874e7e1472434ec4b4a 3.2.8-release 37dd400ad721e2a89ee820ffc1e7e433c68f3ca2 3.2.9-start e9c82fca5ae6fb8a8af29012d78fb194a29323f3 DRTVWR-117_3.2.9-beta1 e9c82fca5ae6fb8a8af29012d78fb194a29323f3 3.2.9-beta1 @@ -270,3 +272,4 @@ a01ef9bed28627f4ca543fbc1d70c79cc297a90f DRTVWR-118_3.2.9-beta2 a01ef9bed28627f4ca543fbc1d70c79cc297a90f 3.2.9-beta2 987425b1acf4752379b2e1eb20944b4b35d67a85 3.2.8-beta2 d5f263687f43f278107363365938f0a214920a4b 3.3.0-start +dffd0457ee0745de65bf95f0642a5c9e46b8e2f0 viewer-beta-candidate diff --git a/BuildParams b/BuildParams index 555ed8e7a0..cef701e3a4 100644 --- a/BuildParams +++ b/BuildParams @@ -36,50 +36,25 @@ viewer-development.build_debug_release_separately = true # <username>_<reponame>.email = <email-address> # ================================================================= -# Viewer Development (snowstorm canonical build owned by Oz Linden) +# Canonical viewer integration builds - Oz Linden # ================================================================= -snowstorm_viewer-development.viewer_channel = "Second Life Development" -snowstorm_viewer-development.login_channel = "Second Life Development" -snowstorm_viewer-development.build_viewer_update_version_manager = false -snowstorm_viewer-development.email = viewer-development-builds@lists.secondlife.com -snowstorm_viewer-development.build_enforce_coding_policy = true -snowstorm_viewer-development.codeticket_add_context = true +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 = true +integration_viewer-development.codeticket_add_context = true -Snowstorm_viewer-project-review.build_debug_release_separately = true -Snowstorm_viewer-project-review.codeticket_add_context = true -Snowstorm_viewer-project-review.viewer_channel = "Project Viewer - Snowstorm Team" -Snowstorm_viewer-project-review.login_channel = "Project Viewer - Snowstorm Team" -Snowstorm_viewer-project-review.codeticket_add_context = true - -# ======================================== -# Viewer Beta (Owner: Dessie Linden) -# ======================================== 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-pre-beta.viewer_channel = "Second Life Beta Viewer" -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 (Owner: Dessie Linden) -# ======================================== 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-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-92 - - # ======================================== # mesh-development # ======================================== @@ -151,6 +126,12 @@ viewer-pathfinding.build_viewer_update_version_manager = false # oz # ================ +Snowstorm_viewer-project-review.build_debug_release_separately = true +Snowstorm_viewer-project-review.codeticket_add_context = true +Snowstorm_viewer-project-review.viewer_channel = "Project Viewer - Snowstorm Team" +Snowstorm_viewer-project-review.login_channel = "Project Viewer - Snowstorm Team" +Snowstorm_viewer-project-review.codeticket_add_context = true + oz_viewer-devreview.build_debug_release_separately = true oz_viewer-devreview.codeticket_add_context = false oz_viewer-devreview.build_enforce_coding_policy = true |