зеркало из https://github.com/mozilla/gecko-dev.git
Bug 356578 - rebranding should affect the name of the executable
patch by O. Atsushi <torisugari@gmail.com> r=mano, bsmedberg
This commit is contained in:
asqueella%gmail.com
Родитель
ad7e277a69
Коммит
9e3b19f9ee
|
|
@ -87,9 +87,9 @@ else
|
|||
MOZILLA_INTERNAL_API = 1
|
||||
|
||||
ifeq ($(USE_SHORT_LIBNAME), 1)
|
||||
PROGRAM = firefox$(BIN_SUFFIX)
|
||||
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
|
||||
else
|
||||
PROGRAM = firefox-bin$(BIN_SUFFIX)
|
||||
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
|
||||
endif
|
||||
|
||||
REQUIRES = \
|
||||
|
|
@ -271,19 +271,19 @@ endif
|
|||
|
||||
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||
|
||||
firefox:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
||||
$(MOZ_APP_NAME):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
||||
cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
|
||||
-e "s|%MOZ_USER_DIR%|.mozilla/firefox|" \
|
||||
-e "s|%MREDIR%|$(mredir)|" > $@
|
||||
chmod +x $@
|
||||
|
||||
libs:: firefox
|
||||
libs:: $(MOZ_APP_NAME)
|
||||
$(INSTALL) $< $(DIST)/bin
|
||||
|
||||
install:: firefox
|
||||
install:: $(MOZ_APP_NAME)
|
||||
$(SYSINSTALL) $< $(DESTDIR)$(bindir)
|
||||
|
||||
GARBAGE += firefox
|
||||
GARBAGE += $(MOZ_APP_NAME)
|
||||
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -481,12 +481,12 @@ FeedWriter.prototype = {
|
|||
// just don't know how to do that via script...
|
||||
// XXXmano TBD: can probably add this to nsIShellService
|
||||
#ifdef XP_WIN
|
||||
if (fp.file.leafName != "firefox.exe") {
|
||||
#expand if (fp.file.leafName != "__MOZ_APP_NAME__.exe") {
|
||||
#else
|
||||
#ifdef XP_MACOSX
|
||||
if (fp.file.leafName != "Firefox.app") {
|
||||
#expand if (fp.file.leafName != "__MOZ_APP_DISPLAYNAME__.app") {
|
||||
#else
|
||||
if (fp.file.leafName != "firefox-bin") {
|
||||
#expand if (fp.file.leafName != "__MOZ_APP_NAME__-bin") {
|
||||
#endif
|
||||
#endif
|
||||
var selectedAppMenuItem = this.selectedApplicationItemWrapped;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,11 @@ LIBRARY_NAME = browser_feeds_s
|
|||
FORCE_STATIC_LIB = 1
|
||||
FORCE_USE_PIC = 1
|
||||
|
||||
DEFINES += \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_PP_COMPONENTS = \
|
||||
FeedConverter.js \
|
||||
FeedWriter.js \
|
||||
|
|
|
|||
|
|
@ -45,6 +45,11 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
|
||||
DEFINES += -DHAVE_SHELL_SERVICE=1
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -288,7 +288,16 @@ var gFeedsPane = {
|
|||
if (fp.show() == Ci.nsIFilePicker.returnOK && fp.file) {
|
||||
// XXXben - we need to compare this with the running instance executable
|
||||
// just don't know how to do that via script...
|
||||
if (fp.file.leafName == "firefox.exe")
|
||||
// XXXmano TBD: can probably add this to nsIShellService
|
||||
#ifdef XP_WIN
|
||||
#expand if (fp.file.leafName == "__MOZ_APP_NAME__.exe")
|
||||
#else
|
||||
#ifdef XP_MACOSX
|
||||
#expand if (fp.file.leafName == "__MOZ_APP_DISPLAYNAME__.app")
|
||||
#else
|
||||
#expand if (fp.file.leafName == "__MOZ_APP_NAME__-bin")
|
||||
#endif
|
||||
#endif
|
||||
return;
|
||||
|
||||
this.element(PREF_SELECTED_APP).value = fp.file;
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
NO_PKG_FILES = \
|
||||
firefox-config \
|
||||
firefox-bin.elf \
|
||||
$(MOZ_APP_NAME)-config \
|
||||
$(MOZ_APP_NAME)-bin.elf \
|
||||
regchrome* \
|
||||
regxpcom* \
|
||||
xpcshell* \
|
||||
|
|
@ -82,7 +82,7 @@ MOZ_OPTIONAL_PKG_LIST = \
|
|||
talkback \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += -DAB_CD=$(AB_CD)
|
||||
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME)
|
||||
|
||||
ifdef MOZ_PKG_MANIFEST_P
|
||||
MOZ_PKG_MANIFEST = packages-static
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ INSTALLER_FILES = \
|
|||
|
||||
AB_CD = $(MOZ_UI_LOCALE)
|
||||
|
||||
DEFINES += -DAB_CD=$(AB_CD) -DPKG_BASENAME=$(PKG_BASENAME) -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
|
||||
DEFINES += -DAB_CD=$(AB_CD) -DPKG_BASENAME=$(PKG_BASENAME) -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) -DMOZ_APP_NAME=$(MOZ_APP_NAME)
|
||||
|
||||
installer:
|
||||
$(NSINSTALL) -D instgen
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ NameProductInternal = Minefield
|
|||
ShortNameProduct = Minefield
|
||||
VersionProduct = @MOZ_APP_VERSION@
|
||||
FileInstallerEXE = @PKG_BASENAME@.installer
|
||||
FileMainEXE = firefox
|
||||
FileMainEXE = @MOZ_APP_NAME@
|
||||
FileUninstall = UninstallFirefox
|
||||
FileUninstallZIP = UninstallFirefox.zip
|
||||
FileInstallerNETRoot = @PKG_BASENAME@.net-installer
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ bin/components/libjar50.so
|
|||
|
||||
[browser]
|
||||
; [Base Browser Files]
|
||||
bin/firefox-bin
|
||||
bin/firefox
|
||||
bin/@MOZ_APP_NAME@-bin
|
||||
bin/@MOZ_APP_NAME@
|
||||
bin/mozilla-xremote-client
|
||||
bin/run-mozilla.sh
|
||||
bin/plugins/libnullplugin.so
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ DEFINES += \
|
|||
-DAB_CD=$(AB_CD) \
|
||||
-DPKG_BASENAME=$(PKG_BASENAME) \
|
||||
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
|
||||
-DMOZILLA_VERSION=${MOZILLA_VERSION} \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ ShortNameProduct = Minefield
|
|||
VersionProduct = @MOZ_APP_VERSION@
|
||||
FileInstallerEXE = @PKG_BASENAME@.installer.exe
|
||||
FileInstallerMSI = @PKG_BASENAME@.installer.msi
|
||||
FileMainEXE = firefox.exe
|
||||
FileMainEXE = @MOZ_APP_NAME@.exe
|
||||
FileInstallerNETRoot = @PKG_BASENAME@.net-installer
|
||||
ComponentList = xpcom,browser,talkback,@AB_CD@,adt
|
||||
LicenseFile = browser/EULA
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
!define FileInstallerMSI "@PKG_BASENAME@.installer.msi"
|
||||
!define FileInstallerNETRoot "@PKG_BASENAME@.net-installer"
|
||||
|
||||
!define FileMainEXE "firefox.exe"
|
||||
!define FileMainEXE "@MOZ_APP_NAME@.exe"
|
||||
!define WindowClass "FirefoxMessageWindow"
|
||||
!define DDEApplication "Firefox"
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ bin\msvcr80.dll
|
|||
|
||||
[browser]
|
||||
; [Base Browser Files]
|
||||
bin\firefox.exe
|
||||
bin\@MOZ_APP_NAME@.exe
|
||||
bin\plugins\npnul32.dll
|
||||
bin\res\cmessage.txt
|
||||
bin\xpicleanup.exe
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче