summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-04-25 17:13:51 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-04-25 17:13:51 -0400
commit2417cb3021123d7305b1c4fe4bdf16fddaecb494 (patch)
tree25e365908cf2bc0aff7574afd5a730a42c82b195
parentb87cb90a55ed74d51587eec581fb57e29f510c41 (diff)
Update with CG's build.sh patch to upload summary.json.
Patch taken from here: https://paste.lindenlab.com/show/6902/
-rwxr-xr-xbuild.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index 6677958716..d112e5ea1c 100755
--- a/build.sh
+++ b/build.sh
@@ -118,11 +118,12 @@ eval '$build_'"$arch" || pass
# File no longer exists in code-sep branch, so let's make sure it exists in order to use it.
if test -f scripts/update_version_files.py ; then
begin_section UpdateVer
- python scripts/update_version_files.py \
- --channel="$viewer_channel" \
- --server_channel="$server_channel" \
- --revision=$revision \
- --verbose \
+ eval $(python scripts/update_version_files.py \
+ --channel="$viewer_channel" \
+ --server_channel="$server_channel" \
+ --revision=$revision \
+ --verbose \
+ | sed -n -e "s,Setting viewer channel/version: '\([^']*\)' / '\([^']*\)',VIEWER_CHANNEL='\1';VIEWER_VERSION='\2',p")\
|| fail update_version_files.py
end_section UpdateVer
fi
@@ -262,6 +263,9 @@ then
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
+
# Upload crash reporter files.
case "$last_built_variant" in
Release)