зеркало из https://github.com/mozilla/gecko-dev.git
Bug 696436: consolidate Mac bundle name selection, and allow adding a prefix to it at build time, r=dolske, r=ted relanding with a clobber on a CLOSED TREE
This commit is contained in:
Родитель
6c81afa75a
Коммит
7f25d5cbe5
|
@ -180,20 +180,20 @@ libs:: $(srcdir)/blocklist.xml
|
|||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
|
||||
APP_NAME = $(MOZ_APP_DISPLAYNAME)
|
||||
MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
APP_NAME := $(APP_NAME)Debug
|
||||
MAC_APP_NAME := $(MAC_APP_NAME)Debug
|
||||
endif
|
||||
|
||||
LOWER_APP_NAME = $(shell echo $(APP_NAME) | tr '[A-Z]' '[a-z]')
|
||||
LOWER_MAC_APP_NAME = $(shell echo $(MAC_APP_NAME) | tr '[A-Z]' '[a-z]')
|
||||
|
||||
AB_CD = $(MOZ_UI_LOCALE)
|
||||
|
||||
AB := $(firstword $(subst -, ,$(AB_CD)))
|
||||
|
||||
clean clobber repackage::
|
||||
$(RM) -r $(DIST)/$(APP_NAME).app
|
||||
$(RM) -r $(DIST)/$(MOZ_MACBUNDLE_NAME)
|
||||
|
||||
ifdef LIBXUL_SDK
|
||||
APPFILES = Resources
|
||||
|
@ -202,26 +202,26 @@ APPFILES = MacOS
|
|||
endif
|
||||
|
||||
libs repackage:: $(PROGRAM)
|
||||
$(MKDIR) -p $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj
|
||||
$(MKDIR) -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
|
||||
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj
|
||||
sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%LOWER_APP_NAME%/$(LOWER_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
|
||||
sed -e "s/%APP_NAME%/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings
|
||||
rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
|
||||
$(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
|
||||
$(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
|
||||
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(MOZ_MACBUNDLE_NAME) --exclude English.lproj
|
||||
$(MKDIR) -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
|
||||
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj
|
||||
sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" -e "s/%LOWER_MAC_APP_NAME%/$(LOWER_MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
|
||||
sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/$(AB).lproj/InfoPlist.strings
|
||||
rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
|
||||
$(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
|
||||
ifdef LIBXUL_SDK
|
||||
cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox
|
||||
cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox
|
||||
else
|
||||
$(RM) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
|
||||
rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
$(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
|
||||
rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
|
||||
endif
|
||||
-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
|
||||
cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(APP_NAME).app/Contents/Resources/firefox.icns
|
||||
cp -RL $(DIST)/branding/document.icns $(DIST)/$(APP_NAME).app/Contents/Resources/document.icns
|
||||
printf APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
|
||||
-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
|
||||
cp -RL $(DIST)/branding/firefox.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/firefox.icns
|
||||
cp -RL $(DIST)/branding/document.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/document.icns
|
||||
printf APPLMOZB > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/PkgInfo
|
||||
# remove CVS dirs from packaged app
|
||||
find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
|
||||
find $(DIST)/$(MOZ_MACBUNDLE_NAME) -type d -name "CVS" -prune -exec rm -rf {} \;
|
||||
|
||||
else
|
||||
ifdef LIBXUL_SDK
|
||||
|
@ -234,7 +234,7 @@ ifdef LIBXUL_SDK
|
|||
ifndef SKIP_COPY_XULRUNNER
|
||||
libs::
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
|
||||
rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Frameworks
|
||||
else
|
||||
$(NSINSTALL) -D $(DIST)/bin/xulrunner
|
||||
(cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
|
||||
|
|
|
@ -145,15 +145,15 @@
|
|||
<key>CFBundleExecutable</key>
|
||||
<string>firefox</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>%APP_NAME% %APP_VERSION%</string>
|
||||
<string>%MAC_APP_NAME% %APP_VERSION%</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>firefox</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.%LOWER_APP_NAME%</string>
|
||||
<string>org.mozilla.%LOWER_MAC_APP_NAME%</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>%APP_NAME%</string>
|
||||
<string>%MAC_APP_NAME%</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
|
|
|
@ -1 +1 @@
|
|||
CFBundleName = "%APP_NAME%";
|
||||
CFBundleName = "%MAC_APP_NAME%";
|
||||
|
|
|
@ -765,7 +765,7 @@ FeedWriter.prototype = {
|
|||
#expand if (fp.file.leafName != "__MOZ_APP_NAME__.exe") {
|
||||
#else
|
||||
#ifdef XP_MACOSX
|
||||
#expand if (fp.file.leafName != "__MOZ_APP_DISPLAYNAME__.app") {
|
||||
#expand if (fp.file.leafName != "__MOZ_MACBUNDLE_NAME__") {
|
||||
#else
|
||||
#expand if (fp.file.leafName != "__MOZ_APP_NAME__-bin") {
|
||||
#endif
|
||||
|
|
|
@ -50,7 +50,7 @@ endif
|
|||
|
||||
DEFINES += \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
|
||||
-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_COMPONENTS = \
|
||||
|
|
|
@ -51,7 +51,7 @@ include $(topsrcdir)/config/rules.mk
|
|||
|
||||
DEFINES += \
|
||||
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
|
||||
-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
|
||||
-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
|
||||
|
|
|
@ -1352,7 +1352,7 @@ var gApplicationsPane = {
|
|||
#expand aExecutable.leafName != "__MOZ_APP_NAME__.exe";
|
||||
#else
|
||||
#ifdef XP_MACOSX
|
||||
#expand aExecutable.leafName != "__MOZ_APP_DISPLAYNAME__.app";
|
||||
#expand aExecutable.leafName != "__MOZ_MACBUNDLE_NAME__";
|
||||
#else
|
||||
#expand aExecutable.leafName != "__MOZ_APP_NAME__-bin";
|
||||
#endif
|
||||
|
|
|
@ -16,3 +16,5 @@ export MOZILLA_OFFICIAL=1
|
|||
|
||||
export MOZ_TELEMETRY_REPORTING=1
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j4"
|
||||
|
||||
ac_add_options --with-macbundlename-prefix=Firefox
|
||||
|
|
|
@ -7,3 +7,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
|
|||
|
||||
# Needed to enable breakpad in application.ini
|
||||
export MOZILLA_OFFICIAL=1
|
||||
|
||||
ac_add_options --with-macbundlename-prefix=Firefox
|
||||
|
|
|
@ -9,3 +9,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j4"
|
|||
|
||||
# Needed to enable breakpad in application.ini
|
||||
export MOZILLA_OFFICIAL=1
|
||||
|
||||
ac_add_options --with-macbundlename-prefix=Firefox
|
||||
|
|
|
@ -53,11 +53,7 @@ ifeq ($(MOZ_BUILD_APP),camino)
|
|||
browser_path = $(TARGET_DIST)/Camino.app/Contents/MacOS/Camino
|
||||
else
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
ifdef MOZ_DEBUG
|
||||
browser_path = $(TARGET_DIST)/$(MOZ_APP_DISPLAYNAME)Debug.app/Contents/MacOS/$(PROGRAM)
|
||||
else
|
||||
browser_path = $(TARGET_DIST)/$(MOZ_APP_DISPLAYNAME).app/Contents/MacOS/$(PROGRAM)
|
||||
endif
|
||||
browser_path = $(TARGET_DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
|
||||
else
|
||||
browser_path = $(TARGET_DIST)/bin/$(PROGRAM)
|
||||
endif
|
||||
|
|
|
@ -4,13 +4,7 @@ OBJDIR_X86 = $(MOZ_OBJDIR)/i386
|
|||
include $(OBJDIR_X86)/config/autoconf.mk
|
||||
include $(TOPSRCDIR)/config/config.mk
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
DBGTAG = Debug
|
||||
else
|
||||
DBGTAG =
|
||||
endif
|
||||
|
||||
# Just copy the icc-produced libmozjs.dylib over
|
||||
postflight_all:
|
||||
echo "Postflight: copying libmozjs.dylib..."
|
||||
$(INSTALL) $(OBJDIR_ICC)/dist/bin/libmozjs.dylib $(OBJDIR_X86)/dist/$(MOZ_APP_DISPLAYNAME)$(DBGTAG).app/Contents/MacOS/
|
||||
$(INSTALL) $(OBJDIR_ICC)/dist/bin/libmozjs.dylib $(OBJDIR_X86)/dist/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/
|
||||
|
|
|
@ -51,12 +51,6 @@ include $(OBJDIR)/config/autoconf.mk
|
|||
|
||||
DIST = $(OBJDIR)/dist
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
DBGTAG = Debug
|
||||
else
|
||||
DBGTAG =
|
||||
endif
|
||||
|
||||
ifdef LIBXUL_SDK # {
|
||||
APP_CONTENTS = Contents/Frameworks/XUL.framework
|
||||
else # } {
|
||||
|
@ -70,7 +64,7 @@ APPNAME = Camino.app
|
|||
BUILDCONFIG_BASE = Contents/MacOS/chrome
|
||||
else # } {
|
||||
MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
|
||||
APPNAME = $(MOZ_APP_DISPLAYNAME)$(DBGTAG).app
|
||||
APPNAME = $(MOZ_MACBUNDLE_NAME)
|
||||
INSTALLER_DIR = $(MOZ_BUILD_APP)/installer
|
||||
ifeq ($(MOZ_BUILD_APP),xulrunner) # {
|
||||
INSTALLER_DIR = xulrunner/installer/mac
|
||||
|
|
|
@ -55,16 +55,6 @@ include $(topsrcdir)/config/rules.mk
|
|||
TARGET_DEPTH = ../..
|
||||
include $(topsrcdir)/build/automation-build.mk
|
||||
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
ifdef MOZ_DEBUG
|
||||
browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(MOZ_APP_DISPLAYNAME)Debug.app/Contents/MacOS/$(PROGRAM)\"
|
||||
else
|
||||
browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(MOZ_APP_DISPLAYNAME).app/Contents/MacOS/$(PROGRAM)\"
|
||||
endif
|
||||
else
|
||||
browser_path = \"$(TARGET_DIST)/$(MOZ_APP_NAME)/$(PROGRAM)\"
|
||||
endif
|
||||
|
||||
# Stuff to make a build with a profile
|
||||
|
||||
_PGO_FILES = \
|
||||
|
|
|
@ -58,6 +58,7 @@ MOZ_EXTENSION_MANAGER = @MOZ_EXTENSION_MANAGER@
|
|||
MOZ_APP_UA_NAME = @MOZ_APP_UA_NAME@
|
||||
MOZ_APP_VERSION = @MOZ_APP_VERSION@
|
||||
MOZ_UA_BUILDID = @MOZ_UA_BUILDID@
|
||||
MOZ_MACBUNDLE_NAME = @MOZ_MACBUNDLE_NAME@
|
||||
MOZ_APP_STATIC_INI = @MOZ_APP_STATIC_INI@
|
||||
|
||||
MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
|
||||
|
|
20
configure.in
20
configure.in
|
@ -8472,6 +8472,26 @@ AC_SUBST(MOZ_OS2_TOOLS)
|
|||
AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
|
||||
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Mac bundle name prefix
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_STRING(macbundlename-prefix,
|
||||
[ --with-macbundlename-prefix=prefix
|
||||
Prefix for MOZ_MACBUNDLE_NAME],
|
||||
[ MOZ_MACBUNDLE_NAME_PREFIX="$withval"])
|
||||
|
||||
MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_DISPLAYNAME | tr -d ' '`
|
||||
if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then
|
||||
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}"
|
||||
fi
|
||||
|
||||
if test "$MOZ_DEBUG"; then
|
||||
MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}Debug.app
|
||||
else
|
||||
MOZ_MACBUNDLE_NAME=${MOZ_MACBUNDLE_NAME}.app
|
||||
fi
|
||||
AC_SUBST(MOZ_MACBUNDLE_NAME)
|
||||
|
||||
# The following variables are available to branding and application
|
||||
# configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh):
|
||||
# - MOZ_APP_VENDOR: Used for application.ini's "Vendor" field, which also
|
||||
|
|
|
@ -360,11 +360,7 @@ INNER_UNMAKE_PACKAGE = \
|
|||
endif
|
||||
ifeq ($(MOZ_PKG_FORMAT),DMG)
|
||||
ifndef _APPNAME
|
||||
ifdef MOZ_DEBUG
|
||||
_APPNAME = $(MOZ_APP_DISPLAYNAME)Debug.app
|
||||
else
|
||||
_APPNAME = $(MOZ_APP_DISPLAYNAME).app
|
||||
endif
|
||||
_APPNAME = $(MOZ_MACBUNDLE_NAME)
|
||||
endif
|
||||
ifndef _BINPATH
|
||||
_BINPATH = /$(_APPNAME)/Contents/MacOS
|
||||
|
|
|
@ -54,12 +54,12 @@ STAGE_DIR = $(DIST)/$(PKG_UPDATE_PATH)
|
|||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
ifdef UNIVERSAL_BINARY
|
||||
ifneq (,$(filter %/l10n-stage,$(PACKAGE_BASE_DIR)))
|
||||
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)/$(MOZ_APP_DISPLAYNAME).app
|
||||
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)/$(MOZ_MACBUNDLE_NAME)
|
||||
else
|
||||
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/universal/$(MOZ_PKG_DIR)/$(MOZ_APP_DISPLAYNAME).app
|
||||
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/universal/$(MOZ_PKG_DIR)/$(MOZ_MACBUNDLE_NAME)
|
||||
endif
|
||||
else
|
||||
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)/$(MOZ_APP_DISPLAYNAME).app
|
||||
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)/$(MOZ_MACBUNDLE_NAME)
|
||||
endif
|
||||
else
|
||||
PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)
|
||||
|
|
Загрузка…
Ссылка в новой задаче