From 8f720b59d35d172b0a34ff73c7724d9bae258aa2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 2 May 2011 20:49:47 -0400
Subject: CHOP-599: if build.sh creates summary.json, package it with viewer.
 Recent versions of the viewer's build-dependent build.sh create and upload a
 summary.json file in the top level of the source repository checkout. Bundle
 that into the viewer installer. This is the one file that contains the
 viewer's version.

---
 indra/newview/viewer_manifest.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

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"""
-- 
cgit v1.2.3


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: 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 d112e5ea1c..3d3f0d5616 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
-- 
cgit v1.2.3