diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:06:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 19:06:07 -0400 |
| commit | 0103d327cda091ac6fe19eeec7218351504708d9 (patch) | |
| tree | 1b9e30b1b0816a86b9b1cc722c90212aef9c3e16 | |
| parent | 0ca94ddec21e276707cb4c69de19e5d738f89532 (diff) | |
| parent | f5355e9580a9cb0d6397ed3dbea048ba2bcbdf8e (diff) | |
merge changes for storm-1219
| -rwxr-xr-x | build.sh | 5 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 10 |
2 files changed, 12 insertions, 3 deletions
@@ -125,6 +125,7 @@ if test -f scripts/update_version_files.py ; then --verbose \ | sed -n -e "s,Setting viewer channel/version: '\([^']*\)' / '\([^']*\)',VIEWER_CHANNEL='\1';VIEWER_VERSION='\2',p")\ || fail update_version_files.py + echo "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_VERSION}\"}" > summary.json end_section UpdateVer fi @@ -262,9 +263,7 @@ then else upload_item installer "$package" binary/octet-stream upload_item quicklink "$package" binary/octet-stream - - echo "{\"Type\":\"viewer\",\"Version\":\"${VIEWER_VERSION}\"}" > summary.json - upload_item installer summary.json text/plain + [ -f summary.json ] && upload_item installer summary.json text/plain # Upload crash reporter files. case "$last_built_variant" in 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""" |