From 869771f7c9b6ef30d01120b68b3759aeac74fea5 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Mon, 17 Apr 2017 13:09:19 -0700
Subject: SL-617: alter viewer manifest to write exe name to summary.json,
 upgrade VMP package to 504292 to read it

---
 autobuild.xml                    | 8 ++++----
 indra/newview/viewer_manifest.py | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 42c164e361..f7ee8cd6d8 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3072,9 +3072,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>077de083ecc816509d08db03d45de2c5</string>
+              <string>ba331acee4f295a62b785b1cf80f3584</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4298/12539/viewer_manager-1.0-darwin64-504287.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4303/12557/viewer_manager-1.0-darwin64-504292.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -3096,9 +3096,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7a1d8e797afa953869ccedc3c398c7b8</string>
+              <string>4319d4db1e765b2773251f3bdf553034</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4299/12545/viewer_manager-1.0-windows-504287.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4304/12563/viewer_manager-1.0-windows-504292.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f6bbe7365a..bac80d8c13 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -206,6 +206,9 @@ class ViewerManifest(LLManifest):
             summary_dict = {"Type":"viewer","Version":'.'.join(self.args['version']),
                             "Channel":self.channel_with_pkg_suffix(),
                             "Platform":summary_json_platform}
+            #MAINT-7294: Windows exe names depend on channel name, so write that in also
+            if summary_json_platform.startswith('win'):
+                summary_dict.update({'Executable':self.channel_with_pkg_suffix().replace(' ', '')+'.exe'})
             with open(os.path.join(os.pardir,'summary.json'), 'w') as summary_handle:
                 json.dump(summary_dict,summary_handle)
 
-- 
cgit v1.2.3