diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-02-02 16:32:22 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-02-02 16:32:22 -0500 |
| commit | 899cdb8a1b32d7d39b3a4b78ba41a0f4d87cb52f (patch) | |
| tree | e0cc84701c5edf4ffbd6dea149da2586948e717e | |
| parent | cfbe33d7c72c7677836d362fa4026f88df4c9f76 (diff) | |
SL-9980: Update to viewer-manager 524014 to drop Admin for viewer.
But since that viewer-manager build depends on being able to read the
application name from build_data.json (to locate the shortcut), add an AppName
key to build_data.json.
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index 11f7685219..0773491363 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>2757602c6f834beade37af5c44649936</string> + <string>0aa5e6a12d9777ab85b8534cfce5de30</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30130/254747/viewer_manager-2.0.523332-darwin64-523332.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31625/264561/viewer_manager-2.0.524014-darwin64-524014.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>f1e63c7ae1951d93e5dfd98bdb1a4bed</string> + <string>6858cac5abba956fe9dd5c86caff809c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/30131/254755/viewer_manager-2.0.523332-windows-523332.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31626/264568/viewer_manager-2.0.524014-windows-524014.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>source_type</key> <string>hg</string> <key>version</key> - <string>2.0.523332</string> + <string>2.0.524014</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 32773b2c36..c0f642c852 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -431,7 +431,8 @@ class WindowsManifest(ViewerManifest): def finish_build_data_dict(self, build_data_dict): #MAINT-7294: Windows exe names depend on channel name, so write that in also - build_data_dict.update({'Executable':self.final_exe()}) + build_data_dict['Executable'] = self.final_exe() + build_data_dict['AppName'] = self.app_name() return build_data_dict def test_msvcrt_and_copy_action(self, src, dst): |