diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-05-03 13:40:10 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-05-03 13:40:10 -0400 |
| commit | f5355e9580a9cb0d6397ed3dbea048ba2bcbdf8e (patch) | |
| tree | 99b6b68465f12a8534b989161f79df854d89e36b | |
| parent | 8f720b59d35d172b0a34ff73c7724d9bae258aa2 (diff) | |
CHOP-599: create summary.json early enough to package with installer.
viewer_manifest.py will now package a summary.json file, if present; but
previously build.sh didn't create that file until after the viewer build.
| -rwxr-xr-x | build.sh | 5 |
1 files changed, 2 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 |