diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-05 15:39:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-05 15:39:18 -0700 |
| commit | 62b1791d7a3aaed34b39e5bad53389ef312ccad8 (patch) | |
| tree | 00670baf845fd1eea26670109b48dc8fab35dae9 /build.sh | |
| parent | ebda8f883b742de82db74cab993612737f5dec9e (diff) | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
Merged latest lindenlab/viewer-development with brad_linden/viewer-mustbuildfaster-0.
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -124,6 +124,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 @@ -261,9 +262,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 |