From d65f09ebcafe6ca968236a9991961983d4cd7a47 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 18 Jun 2013 13:33:51 -0700 Subject: DRTVWR-324 : Suppress the use of BuildParams to set up the channel and use the TC environment settings instead --- BuildParams | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index a4b361261f..b7d7d57cc9 100755 --- a/BuildParams +++ b/BuildParams @@ -121,18 +121,6 @@ viewer-pathfinding.build_debug_release_separately = true viewer-pathfinding.build_CYGWIN_Debug = false viewer-pathfinding.build_viewer_update_version_manager = false -# ======================================== -# viewer-chui -# -# ======================================== - -viewer-chui.viewer_channel = "Project Viewer - CHUI" -viewer-chui.login_channel = "Project Viewer - CHUI" -viewer-chui.viewer_grid = agni -viewer-chui.build_debug_release_separately = true -viewer-chui.build_CYGWIN_Debug = false -viewer-chui.build_viewer_update_version_manager = false - # ================================================================= # asset delivery 2010 projects # ================================================================= -- cgit v1.3 From 10c8fbbedbee07355f71ef206c50957a422d7ccf Mon Sep 17 00:00:00 2001 From: JJ Linden Date: Wed, 24 Jul 2013 14:38:23 -0700 Subject: added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value --- BuildParams | 3 +++ indra/newview/viewer_manifest.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'BuildParams') diff --git a/BuildParams b/BuildParams index 84d30f651b..5ee1bd11ea 100755 --- a/BuildParams +++ b/BuildParams @@ -26,6 +26,9 @@ codeticket_since = 3.3.0-release Linux.gcc_version = /usr/bin/gcc-4.6 Linux.cxx_version = /usr/bin/g++-4.6 +# Setup default sourceid so Windows can pick up the TeamCity override +sourceid = "" + ################################################################ #### Examples of how to set the viewer_channel #### # diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 206f81cdc2..827a8f44c3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -113,12 +113,14 @@ class ViewerManifest(LLManifest): # no sourceid, no settings_install.xml file pass else: - # Single-entry subset of the LLSD content of settings.xml - content = dict(sourceid=dict(Comment='Identify referring agency to Linden web servers', - Persist=1, - Type='String', - Value=sourceid)) - self.put_in_file(llsd.format_pretty_xml(content), "settings_install.xml") + if len(sourceid) > 0: + print "Using sourceid: " + sourceid + # Single-entry subset of the LLSD content of settings.xml + content = dict(sourceid=dict(Comment='Identify referring agency to Linden web servers', + Persist=1, + Type='String', + Value=sourceid)) + self.put_in_file(llsd.format_pretty_xml(content), "settings_install.xml") self.end_prefix("app_settings") -- cgit v1.3