summaryrefslogtreecommitdiffstats
path: root/browser/installer
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-18 12:21:38 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-18 12:21:38 +0100
commit51b6354f31b5f2122c11afec7fc0e3d650ce5e5d (patch)
treecfc8e519c89e459f7199a8210c72879537dec208 /browser/installer
parentd38f865699b1c1cb2395f719324b661acffa3223 (diff)
parent31c5e63eda295ed87419ff035631cadf776244af (diff)
downloadUXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar
UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.gz
UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.lz
UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.tar.xz
UXP-51b6354f31b5f2122c11afec7fc0e3d650ce5e5d.zip
Merge branch 'ported-moebius'
Diffstat (limited to 'browser/installer')
-rw-r--r--browser/installer/windows/Makefile.in3
-rw-r--r--browser/installer/windows/nsis/defines.nsi.in10
-rw-r--r--browser/installer/windows/nsis/oneoff_en-US.nsh12
-rwxr-xr-xbrowser/installer/windows/nsis/shared.nsh100
-rwxr-xr-xbrowser/installer/windows/nsis/uninstaller.nsi6
5 files changed, 58 insertions, 73 deletions
diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in
index ee672e921..a8305d077 100644
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@@ -83,9 +83,6 @@ $(CONFIG_DIR)/setup.exe::
--preprocess-single-file $(topsrcdir) \
$(PPL_LOCALE_ARGS) $(CONFIG_DIR) \
nsisstrings.properties nsisstrings.nlf
- $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
- --convert-utf8-utf16le \
- $(srcdir)/nsis/oneoff_en-US.nsh $(CONFIG_DIR)/oneoff_en-US.nsh
GARBARGE_DIRS += instgen
diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in
index 30a9f3784..5ad9b7966 100644
--- a/browser/installer/windows/nsis/defines.nsi.in
+++ b/browser/installer/windows/nsis/defines.nsi.in
@@ -21,15 +21,15 @@
!endif
# These defines should match application.ini settings
-!define AppName "Firefox"
+!define AppName "Basilisk"
!define AppVersion "@APP_VERSION@"
!define GREVersion @MOZILLA_VERSION@
!define AB_CD "@AB_CD@"
!define FileMainEXE "@MOZ_APP_NAME@.exe"
-!define WindowClass "FirefoxMessageWindow"
-!define DDEApplication "Firefox"
-!define AppRegName "Firefox"
+!define WindowClass "BasiliskMessageWindow"
+!define DDEApplication "Basilisk"
+!define AppRegName "Basilisk"
!ifndef DEV_EDITION
!define BrandShortName "@MOZ_APP_DISPLAYNAME@"
@@ -77,7 +77,7 @@ VIProductVersion "1.0.0.0"
VIAddVersionKey "ProductName" "${BrandShortName}"
VIAddVersionKey "CompanyName" "${CompanyName}"
#ifdef MOZ_OFFICIAL_BRANDING
-VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
+VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions."
#endif
VIAddVersionKey "LegalCopyright" "${CompanyName}"
VIAddVersionKey "FileVersion" "${AppVersion}"
diff --git a/browser/installer/windows/nsis/oneoff_en-US.nsh b/browser/installer/windows/nsis/oneoff_en-US.nsh
deleted file mode 100644
index 62d95ade9..000000000
--- a/browser/installer/windows/nsis/oneoff_en-US.nsh
+++ /dev/null
@@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-; Custom strings for en-US. This is not in the locale directory so these strings
-; aren't translated.
-!define INDENT " "
-!define INTRO_BLURB "Thanks for choosing $BrandFullName. We’re not just designed to be different, we’re different by design."
-!define INSTALL_BLURB1 "You're about to enjoy the very latest in speed, flexibility and security so you're always in control."
-!define INSTALL_BLURB2 "And you're joining a global community of users, contributors and developers working to make the best browser in the world."
-!define INSTALL_BLURB3 "You even get a haiku:$\n${INDENT}Proudly non-profit$\n${INDENT}Free to innovate for you$\n${INDENT}And a better Web"
-!undef INDENT
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
index 8d7eea618..fb2239d24 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -10,12 +10,12 @@
System::Call "kernel32::ProcessIdToSessionId(i $0, *i ${NSIS_MAX_STRLEN} r9)"
; Determine if we're the protected UserChoice default or not. If so fix the
- ; start menu tile. In case there are 2 Firefox installations, we only do
+ ; start menu tile. In case there are 2 Basilisk installations, we only do
; this if the application being updated is the default.
ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId"
- ${If} $0 == "FirefoxURL"
+ ${If} $0 == "BasiliskURL"
${AndIf} $9 != 0 ; We're not running in session 0
- ReadRegStr $0 HKCU "Software\Classes\FirefoxURL\shell\open\command" ""
+ ReadRegStr $0 HKCU "Software\Classes\BasiliskURL\shell\open\command" ""
${GetPathFromString} "$0" $0
${GetParent} "$0" $0
${If} ${FileExists} "$0"
@@ -327,13 +327,13 @@
ClearErrors
EnumRegKey $7 HKCR "${FILE_TYPE}" 0
${If} ${Errors}
- WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "FirefoxHTML"
+ WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "BasiliskHTML"
${EndIf}
- WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "FirefoxHTML" ""
+ WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "BasiliskHTML" ""
!macroend
!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist"
-; Adds the protocol and file handler registry entries for making Firefox the
+; Adds the protocol and file handler registry entries for making Basilisk the
; default handler (uses SHCTX).
!macro SetHandlers
${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
@@ -341,30 +341,30 @@
StrCpy $0 "SOFTWARE\Classes"
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
- ; Associate the file handlers with FirefoxHTML
+ ; Associate the file handlers with BasiliskHTML
ReadRegStr $6 SHCTX "$0\.htm" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.htm" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.htm" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.html" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.html" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.html" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.shtml" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.shtml" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.shtml" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xht" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.xht" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.xht" "" "BasiliskHTML"
${EndIf}
ReadRegStr $6 SHCTX "$0\.xhtml" ""
- ${If} "$6" != "FirefoxHTML"
- WriteRegStr SHCTX "$0\.xhtml" "" "FirefoxHTML"
+ ${If} "$6" != "BasiliskHTML"
+ WriteRegStr SHCTX "$0\.xhtml" "" "BasiliskHTML"
${EndIf}
${AddAssociationIfNoneExist} ".pdf"
@@ -374,12 +374,12 @@
${AddAssociationIfNoneExist} ".pdf"
${AddAssociationIfNoneExist} ".webm"
- ; An empty string is used for the 5th param because FirefoxHTML is not a
+ ; An empty string is used for the 5th param because BasiliskHTML is not a
; protocol handler
- ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \
+ ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
- ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
+ ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \
"true"
; An empty string is used for the 4th & 5th params because the following
; protocol handlers already have a display name and the additional keys
@@ -449,35 +449,35 @@
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0"
WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "FirefoxHTML"
- WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "FirefoxHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "BasiliskHTML"
+ WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "BasiliskHTML"
WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9"
- WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "FirefoxURL"
- WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "FirefoxURL"
- WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "FirefoxURL"
+ WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "BasiliskURL"
+ WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "BasiliskURL"
+ WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "BasiliskURL"
; Vista Registered Application
WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities"
!macroend
!define SetStartMenuInternet "!insertmacro SetStartMenuInternet"
-; The IconHandler reference for FirefoxHTML can end up in an inconsistent state
+; The IconHandler reference for BasiliskHTML can end up in an inconsistent state
; due to changes not being detected by the IconHandler for side by side
; installs (see bug 268512). The symptoms can be either an incorrect icon or no
-; icon being displayed for files associated with Firefox (does not use SHCTX).
+; icon being displayed for files associated with Basilisk (does not use SHCTX).
!macro FixShellIconHandler RegKey
ClearErrors
- ReadRegStr $1 ${RegKey} "Software\Classes\FirefoxHTML\ShellEx\IconHandler" ""
+ ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\ShellEx\IconHandler" ""
${Unless} ${Errors}
- ReadRegStr $1 ${RegKey} "Software\Classes\FirefoxHTML\DefaultIcon" ""
+ ReadRegStr $1 ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" ""
${GetLongPath} "$INSTDIR\${FileMainEXE}" $2
${If} "$1" != "$2,1"
- WriteRegStr ${RegKey} "Software\Classes\FirefoxHTML\DefaultIcon" "" "$2,1"
+ WriteRegStr ${RegKey} "Software\Classes\BasiliskHTML\DefaultIcon" "" "$2,1"
${EndIf}
${EndUnless}
!macroend
@@ -612,7 +612,7 @@
; HKCU Software\Classes keys when associating handlers. The fix uses the merged
; view in HKCR to check for existance of an existing association. This macro
; cleans affected installations by removing the HKLM and HKCU value if it is set
-; to FirefoxHTML when there is a value for PersistentHandler or by removing the
+; to BasiliskHTML when there is a value for PersistentHandler or by removing the
; HKCU value when the HKLM value has a value other than an empty string.
!macro FixBadFileAssociation FILE_TYPE
; Only delete the default value in case the key has values for OpenWithList,
@@ -621,16 +621,16 @@
ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" ""
ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" ""
${If} "$2" != ""
- ; Since there is a persistent handler remove FirefoxHTML as the default
- ; value from both HKCU and HKLM if it set to FirefoxHTML.
- ${If} "$0" == "FirefoxHTML"
+ ; Since there is a persistent handler remove BasiliskHTML as the default
+ ; value from both HKCU and HKLM if it set to BasiliskHTML.
+ ${If} "$0" == "BasiliskHTML"
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
${EndIf}
- ${If} "$1" == "FirefoxHTML"
+ ${If} "$1" == "BasiliskHTML"
DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" ""
${EndIf}
- ${ElseIf} "$0" == "FirefoxHTML"
- ; Since KHCU is set to FirefoxHTML remove FirefoxHTML as the default value
+ ${ElseIf} "$0" == "BasiliskHTML"
+ ; Since KHCU is set to BasiliskHTML remove BasiliskHTML as the default value
; from HKCU if HKLM is set to a value other than an empty string.
${If} "$1" != ""
DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" ""
@@ -686,17 +686,17 @@
; Only set the file and protocol handlers if the existing one under HKCR is
; for this install location.
- ${IsHandlerForInstallDir} "FirefoxHTML" $R9
+ ${IsHandlerForInstallDir} "BasiliskHTML" $R9
${If} "$R9" == "true"
- ; An empty string is used for the 5th param because FirefoxHTML is not a
+ ; An empty string is used for the 5th param because BasiliskHTML is not a
; protocol handler.
- ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \
+ ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \
"${AppRegName} HTML Document" ""
${EndIf}
- ${IsHandlerForInstallDir} "FirefoxURL" $R9
+ ${IsHandlerForInstallDir} "BasiliskURL" $R9
${If} "$R9" == "true"
- ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" \
+ ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" \
"${AppRegName} URL" "true"
${EndIf}
@@ -780,8 +780,8 @@
${RegCleanAppHandler} "chrome"
; Remove protocol handler registry keys added by the MS shim
- DeleteRegKey HKLM "Software\Classes\Firefox.URL"
- DeleteRegKey HKCU "Software\Classes\Firefox.URL"
+ DeleteRegKey HKLM "Software\Classes\Basilisk.URL"
+ DeleteRegKey HKCU "Software\Classes\Basilisk.URL"
; Delete gopher from Capabilities\URLAssociations if it is present.
${StrFilter} "${FileMainEXE}" "+" "" "" $R9
@@ -792,10 +792,10 @@
DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher"
${EndUnless}
- ; Delete gopher from the user's UrlAssociations if it points to FirefoxURL.
+ ; Delete gopher from the user's UrlAssociations if it points to BasiliskURL.
StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher"
ReadRegStr $2 HKCU "$0\UserChoice" "Progid"
- ${If} "$2" == "FirefoxURL"
+ ${If} "$2" == "BasiliskURL"
DeleteRegKey HKCU "$0"
${EndIf}
!macroend
@@ -943,7 +943,7 @@
${If} $AddTaskbarSC == ""
; No need to check the default on Win8 and later
${If} ${AtMostWin2008R2}
- ; Check if the Firefox is the http handler for this user
+ ; Check if the Basilisk is the http handler for this user
SetShellVarContext current ; Set SHCTX to the current user
${IsHandlerForInstallDir} "http" $R9
${If} $TmpVal == "HKLM"
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
index 687bcd6eb..87f4d838a 100755
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -351,7 +351,7 @@ Section "Uninstall"
StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe"
DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0"
- StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=firefox"
+ StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=Basilisk"
DeleteRegKey HKLM "$0"
DeleteRegKey HKCU "$0"
${Else}
@@ -419,8 +419,8 @@ Section "Uninstall"
; Remove the installation directory if it is empty
RmDir "$INSTDIR"
- ; If firefox.exe was successfully deleted yet we still need to restart to
- ; remove other files create a dummy firefox.exe.moz-delete to prevent the
+ ; If Basilisk.exe was successfully deleted yet we still need to restart to
+ ; remove other files create a dummy Basilisk.exe.moz-delete to prevent the
; installer from allowing an install without restart when it is required
; to complete an uninstall.
${If} ${RebootFlag}