diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-05-02 20:49:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-05-02 20:49:47 -0400 |
| commit | 8f720b59d35d172b0a34ff73c7724d9bae258aa2 (patch) | |
| tree | 52cfc4417f99b666cf73e5bed3a9d3c9d2257994 /indra/newview/viewer_manifest.py | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
CHOP-599: if build.sh creates summary.json, package it with viewer.
Recent versions of the viewer's build-dependent build.sh create and upload a
summary.json file in the top level of the source repository checkout. Bundle
that into the viewer installer. This is the one file that contains the
viewer's version.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rw-r--r-- | indra/newview/viewer_manifest.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f671c770ea..450d274fd7 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -114,6 +114,16 @@ class ViewerManifest(LLManifest): # Files in the newview/ directory self.path("gpu_table.txt") + # The summary.json file gets left in the base checkout dir by + # build.sh. It's only created for a build.sh build, therefore we + # have to check whether it exists. :-P + summary_json = "summary.json" + summary_json_path = os.path.join(os.pardir, os.pardir, summary_json) + if os.path.exists(os.path.join(self.get_src_prefix(), summary_json_path)): + self.path(summary_json_path, summary_json) + else: + print "No %s" % os.path.join(self.get_src_prefix(), summary_json_path) + def login_channel(self): """Channel reported for login and upgrade purposes ONLY; used for A/B testing""" |