The windows installer shouldn't bypasses the profile selection logic when it tries to launch the installed app (bug 1091605). r=rstrong
authorPanos Astithas <past@mozilla.com>
Fri, 31 Oct 2014 22:10:10 +0200
changeset 213518 1bf7c32753677420ee474354f2d300b62ef7f724
parent 213517 4f1e247709b9d1c2bec17d182f2568ed7e6bd578
child 213519 539bb29a6a0faf44f1b050bda17b84ad0014029d
push idunknown
push userunknown
push dateunknown
reviewersrstrong
bugs1091605
milestone36.0a1
The windows installer shouldn't bypasses the profile selection logic when it tries to launch the installed app (bug 1091605). r=rstrong
browser/branding/aurora/branding.nsi
browser/installer/windows/nsis/installer.nsi
browser/installer/windows/nsis/stub.nsi
--- a/browser/branding/aurora/branding.nsi
+++ b/browser/branding/aurora/branding.nsi
@@ -37,8 +37,11 @@
 !define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
 !define FOOTER_BKGRD_COLOR 0xFFFFFF
 !define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
 !define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
 !define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
 !define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF
 !define COMMON_TEXT_COLOR_FADED 0xA1AAB3
 !define COMMON_BKGRD_COLOR 0x0F1B26
+
+# Enable DeveloperEdition-specific behavior
+!define DEV_EDITION
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -764,17 +764,19 @@ Function CheckExistingInstall
       StrCpy $TmpVal "FoundMessageWindow"
       ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_INSTALL)"
       StrCpy $TmpVal "true"
     ${EndIf}
   ${EndIf}
 FunctionEnd
 
 Function LaunchApp
+!ifndef DEV_EDITION
   ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
+!endif
 
   ClearErrors
   ${GetParameters} $0
   ${GetOptions} "$0" "/UAC:" $1
   ${If} ${Errors}
     StrCpy $1 "0"
     StrCpy $2 "0"
 !ifdef MOZ_METRO
--- a/browser/installer/windows/nsis/stub.nsi
+++ b/browser/installer/windows/nsis/stub.nsi
@@ -1910,22 +1910,24 @@ FunctionEnd
 
 Function ExecSetAsDefaultAppUser
   ; Using the helper.exe lessens the stub installer size.
   ; This could ask for elevatation when the user doesn't install as admin.
   Exec "$\"$INSTDIR\uninstall\helper.exe$\" /SetAsDefaultAppUser"
 FunctionEnd
 
 Function LaunchApp
+!ifndef DEV_EDITION
   FindWindow $0 "${WindowClass}"
   ${If} $0 <> 0 ; integer comparison
     StrCpy $FirefoxLaunchCode "1"
     MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
     Return
   ${EndIf}
+!endif
 
   StrCpy $FirefoxLaunchCode "2"
 
   ; Set the current working directory to the installation directory
   SetOutPath "$INSTDIR"
   ClearErrors
   ${GetParameters} $0
   ${GetOptions} "$0" "/UAC:" $1