mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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 2007-01-25 13:43:52 +00:00
Родитель ad7e277a69
Коммит 9e3b19f9ee
13 изменённых файлов: 66 добавлений и 46 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
browser/app/Makefile.in
Просмотреть файл

@ -87,9 +87,9 @@ else
MOZILLA_INTERNAL_API = 1 MOZILLA_INTERNAL_API = 1
ifeq ($(USE_SHORT_LIBNAME), 1) ifeq ($(USE_SHORT_LIBNAME), 1)
PROGRAM = firefox$(BIN_SUFFIX) PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else else
PROGRAM = firefox-bin$(BIN_SUFFIX) PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif endif
REQUIRES = \ REQUIRES = \
@ -271,19 +271,19 @@ endif
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) 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)|" \ cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
-e "s|%MOZ_USER_DIR%|.mozilla/firefox|" \ -e "s|%MOZ_USER_DIR%|.mozilla/firefox|" \
-e "s|%MREDIR%|$(mredir)|" > $@ -e "s|%MREDIR%|$(mredir)|" > $@
chmod +x $@ chmod +x $@
libs:: firefox libs:: $(MOZ_APP_NAME)
$(INSTALL) $< $(DIST)/bin $(INSTALL) $< $(DIST)/bin
install:: firefox install:: $(MOZ_APP_NAME)
$(SYSINSTALL) $< $(DESTDIR)$(bindir) $(SYSINSTALL) $< $(DESTDIR)$(bindir)
GARBAGE += firefox GARBAGE += $(MOZ_APP_NAME)
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js)
endif endif

58
browser/components/feeds/src/FeedWriter.js
Просмотреть файл

