Bug 1493597 - custom stub installer for funnelcake138, 32-bit fix, a=release FUNNELCAKE_138_139_STUB_BRANCH
authorNick Thomas <nthomas@mozilla.com>
Thu, 10 Jan 2019 16:29:46 +1300
branchFUNNELCAKE_138_139_STUB_BRANCH
changeset 501500 107c640a2548
parent 501496 bd1c59ce5919
child 501501 97d181973f94
push id1899
push usernthomas@mozilla.com
push dateThu, 10 Jan 2019 03:30:24 +0000
treeherdermozilla-release@107c640a2548 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrelease
bugs1493597
milestone64.0.2
Bug 1493597 - custom stub installer for funnelcake138, 32-bit fix, a=release
browser/installer/windows/nsis/defines.nsi.in
browser/installer/windows/nsis/stub.nsi
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -3,17 +3,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Defining FunnelcakeVersion will append the value of StubURLVersionAppend to
 # StubURLVersion, append the value of URLManualDownloadAppend to
 # URLManualDownload, and append the value of URLStubDownloadAppend to
 # URLStubDownload. The value of FunnelcakeVersion should not be defined when it
 # is not used and when it is defined its value should never be empty.
-!define FunnelcakeVersion        "139"
+!define FunnelcakeVersion        "138"
 
 !ifdef FunnelcakeVersion
 !define URLManualDownloadAppend  "&f=${FunnelcakeVersion}"
 !define URLStubDownloadAppend    "-f${FunnelcakeVersion}"
 !define StubURLVersionAppend     "-${FunnelcakeVersion}"
 !else
 !define URLManualDownloadAppend  ""
 !define URLStubDownloadAppend    ""
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -902,17 +902,17 @@ FunctionEnd
 
 Function StartDownload
   ${NSD_KillTimer} StartDownload
   ${If} $DroplistArch == "$(VERSION_64BIT)"
     InetBgDL::Get "${URLStubDownload64}${URLStubDownloadAppend}" \
                   "$PLUGINSDIR\download.exe" \
                   /CONNECTTIMEOUT 120 /RECEIVETIMEOUT 120 /END
   ${Else}
-    InetBgDL::Get "${URLStubDownload32}$" \
+    InetBgDL::Get "${URLStubDownload32}" \
                   "$PLUGINSDIR\download.exe" \
                   /CONNECTTIMEOUT 120 /RECEIVETIMEOUT 120 /END
   ${EndIf}
   StrCpy $4 ""
   ${NSD_CreateTimer} OnDownload ${DownloadIntervalMS}
   ${If} ${FileExists} "$INSTDIR\${TO_BE_DELETED}"
     RmDir /r "$INSTDIR\${TO_BE_DELETED}"
   ${EndIf}