Bug 798544 - Prevent using the beta url override when official branding is not used. r=bbondy
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 05 Oct 2012 17:44:32 -0700
changeset 109473 ac0690ad5138428ea858a0d4a65729d08d87386f
parent 109472 c50045940403f8935c43037b13fd544149cc54db
child 109474 9b6d9a19c61417f4fb7d01cecb64251059b0d747
push id16044
push userrstrong@mozilla.com
push dateSat, 06 Oct 2012 00:44:35 +0000
treeherdermozilla-inbound@ac0690ad5138 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy
bugs798544
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 798544 - Prevent using the beta url override when official branding is not used. r=bbondy
browser/branding/official/branding.nsi
browser/installer/windows/nsis/stub.nsi
--- a/browser/branding/official/branding.nsi
+++ b/browser/branding/official/branding.nsi
@@ -8,16 +8,19 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Firefox"
 !define CompanyName           "Mozilla Corporation"
 !define URLInfoAbout          "http://www.mozilla.com/${AB_CD}/"
 !define URLUpdateInfo         "http://www.mozilla.com/${AB_CD}/firefox/"
 
+; Prevents the beta channel urls in stub.nsi from being used when not using
+; official branding
+!define Official
 !define URLStubDownload "http://download.mozilla.org/?product=firefox-latest&os=win&lang=${AB_CD}"
 !define URLManualDownload "https://www.mozilla.org/firefox/installer-help/"
 
 # The installer's certificate name and issuer expected by the stub installer
 !define CertNameDownload   "Mozilla Corporation"
 !define CertIssuerDownload "Thawte Code Signing CA - G2"
 
 # Dialog units are used so the UI displays correctly with the system's DPI
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -86,22 +86,24 @@ Var CTL_RIGHT_PX
 
 !include "locales.nsi"
 !include "branding.nsi"
 
 !include "defines.nsi"
 
 ; Workaround to support different urls for Official and Beta since they share
 ; the same branding.
+!ifdef Official
 !ifdef BETA_UPDATE_CHANNEL
 !undef URLStubDownload
 !define URLStubDownload "http://download.mozilla.org/?product=firefox-beta-latest&os=win&lang=${AB_CD}"
 !undef URLManualDownload
 !define URLManualDownload "http://download.mozilla.org/?product=firefox-beta-latest&os=win&lang=${AB_CD}"
 !endif
+!endif
 
 !include "common.nsh"
 
 !insertmacro ElevateUAC
 !insertmacro GetLongPath
 !insertmacro GetPathFromString
 !insertmacro GetSingleInstallPath
 !insertmacro GetTextWidthHeight