@ -219,25 +219,25 @@ FeedWriter.prototype = {
return this._defaultSystemReaderItemWrapped; return this._defaultSystemReaderItemWrapped;
}, },
/** /**
* Returns a date suitable for displaying in the feed preview. * Returns a date suitable for displaying in the feed preview.
* If the date cannot be parsed, the return value is "false". * If the date cannot be parsed, the return value is "false".
* @param dateString * @param dateString
* A date as extracted from a feed entry. (entry.updated) * A date as extracted from a feed entry. (entry.updated)
*/ */
_parseDate: function FW__parseDate(dateString) { _parseDate: function FW__parseDate(dateString) {
// Convert the date into the user's local time zone // Convert the date into the user's local time zone
dateObj = new Date(dateString); dateObj = new Date(dateString);
// Make sure the date we're given is valid. // Make sure the date we're given is valid.
if (!dateObj.getTime()) if (!dateObj.getTime())
return false; return false;
var dateService = Cc["@mozilla.org/intl/scriptabledateformat;1"]. var dateService = Cc["@mozilla.org/intl/scriptabledateformat;1"].
getService(Ci.nsIScriptableDateFormat); getService(Ci.nsIScriptableDateFormat);
return dateService.FormatDateTime("", dateService.dateFormatLong, dateService.timeFormatNoSeconds, return dateService.FormatDateTime("", dateService.dateFormatLong, dateService.timeFormatNoSeconds,
dateObj.getFullYear(), dateObj.getMonth()+1, dateObj.getDate(), dateObj.getFullYear(), dateObj.getMonth()+1, dateObj.getDate(),
dateObj.getHours(), dateObj.getMinutes(), dateObj.getSeconds()); dateObj.getHours(), dateObj.getMinutes(), dateObj.getSeconds());
}, },
/** /**
@ -320,13 +320,13 @@ FeedWriter.prototype = {
var title = this._document.createElementNS(HTML_NS, "h3"); var title = this._document.createElementNS(HTML_NS, "h3");
title.appendChild(a); title.appendChild(a);
entryContainer.appendChild(title); entryContainer.appendChild(title);
var lastUpdated = this._parseDate(entry.updated); var lastUpdated = this._parseDate(entry.updated);
if (lastUpdated) { if (lastUpdated) {
var dateDiv = this._document.createElementNS(HTML_NS, "div"); var dateDiv = this._document.createElementNS(HTML_NS, "div");
dateDiv.setAttribute("class", "lastUpdated"); dateDiv.setAttribute("class", "lastUpdated");
title.appendChild(dateDiv); title.appendChild(dateDiv);
dateDiv.textContent = lastUpdated; dateDiv.textContent = lastUpdated;
} }
} }
@ -481,12 +481,12 @@ FeedWriter.prototype = {
// just don't know how to do that via script... // just don't know how to do that via script...
// XXXmano TBD: can probably add this to nsIShellService // XXXmano TBD: can probably add this to nsIShellService
#ifdef XP_WIN #ifdef XP_WIN
if (fp.file.leafName != "firefox.exe") { #expand if (fp.file.leafName != "__MOZ_APP_NAME__.exe") {
#else #else
#ifdef XP_MACOSX #ifdef XP_MACOSX
if (fp.file.leafName != "Firefox.app") { #expand if (fp.file.leafName != "__MOZ_APP_DISPLAYNAME__.app") {
#else #else
if (fp.file.leafName != "firefox-bin") { #expand if (fp.file.leafName != "__MOZ_APP_NAME__-bin") {
#endif #endif
#endif #endif
var selectedAppMenuItem = this.selectedApplicationItemWrapped; var selectedAppMenuItem = this.selectedApplicationItemWrapped;

5
browser/components/feeds/src/Makefile.in
Просмотреть файл

@ -46,6 +46,11 @@ LIBRARY_NAME = browser_feeds_s
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1 FORCE_USE_PIC = 1
DEFINES += \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
$(NULL)
EXTRA_PP_COMPONENTS = \ EXTRA_PP_COMPONENTS = \
FeedConverter.js \ FeedConverter.js \
FeedWriter.js \ FeedWriter.js \

5
browser/components/preferences/Makefile.in
Просмотреть файл

@ -45,6 +45,11 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.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))) ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1 DEFINES += -DHAVE_SHELL_SERVICE=1
endif endif

11
browser/components/preferences/feeds.js
Просмотреть файл

@ -288,7 +288,16 @@ var gFeedsPane = {
if (fp.show() == Ci.nsIFilePicker.returnOK && fp.file) { if (fp.show() == Ci.nsIFilePicker.returnOK && fp.file) {
// XXXben - we need to compare this with the running instance executable // XXXben - we need to compare this with the running instance executable
// just don't know how to do that via script... // 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; return;
this.element(PREF_SELECTED_APP).value = fp.file; this.element(PREF_SELECTED_APP).value = fp.file;

6
browser/installer/Makefile.in
Просмотреть файл

@ -44,8 +44,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
NO_PKG_FILES = \ NO_PKG_FILES = \
firefox-config \ $(MOZ_APP_NAME)-config \
firefox-bin.elf \ $(MOZ_APP_NAME)-bin.elf \
regchrome* \ regchrome* \
regxpcom* \ regxpcom* \
xpcshell* \ xpcshell* \
@ -82,7 +82,7 @@ MOZ_OPTIONAL_PKG_LIST = \
talkback \ talkback \
$(NULL) $(NULL)
DEFINES += -DAB_CD=$(AB_CD) DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME)
ifdef MOZ_PKG_MANIFEST_P ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = packages-static MOZ_PKG_MANIFEST = packages-static

2
browser/installer/unix/Makefile.in
Просмотреть файл

@ -68,7 +68,7 @@ INSTALLER_FILES = \
AB_CD = $(MOZ_UI_LOCALE) 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: installer:
$(NSINSTALL) -D instgen $(NSINSTALL) -D instgen

2
browser/installer/unix/installer.cfg
Просмотреть файл

@ -6,7 +6,7 @@ NameProductInternal = Minefield
ShortNameProduct = Minefield ShortNameProduct = Minefield
VersionProduct = @MOZ_APP_VERSION@ VersionProduct = @MOZ_APP_VERSION@
FileInstallerEXE = @PKG_BASENAME@.installer FileInstallerEXE = @PKG_BASENAME@.installer
FileMainEXE = firefox FileMainEXE = @MOZ_APP_NAME@
FileUninstall = UninstallFirefox FileUninstall = UninstallFirefox
FileUninstallZIP = UninstallFirefox.zip FileUninstallZIP = UninstallFirefox.zip
FileInstallerNETRoot = @PKG_BASENAME@.net-installer FileInstallerNETRoot = @PKG_BASENAME@.net-installer

4
browser/installer/unix/packages-static
Просмотреть файл

@ -41,8 +41,8 @@ bin/components/libjar50.so
[browser] [browser]
; [Base Browser Files] ; [Base Browser Files]
bin/firefox-bin bin/@MOZ_APP_NAME@-bin
bin/firefox bin/@MOZ_APP_NAME@
bin/mozilla-xremote-client bin/mozilla-xremote-client
bin/run-mozilla.sh bin/run-mozilla.sh
bin/plugins/libnullplugin.so bin/plugins/libnullplugin.so

1
browser/installer/windows/Makefile.in
Просмотреть файл

@ -69,6 +69,7 @@ DEFINES += \
-DAB_CD=$(AB_CD) \ -DAB_CD=$(AB_CD) \
-DPKG_BASENAME=$(PKG_BASENAME) \ -DPKG_BASENAME=$(PKG_BASENAME) \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \ -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
-DMOZILLA_VERSION=${MOZILLA_VERSION} \ -DMOZILLA_VERSION=${MOZILLA_VERSION} \
$(NULL) $(NULL)

2
browser/installer/windows/installer.cfg
Просмотреть файл

@ -7,7 +7,7 @@ ShortNameProduct = Minefield
VersionProduct = @MOZ_APP_VERSION@ VersionProduct = @MOZ_APP_VERSION@
FileInstallerEXE = @PKG_BASENAME@.installer.exe FileInstallerEXE = @PKG_BASENAME@.installer.exe
FileInstallerMSI = @PKG_BASENAME@.installer.msi FileInstallerMSI = @PKG_BASENAME@.installer.msi
FileMainEXE = firefox.exe FileMainEXE = @MOZ_APP_NAME@.exe
FileInstallerNETRoot = @PKG_BASENAME@.net-installer FileInstallerNETRoot = @PKG_BASENAME@.net-installer
ComponentList = xpcom,browser,talkback,@AB_CD@,adt ComponentList = xpcom,browser,talkback,@AB_CD@,adt
LicenseFile = browser/EULA LicenseFile = browser/EULA

2
browser/installer/windows/nsis/defines.nsi.in
Просмотреть файл

@ -6,6 +6,6 @@
!define FileInstallerMSI "@PKG_BASENAME@.installer.msi" !define FileInstallerMSI "@PKG_BASENAME@.installer.msi"
!define FileInstallerNETRoot "@PKG_BASENAME@.net-installer" !define FileInstallerNETRoot "@PKG_BASENAME@.net-installer"
!define FileMainEXE "firefox.exe" !define FileMainEXE "@MOZ_APP_NAME@.exe"
!define WindowClass "FirefoxMessageWindow" !define WindowClass "FirefoxMessageWindow"
!define DDEApplication "Firefox" !define DDEApplication "Firefox"

2
browser/installer/windows/packages-static
Просмотреть файл

@ -45,7 +45,7 @@ bin\msvcr80.dll
[browser] [browser]
; [Base Browser Files] ; [Base Browser Files]
bin\firefox.exe bin\@MOZ_APP_NAME@.exe
bin\plugins\npnul32.dll bin\plugins\npnul32.dll
bin\res\cmessage.txt bin\res\cmessage.txt
bin\xpicleanup.exe bin\xpicleanup.exe