mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-29 11:57:32 +09:00
Make branding more flexible
This commit is contained in:
K4sum1
parent
413bd9a872
commit
0f85813996
25 changed files with 89 additions and 118 deletions
|
|
@ -28,7 +28,7 @@ ifeq ($(OS_ARCH),WINNT)
|
|||
# (this dependency should really be just for basilisk.exe, not other targets)
|
||||
# Note the manifest file exists in the tree, so we use the explicit filename
|
||||
# here.
|
||||
EXTRA_DEPS += basilisk.exe.manifest
|
||||
EXTRA_DEPS += $(PROGRAM).manifest
|
||||
endif
|
||||
|
||||
PROGRAMS_DEST = $(DIST)/bin
|
||||
|
|
|
|||
|
|
@ -19,10 +19,8 @@
|
|||
#include @TOPOBJDIR@/source-repo.h
|
||||
|
||||
[App]
|
||||
# Vendor=@MOZ_APP_VENDOR@
|
||||
Vendor=Moonchild Productions
|
||||
# Name=@MOZ_APP_BASENAME@
|
||||
Name=Basilisk
|
||||
Vendor=@MOZ_APP_VENDOR@
|
||||
Name=@MOZ_APP_BASENAME@
|
||||
RemotingName=@MOZ_APP_REMOTINGNAME@
|
||||
#ifdef MOZ_APP_DISPLAYNAME
|
||||
CodeName=@MOZ_APP_DISPLAYNAME@
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
WIN32_MODULE_COMPANYNAME=Moonchild Productions
|
||||
WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
|
||||
WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license.
|
||||
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
|
||||
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
|
||||
WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions.
|
||||
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser
|
||||
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
#include <windows.h>
|
||||
#include "nsNativeAppSupportWin.h"
|
||||
|
||||
1 24 "basilisk.exe.manifest"
|
||||
|
||||
IDI_APPICON ICON FIREFOX_ICO
|
||||
IDI_DOCUMENT ICON DOCUMENT_ICO
|
||||
IDI_APPLICATION ICON FIREFOX_ICO
|
||||
|
|
|
|||
|
|
@ -122,6 +122,7 @@
|
|||
&warningDesc.version;
|
||||
</description>
|
||||
</vbox>
|
||||
#if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
|
||||
#ifdef MC_PRIVATE_BUILD
|
||||
<description class="text-blurb" id="communityDesc">
|
||||
This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.basilisk-browser.org/">Basilisk website</label>.
|
||||
|
|
@ -133,6 +134,11 @@
|
|||
<description class="text-blurb" id="contributeDesc">
|
||||
Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://repo.palemoon.org/MoonchildProductions/UXP">development</label> of the Unified XUL Platform.
|
||||
</description>
|
||||
#endif
|
||||
#else
|
||||
<description class="text-blurb" id="contributeDesc">
|
||||
This is an unofficial build of Basilisk. For official builds, please go to <label class="text-link" href="http://www.basilisk-browser.org/">the Basilisk website</label>.
|
||||
</description>
|
||||
#endif
|
||||
</vbox>
|
||||
</vbox>
|
||||
|
|
|
|||
|
|
@ -10,9 +10,6 @@ def ApplicationBranding():
|
|||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
FINAL_TARGET_FILES['..'] += [
|
||||
'basilisk.VisualElementsManifest.xml',
|
||||
]
|
||||
FINAL_TARGET_FILES.VisualElements += [
|
||||
'VisualElements_150.png',
|
||||
'VisualElements_70.png',
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
|
||||
<VisualElements
|
||||
ShowNameOnSquare150x150Logo='on'
|
||||
Square150x150Logo='browser\VisualElements\VisualElements_150.png'
|
||||
Square70x70Logo='browser\VisualElements\VisualElements_70.png'
|
||||
ForegroundText='light'
|
||||
BackgroundColor='#304D7E'/>
|
||||
</Application>
|
||||
|
|
@ -60,6 +60,7 @@ let ShellServiceInternal = {
|
|||
return false;
|
||||
}
|
||||
|
||||
// fix this
|
||||
if (AppConstants.platform == "win") {
|
||||
let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
|
||||
"Software\\Mozilla\\Basilisk",
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@
|
|||
; [Base Browser Files]
|
||||
#ifndef XP_UNIX
|
||||
@BINPATH@/@MOZ_APP_NAME@.exe
|
||||
@BINPATH@/basilisk.VisualElementsManifest.xml
|
||||
@BINPATH@/@MOZ_APP_NAME@.VisualElementsManifest.xml
|
||||
@BINPATH@/browser/VisualElements/VisualElements_150.png
|
||||
@BINPATH@/browser/VisualElements/VisualElements_70.png
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# These defines should match application.ini settings
|
||||
!define AppName "Basilisk"
|
||||
!define AppName "@MOZ_APP_DISPLAYNAME@"
|
||||
!define AppVersion "@APP_VERSION@"
|
||||
!define GREVersion @MOZILLA_VERSION@
|
||||
!define AB_CD "@AB_CD@"
|
||||
|
||||
!define FileMainEXE "@MOZ_APP_NAME@.exe"
|
||||
!define WindowClass "BasiliskMessageWindow"
|
||||
!define DDEApplication "Basilisk"
|
||||
!define AppRegName "Basilisk"
|
||||
!define WindowClass "@MOZ_APP_DISPLAYNAME@MessageWindow"
|
||||
!define DDEApplication "@MOZ_APP_DISPLAYNAME@"
|
||||
!define AppRegName "${CompanyName}\${BrandShortName}"
|
||||
|
||||
!ifndef DEV_EDITION
|
||||
!define BrandShortName "@MOZ_APP_DISPLAYNAME@"
|
||||
|
|
@ -56,7 +56,7 @@ VIProductVersion "1.0.0.0"
|
|||
VIAddVersionKey "ProductName" "${BrandShortName}"
|
||||
VIAddVersionKey "CompanyName" "${CompanyName}"
|
||||
#ifdef MOZ_OFFICIAL_BRANDING
|
||||
VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions."
|
||||
VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of ${CompanyName}."
|
||||
#endif
|
||||
VIAddVersionKey "LegalCopyright" "${CompanyName}"
|
||||
VIAddVersionKey "FileVersion" "${AppVersion}"
|
||||
|
|
|
|||
|
|
@ -125,9 +125,9 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
|
|||
Name "${BrandFullName}"
|
||||
OutFile "setup.exe"
|
||||
!ifdef HAVE_64BIT_BUILD
|
||||
InstallDir "$PROGRAMFILES64\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES64\${CompanyName}\${BrandShortName}\"
|
||||
!else
|
||||
InstallDir "$PROGRAMFILES32\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES32\${CompanyName}\${BrandShortName}\"
|
||||
!endif
|
||||
ShowInstDetails nevershow
|
||||
|
||||
|
|
@ -246,10 +246,10 @@ Section "-InstallStartCleanup"
|
|||
${EndIf}
|
||||
|
||||
; setup the application model id registration value
|
||||
${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
|
||||
${InitHashAppModelId} "$INSTDIR" "Software\${CompanyName}\${BrandShortName}\TaskBarIDs"
|
||||
|
||||
; Remove the updates directory for Vista and above
|
||||
${CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates"
|
||||
${CleanUpdateDirectories} "${CompanyName}\${BrandShortName}" "${CompanyName}\updates"
|
||||
|
||||
${RemoveDeprecatedFiles}
|
||||
${RemovePrecompleteEntries} "false"
|
||||
|
|
@ -339,25 +339,25 @@ Section "-Application" APP_IDX
|
|||
|
||||
${LogHeader} "Adding Registry Entries"
|
||||
SetShellVarContext current ; Set SHCTX to HKCU
|
||||
${RegCleanMain} "Software\Mozilla"
|
||||
${RegCleanMain} "Software\${CompanyName}"
|
||||
${RegCleanUninstall}
|
||||
${UpdateProtocolHandlers}
|
||||
|
||||
ClearErrors
|
||||
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
|
||||
WriteRegStr HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest" "Write Test"
|
||||
${If} ${Errors}
|
||||
StrCpy $TmpVal "HKCU" ; used primarily for logging
|
||||
${Else}
|
||||
SetShellVarContext all ; Set SHCTX to HKLM
|
||||
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest"
|
||||
StrCpy $TmpVal "HKLM" ; used primarily for logging
|
||||
${RegCleanMain} "Software\Mozilla"
|
||||
${RegCleanMain} "Software\${CompanyName}"
|
||||
${RegCleanUninstall}
|
||||
${UpdateProtocolHandlers}
|
||||
|
||||
ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
|
||||
ReadRegStr $0 HKLM "Software\${CompanyName}\${BrandShortName}" "CurrentVersion"
|
||||
${If} "$0" != "${GREVersion}"
|
||||
WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
|
||||
WriteRegStr HKLM "Software\${CompanyName}\${BrandShortName}" "CurrentVersion" "${GREVersion}"
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
|
||||
|
|
@ -584,7 +584,7 @@ Section "-InstallEndCleanup"
|
|||
; If we have something other than empty string now, write the value.
|
||||
${If} "$0" != ""
|
||||
ClearErrors
|
||||
WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0"
|
||||
WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "OldDefaultBrowserCommand" "$0"
|
||||
${EndIf}
|
||||
|
||||
${LogHeader} "Setting as the default browser"
|
||||
|
|
@ -600,7 +600,7 @@ Section "-InstallEndCleanup"
|
|||
${ElseIfNot} ${Errors}
|
||||
${LogHeader} "Writing default-browser opt-out"
|
||||
ClearErrors
|
||||
WriteRegStr HKCU "Software\Mozilla\Basilisk" "DefaultBrowserOptOut" "True"
|
||||
WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "DefaultBrowserOptOut" "True"
|
||||
${If} ${Errors}
|
||||
${LogMsg} "Error writing default-browser opt-out"
|
||||
${EndIf}
|
||||
|
|
@ -964,9 +964,9 @@ Function preSummary
|
|||
; Check if it is possible to write to HKLM
|
||||
${If} $InstallType != ${INSTALLTYPE_PORTABLE}
|
||||
ClearErrors
|
||||
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
|
||||
WriteRegStr HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest" "Write Test"
|
||||
${Unless} ${Errors}
|
||||
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest"
|
||||
; Check if Basilisk is the http handler for this user.
|
||||
SetShellVarContext current ; Set SHCTX to the current user
|
||||
${IsHandlerForInstallDir} "http" $R9
|
||||
|
|
|
|||
|
|
@ -533,7 +533,7 @@
|
|||
${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0
|
||||
${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0
|
||||
${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0
|
||||
${WriteRegStr2} $1 "$0" "Publisher" "Moonchild Productions" 0
|
||||
${WriteRegStr2} $1 "$0" "Publisher" "${CompanyName}" 0
|
||||
${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0
|
||||
DeleteRegValue SHCTX "$0" "URLInfoAbout"
|
||||
; Don't add URLUpdateInfo which is the release notes url except for the release
|
||||
|
|
|
|||
|
|
@ -121,9 +121,9 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
|
|||
Name "${BrandFullName}"
|
||||
OutFile "helper.exe"
|
||||
!ifdef HAVE_64BIT_BUILD
|
||||
InstallDir "$PROGRAMFILES64\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES64\${CompanyName}\${BrandShortName}\"
|
||||
!else
|
||||
InstallDir "$PROGRAMFILES32\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES32\${CompanyName}\${BrandShortName}\"
|
||||
!endif
|
||||
ShowUnInstDetails nevershow
|
||||
|
||||
|
|
@ -193,10 +193,10 @@ Section "Uninstall"
|
|||
${EndIf}
|
||||
|
||||
; setup the application model id registration value
|
||||
${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
|
||||
${un.InitHashAppModelId} "$INSTDIR" "Software\${CompanyName}\${BrandShortName}\TaskBarIDs"
|
||||
|
||||
SetShellVarContext current ; Set SHCTX to HKCU
|
||||
${un.RegCleanMain} "Software\Mozilla"
|
||||
${un.RegCleanMain} "Software\${CompanyName}"
|
||||
${un.RegCleanUninstall}
|
||||
${un.DeleteShortcuts}
|
||||
|
||||
|
|
@ -207,21 +207,21 @@ Section "Uninstall"
|
|||
${EndIf}
|
||||
|
||||
; Remove the updates directory for Vista and above
|
||||
${un.CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates"
|
||||
${un.CleanUpdateDirectories} "${CompanyName}\${BrandShortName}" "${CompanyName}\updates"
|
||||
|
||||
; Remove any app model id's stored in the registry for this install path
|
||||
DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
|
||||
DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
|
||||
DeleteRegValue HKCU "Software\${CompanyName}\${BrandShortName}\TaskBarIDs" "$INSTDIR"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}\${BrandShortName}\TaskBarIDs" "$INSTDIR"
|
||||
|
||||
ClearErrors
|
||||
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
|
||||
WriteRegStr HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest" "Write Test"
|
||||
${If} ${Errors}
|
||||
StrCpy $TmpVal "HKCU" ; used primarily for logging
|
||||
${Else}
|
||||
SetShellVarContext all ; Set SHCTX to HKLM
|
||||
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest"
|
||||
StrCpy $TmpVal "HKLM" ; used primarily for logging
|
||||
${un.RegCleanMain} "Software\Mozilla"
|
||||
${un.RegCleanMain} "Software\${CompanyName}"
|
||||
${un.RegCleanUninstall}
|
||||
${un.DeleteShortcuts}
|
||||
${un.SetAppLSPCategories}
|
||||
|
|
@ -251,10 +251,10 @@ Section "Uninstall"
|
|||
${EndIf}
|
||||
|
||||
SetShellVarContext all ; Set SHCTX to HKLM
|
||||
${un.GetSecondInstallPath} "Software\Mozilla" $R9
|
||||
${un.GetSecondInstallPath} "Software\${CompanyName}" $R9
|
||||
${If} $R9 == "false"
|
||||
SetShellVarContext current ; Set SHCTX to HKCU
|
||||
${un.GetSecondInstallPath} "Software\Mozilla" $R9
|
||||
${un.GetSecondInstallPath} "Software\${CompanyName}" $R9
|
||||
${EndIf}
|
||||
|
||||
StrCpy $0 "Software\Clients\StartMenuInternet\${FileMainEXE}\shell\open\command"
|
||||
|
|
@ -300,7 +300,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=Basilisk"
|
||||
StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=${FileMainEXE}"
|
||||
DeleteRegKey HKLM "$0"
|
||||
DeleteRegKey HKCU "$0"
|
||||
${Else}
|
||||
|
|
@ -397,7 +397,7 @@ Section "Uninstall"
|
|||
; subsequently deleted after checking. If the value is found during startup
|
||||
; the browser will offer to Reset Basilisk. We use the UpdateChannel to match
|
||||
; uninstalls of Basilisk-release with reinstalls of Basilisk-release, for example.
|
||||
WriteRegStr HKCU "Software\Mozilla\Basilisk" "Uninstalled-${UpdateChannel}" "True"
|
||||
WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "Uninstalled-${UpdateChannel}" "True"
|
||||
|
||||
${un.IsFirewallSvcRunning}
|
||||
Pop $0
|
||||
|
|
|
|||
|
|
@ -19,10 +19,8 @@
|
|||
#include @TOPOBJDIR@/source-repo.h
|
||||
|
||||
[App]
|
||||
# Vendor=@MOZ_APP_VENDOR@
|
||||
Vendor=Moonchild Productions
|
||||
# Name=@MOZ_APP_BASENAME@
|
||||
Name=Pale Moon
|
||||
Vendor=@MOZ_APP_VENDOR@
|
||||
Name=@MOZ_APP_BASENAME@
|
||||
RemotingName=@MOZ_APP_REMOTINGNAME@
|
||||
#ifdef MOZ_APP_DISPLAYNAME
|
||||
CodeName=@MOZ_APP_DISPLAYNAME@
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
WIN32_MODULE_COMPANYNAME=Moonchild Productions
|
||||
WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
|
||||
WIN32_MODULE_COPYRIGHT=©Pale Moon, Firefox and Mozilla Developers, available under the MPL 2.0.
|
||||
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
|
||||
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
|
||||
WIN32_MODULE_TRADEMARKS=The Pale Moon logo and project names are trademarks of Moonchild Productions.
|
||||
WIN32_MODULE_DESCRIPTION=Pale Moon web browser
|
||||
WIN32_MODULE_PRODUCTNAME=Pale Moon
|
||||
WIN32_MODULE_NAME=Pale Moon
|
||||
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ web browser
|
||||
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
#include <windows.h>
|
||||
#include "nsNativeAppSupportWin.h"
|
||||
|
||||
1 24 "palemoon.exe.manifest"
|
||||
|
||||
IDI_APPICON ICON FIREFOX_ICO
|
||||
IDI_DOCUMENT ICON DOCUMENT_ICO
|
||||
IDI_APPLICATION ICON FIREFOX_ICO
|
||||
|
|
|
|||
|
|
@ -11,9 +11,6 @@ def ApplicationBranding():
|
|||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
FINAL_TARGET_FILES['..'] += [
|
||||
'palemoon.VisualElementsManifest.xml',
|
||||
]
|
||||
FINAL_TARGET_FILES.VisualElements += [
|
||||
'VisualElements_150.png',
|
||||
'VisualElements_70.png',
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
|
||||
<VisualElements
|
||||
ShowNameOnSquare150x150Logo='on'
|
||||
Square150x150Logo='browser\VisualElements\VisualElements_150.png'
|
||||
Square70x70Logo='browser\VisualElements\VisualElements_70.png'
|
||||
ForegroundText='light'
|
||||
BackgroundColor='#171717'/>
|
||||
</Application>
|
||||
|
|
@ -56,6 +56,7 @@ var ShellServiceInternal = {
|
|||
return false;
|
||||
}
|
||||
|
||||
// fix this
|
||||
#ifdef XP_WIN
|
||||
let optOutValue = WindowsRegistry.readRegKey(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
|
||||
"Software\\Mozilla\\PaleMoon",
|
||||
|
|
|
|||
|
|
@ -6,9 +6,4 @@
|
|||
DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
|
||||
DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
|
||||
DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']
|
||||
|
||||
if CONFIG['MOZ_APP_DISPLAYNAME'] in ('PaleMoon', 'Palemoon'):
|
||||
DEFINES['MOZ_APP_DISPLAYNAME'] = "Pale Moon"
|
||||
else:
|
||||
DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
|
||||
|
||||
DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# These defines should match application.ini settings
|
||||
!define AppName "Pale Moon"
|
||||
!define AppName "@MOZ_APP_DISPLAYNAME@"
|
||||
!define AppVersion "@APP_VERSION@"
|
||||
!define GREVersion @MOZILLA_VERSION@
|
||||
!define AB_CD "@AB_CD@"
|
||||
|
||||
!define FileMainEXE "@MOZ_APP_NAME@.exe"
|
||||
!define WindowClass "Pale MoonMessageWindow"
|
||||
!define DDEApplication "Pale Moon"
|
||||
!define AppRegName "Pale Moon"
|
||||
!define WindowClass "@MOZ_APP_DISPLAYNAME@MessageWindow"
|
||||
!define DDEApplication "@MOZ_APP_DISPLAYNAME@"
|
||||
!define AppRegName "${CompanyName}\${BrandShortName}"
|
||||
|
||||
!ifndef DEV_EDITION
|
||||
!define BrandShortName "@MOZ_APP_DISPLAYNAME@"
|
||||
|
|
@ -56,7 +56,7 @@ VIProductVersion "1.0.0.0"
|
|||
VIAddVersionKey "ProductName" "${BrandShortName}"
|
||||
VIAddVersionKey "CompanyName" "${CompanyName}"
|
||||
#ifdef MOZ_OFFICIAL_BRANDING
|
||||
VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions."
|
||||
VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of ${CompanyName}."
|
||||
#endif
|
||||
VIAddVersionKey "LegalCopyright" "${CompanyName}"
|
||||
VIAddVersionKey "FileVersion" "${AppVersion}"
|
||||
|
|
|
|||
|
|
@ -125,9 +125,9 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
|
|||
Name "${BrandFullName}"
|
||||
OutFile "setup.exe"
|
||||
!ifdef HAVE_64BIT_BUILD
|
||||
InstallDir "$PROGRAMFILES64\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES64\${CompanyName}\${BrandShortName}\"
|
||||
!else
|
||||
InstallDir "$PROGRAMFILES32\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES32\${CompanyName}\${BrandShortName}\"
|
||||
!endif
|
||||
ShowInstDetails nevershow
|
||||
|
||||
|
|
@ -246,10 +246,10 @@ Section "-InstallStartCleanup"
|
|||
${EndIf}
|
||||
|
||||
; setup the application model id registration value
|
||||
${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
|
||||
${InitHashAppModelId} "$INSTDIR" "Software\${CompanyName}\${BrandShortName}\TaskBarIDs"
|
||||
|
||||
; Remove the updates directory for Vista and above
|
||||
${CleanUpdateDirectories} "Mozilla\Pale Moon" "Mozilla\updates"
|
||||
${CleanUpdateDirectories} "${CompanyName}\${BrandShortName}" "${CompanyName}\updates"
|
||||
|
||||
${RemoveDeprecatedFiles}
|
||||
${RemovePrecompleteEntries} "false"
|
||||
|
|
@ -339,25 +339,25 @@ Section "-Application" APP_IDX
|
|||
|
||||
${LogHeader} "Adding Registry Entries"
|
||||
SetShellVarContext current ; Set SHCTX to HKCU
|
||||
${RegCleanMain} "Software\Mozilla"
|
||||
${RegCleanMain} "Software\${CompanyName}"
|
||||
${RegCleanUninstall}
|
||||
${UpdateProtocolHandlers}
|
||||
|
||||
ClearErrors
|
||||
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
|
||||
WriteRegStr HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest" "Write Test"
|
||||
${If} ${Errors}
|
||||
StrCpy $TmpVal "HKCU" ; used primarily for logging
|
||||
${Else}
|
||||
SetShellVarContext all ; Set SHCTX to HKLM
|
||||
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest"
|
||||
StrCpy $TmpVal "HKLM" ; used primarily for logging
|
||||
${RegCleanMain} "Software\Mozilla"
|
||||
${RegCleanMain} "Software\${CompanyName}"
|
||||
${RegCleanUninstall}
|
||||
${UpdateProtocolHandlers}
|
||||
|
||||
ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion"
|
||||
ReadRegStr $0 HKLM "Software\${CompanyName}" "CurrentVersion"
|
||||
${If} "$0" != "${GREVersion}"
|
||||
WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}"
|
||||
WriteRegStr HKLM "Software\${CompanyName}" "CurrentVersion" "${GREVersion}"
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
|
||||
|
|
@ -584,7 +584,7 @@ Section "-InstallEndCleanup"
|
|||
; If we have something other than empty string now, write the value.
|
||||
${If} "$0" != ""
|
||||
ClearErrors
|
||||
WriteRegStr HKCU "Software\Mozilla\Pale Moon" "OldDefaultBrowserCommand" "$0"
|
||||
WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "OldDefaultBrowserCommand" "$0"
|
||||
${EndIf}
|
||||
|
||||
${LogHeader} "Setting as the default browser"
|
||||
|
|
@ -600,7 +600,7 @@ Section "-InstallEndCleanup"
|
|||
${ElseIfNot} ${Errors}
|
||||
${LogHeader} "Writing default-browser opt-out"
|
||||
ClearErrors
|
||||
WriteRegStr HKCU "Software\Mozilla\Pale Moon" "DefaultBrowserOptOut" "True"
|
||||
WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "DefaultBrowserOptOut" "True"
|
||||
${If} ${Errors}
|
||||
${LogMsg} "Error writing default-browser opt-out"
|
||||
${EndIf}
|
||||
|
|
@ -964,9 +964,9 @@ Function preSummary
|
|||
; Check if it is possible to write to HKLM
|
||||
${If} $InstallType != ${INSTALLTYPE_PORTABLE}
|
||||
ClearErrors
|
||||
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
|
||||
WriteRegStr HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest" "Write Test"
|
||||
${Unless} ${Errors}
|
||||
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest"
|
||||
; Check if Pale Moon is the http handler for this user.
|
||||
SetShellVarContext current ; Set SHCTX to the current user
|
||||
${IsHandlerForInstallDir} "http" $R9
|
||||
|
|
|
|||
|
|
@ -533,7 +533,7 @@
|
|||
${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0
|
||||
${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0
|
||||
${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0
|
||||
${WriteRegStr2} $1 "$0" "Publisher" "Moonchild Productions" 0
|
||||
${WriteRegStr2} $1 "$0" "Publisher" "${CompanyName}" 0
|
||||
${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0
|
||||
DeleteRegValue SHCTX "$0" "URLInfoAbout"
|
||||
; Don't add URLUpdateInfo which is the release notes url except for the release
|
||||
|
|
|
|||
|
|
@ -121,9 +121,9 @@ VIAddVersionKey "OriginalFilename" "helper.exe"
|
|||
Name "${BrandFullName}"
|
||||
OutFile "helper.exe"
|
||||
!ifdef HAVE_64BIT_BUILD
|
||||
InstallDir "$PROGRAMFILES64\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES64\${CompanyName}\${BrandShortName}\"
|
||||
!else
|
||||
InstallDir "$PROGRAMFILES32\${BrandFullName}\"
|
||||
InstallDir "$PROGRAMFILES32\${CompanyName}\${BrandShortName}\"
|
||||
!endif
|
||||
ShowUnInstDetails nevershow
|
||||
|
||||
|
|
@ -193,10 +193,10 @@ Section "Uninstall"
|
|||
${EndIf}
|
||||
|
||||
; setup the application model id registration value
|
||||
${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
|
||||
${un.InitHashAppModelId} "$INSTDIR" "Software\${CompanyName}\${BrandShortName}\TaskBarIDs"
|
||||
|
||||
SetShellVarContext current ; Set SHCTX to HKCU
|
||||
${un.RegCleanMain} "Software\Mozilla"
|
||||
${un.RegCleanMain} "Software\${CompanyName}"
|
||||
${un.RegCleanUninstall}
|
||||
${un.DeleteShortcuts}
|
||||
|
||||
|
|
@ -207,21 +207,21 @@ Section "Uninstall"
|
|||
${EndIf}
|
||||
|
||||
; Remove the updates directory for Vista and above
|
||||
${un.CleanUpdateDirectories} "Mozilla\PaleMoon" "Mozilla\updates"
|
||||
${un.CleanUpdateDirectories} "${CompanyName}\${BrandShortName}" "${CompanyName}\updates"
|
||||
|
||||
; Remove any app model id's stored in the registry for this install path
|
||||
DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
|
||||
DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
|
||||
DeleteRegValue HKCU "Software\${CompanyName}\${BrandShortName}\TaskBarIDs" "$INSTDIR"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}\${BrandShortName}\TaskBarIDs" "$INSTDIR"
|
||||
|
||||
ClearErrors
|
||||
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
|
||||
WriteRegStr HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest" "Write Test"
|
||||
${If} ${Errors}
|
||||
StrCpy $TmpVal "HKCU" ; used primarily for logging
|
||||
${Else}
|
||||
SetShellVarContext all ; Set SHCTX to HKLM
|
||||
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
|
||||
DeleteRegValue HKLM "Software\${CompanyName}" "${BrandShortName}InstallerTest"
|
||||
StrCpy $TmpVal "HKLM" ; used primarily for logging
|
||||
${un.RegCleanMain} "Software\Mozilla"
|
||||
${un.RegCleanMain} "Software\${CompanyName}"
|
||||
${un.RegCleanUninstall}
|
||||
${un.DeleteShortcuts}
|
||||
${un.SetAppLSPCategories}
|
||||
|
|
@ -251,10 +251,10 @@ Section "Uninstall"
|
|||
${EndIf}
|
||||
|
||||
SetShellVarContext all ; Set SHCTX to HKLM
|
||||
${un.GetSecondInstallPath} "Software\Mozilla" $R9
|
||||
${un.GetSecondInstallPath} "Software\${CompanyName}" $R9
|
||||
${If} $R9 == "false"
|
||||
SetShellVarContext current ; Set SHCTX to HKCU
|
||||
${un.GetSecondInstallPath} "Software\Mozilla" $R9
|
||||
${un.GetSecondInstallPath} "Software\${CompanyName}" $R9
|
||||
${EndIf}
|
||||
|
||||
StrCpy $0 "Software\Clients\StartMenuInternet\${FileMainEXE}\shell\open\command"
|
||||
|
|
@ -300,7 +300,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=PaleMoon"
|
||||
StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=${FileMainEXE}"
|
||||
DeleteRegKey HKLM "$0"
|
||||
DeleteRegKey HKCU "$0"
|
||||
${Else}
|
||||
|
|
@ -397,7 +397,7 @@ Section "Uninstall"
|
|||
; subsequently deleted after checking. If the value is found during startup
|
||||
; the browser will offer to Reset PaleMoon. We use the UpdateChannel to match
|
||||
; uninstalls of PaleMoon-release with reinstalls of PaleMoon-release, for example.
|
||||
WriteRegStr HKCU "Software\Mozilla\PaleMoon" "Uninstalled-${UpdateChannel}" "True"
|
||||
WriteRegStr HKCU "Software\${CompanyName}\${BrandShortName}" "Uninstalled-${UpdateChannel}" "True"
|
||||
|
||||
${un.IsFirewallSvcRunning}
|
||||
Pop $0
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
#include <windows.h>
|
||||
#include "nsNativeAppSupportWin.h"
|
||||
|
||||
1 24 "xulrunner.exe.manifest"
|
||||
|
||||
IDI_APPICON ICON XULRUNNER_ICO
|
||||
IDI_DOCUMENT ICON DOCUMENT_ICO
|
||||
IDI_APPLICATION ICON XULRUNNER_ICO
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue