diff options
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 17 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
3 files changed, 23 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index 323110f0e6..4a51588fca 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3231,9 +3231,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>804779ac7a80500a7634f05f906cf7a7</string> + <string>4e6c11c18532abb297696dbeb87d3d19</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9534/44332/viewer_manager-1.0.509523-darwin64-509523.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10254/52399/viewer_manager-1.0.510243-darwin64-510243.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3255,9 +3255,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>4ef7c2406fb3ec167e8422b1e1c5b540</string> + <string>f55e7eca0d9d829c0f5473b92e5f84be</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/9535/44338/viewer_manager-1.0.509523-windows-509523.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10256/52405/viewer_manager-1.0.510243-windows-510243.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3268,7 +3268,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.0.509523</string> + <string>1.0.510243</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index cd867d79b3..4e41d6d083 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -709,13 +709,24 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch.
+ Push $R0
+ Push $0
+ ;; MAINT-7812: Only write nsis.winstall file with /marker switch
+ ${GetParameters} $R0
+ ${GetOptionsS} $R0 "/marker" $0
+ ;; If no /marker switch, skip to ClearErrors
+ IfErrors +4 0
;; $EXEDIR is where we find the installer file
;; Put a marker file there so VMP will know we're done
;; and it can delete the download directory next time.
;; http://nsis.sourceforge.net/Write_text_to_a_file
- FileOpen $9 "$EXEDIR\nsis.winstall" w
- FileWrite $9 "NSIS done$\n"
- FileClose $9
+ FileOpen $0 "$EXEDIR\nsis.winstall" w
+ FileWrite $0 "NSIS done$\n"
+ FileClose $0
+
+ ClearErrors
+ Pop $0
+ Pop $R0
Push $R0 # Option value, unused#
StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8b304ee0cd..5cee88ca32 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -292,6 +292,10 @@ class ViewerManifest(LLManifest): class WindowsManifest(ViewerManifest): + # We want the platform, per se, for every Windows build to be 'win'. The + # VMP will concatenate that with the address_size. + build_data_json_platform = 'win' + def final_exe(self): return self.app_name_oneword()+".exe" @@ -746,11 +750,9 @@ class Windows_i686_Manifest(WindowsManifest): # Although we aren't literally passed ADDRESS_SIZE, we can infer it from # the passed 'arch', which is used to select the specific subclass. address_size = 32 - build_data_json_platform = 'win32' class Windows_x86_64_Manifest(WindowsManifest): address_size = 64 - build_data_json_platform = 'win' class DarwinManifest(ViewerManifest): |