From f5355e9580a9cb0d6397ed3dbea048ba2bcbdf8e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 3 May 2011 13:40:10 -0400
Subject: [PATCH] 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.
---
build.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/build.sh b/build.sh
index d112e5ea1ca..3d3f0d56164 100755
--- a/build.sh
+++ b/build.sh
@@ -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
--
GitLab