Bug 711718 - Mac64 builds failing during packaging. r+a=Standard8
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -46,30 +46,24 @@ DIST_ARCH_2 = $(OBJDIR_ARCH_2)/mozilla/d
DIST_UNI = $(DIST_ARCH_1)/universal
OBJDIR = $(OBJDIR_ARCH_1)
endif
include $(OBJDIR)/config/autoconf.mk
DIST = $(OBJDIR)/mozilla/dist
-ifdef MOZ_DEBUG
-DBGTAG = Debug
-else
-DBGTAG =
-endif
-
ifdef LIBXUL_SDK # {
APP_CONTENTS = Contents/Frameworks/XUL.framework
else # } {
APP_CONTENTS = Contents/MacOS
endif # } LIBXUL_SDK
MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
-APPNAME = $(MOZ_APP_DISPLAYNAME)$(DBGTAG).app
+APPNAME = $(MOZ_MACBUNDLE_NAME)
INSTALLER_DIR = $(MOZ_BUILD_APP)/installer
BUILDCONFIG_BASE = $(APP_CONTENTS)/chrome
ifeq ($(MOZ_CHROME_FILE_FORMAT),jar)
BUILDCONFIG = $(BUILDCONFIG_BASE)/toolkit.jar
FIX_MODE = jar
else
BUILDCONFIG = $(BUILDCONFIG_BASE)/toolkit/
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -48,16 +48,17 @@ MOZILLA_VERSION = @MOZILLA_VERSION@
THUNDERBIRD_VERSION = @THUNDERBIRD_VERSION@
SUNBIRD_VERSION = @SUNBIRD_VERSION@
SEAMONKEY_VERSION = @SEAMONKEY_VERSION@
MOZ_BUILD_APP = @MOZ_BUILD_APP@
MOZ_APP_NAME = @MOZ_APP_NAME@
MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
MOZ_APP_VERSION = @MOZ_APP_VERSION@
+MOZ_MACBUNDLE_NAME= @MOZ_MACBUNDLE_NAME@
MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
libdir = @libdir@
--- a/configure.in
+++ b/configure.in
@@ -6854,16 +6854,36 @@ AC_SUBST(USE_DEPENDENT_LIBS)
AC_SUBST(MOZ_BUILD_ROOT)
AC_SUBST(MOZ_OS2_TOOLS)
AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
AC_SUBST(MOZ_TIMELINE)
+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)
+
AC_SUBST(MOZ_APP_NAME)
AC_SUBST(MOZ_APP_DISPLAYNAME)
AC_SUBST(MOZ_APP_VERSION)
AC_SUBST(FIREFOX_VERSION)
AC_SUBST(THUNDERBIRD_VERSION)
AC_SUBST(SUNBIRD_VERSION)
AC_SUBST(SEAMONKEY_VERSION)
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -276,39 +276,39 @@ libs::
$(INSTALL) $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
cp $(topsrcdir)/mail/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
AB := $(firstword $(subst -, ,$(AB_CD)))
-APP_NAME = $(MOZ_APP_DISPLAYNAME)
-
-LOWER_APP_NAME = $(shell echo $(APP_NAME) | tr '[A-Z]' '[a-z]')
+MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
ifdef MOZ_DEBUG
-APP_NAME := $(APP_NAME)Debug
+MAC_APP_NAME := $(MAC_APP_NAME)Debug
endif
+LOWER_MAC_APP_NAME = $(shell echo $(MAC_APP_NAME) | tr '[A-Z]' '[a-z]')
+
libs:: $(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%/$(MOZ_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/MacOS
- rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
- rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
- mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
- rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight
- cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns
- printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
+ 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%/$(MOZ_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/MacOS
+ rm -f $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)
+ rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
+ mkdir -p $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight
+ rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight
+ cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/thunderbird.icns
+ printf APPLMOZM > $(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 {} \;
clean clobber::
- rm -rf $(DIST)/$(APP_NAME).app
+ rm -rf $(DIST)/$(MOZ_MACBUNDLE_NAME)
endif
# Note that anything you do to dist/ down here isn't going to make it into the
# Mac build, since it's already been copied over to the .app, above.
--- a/mail/app/macbuild/Contents/Info.plist.in
+++ b/mail/app/macbuild/Contents/Info.plist.in
@@ -2,25 +2,25 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>thunderbird</string>
<key>CFBundleGetInfoString</key>
- <string>%APP_NAME% %APP_VERSION%</string>
+ <string>%MAC_APP_NAME% %APP_VERSION%</string>
<key>CFBundleIconFile</key>
<string>thunderbird</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>
<string>%APP_VERSION%</string>
<key>CFBundleSignature</key>
<string>MOZM</string>
<key>CFBundleVersion</key>
<string>%APP_VERSION%</string>
--- a/mail/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
+++ b/mail/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
@@ -1,1 +1,1 @@
-CFBundleName = "%APP_NAME%";
+CFBundleName = "%MAC_APP_NAME%";
--- a/mail/components/preferences/Makefile.in
+++ b/mail/components/preferences/Makefile.in
@@ -39,15 +39,17 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
+DEFINES += -DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME)
+
ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
--- a/mail/components/preferences/applications.js
+++ b/mail/components/preferences/applications.js
@@ -900,17 +900,17 @@ var gApplicationsPane = {
aExecutable.isExecutable() &&
// XXXben - we need to compare this with the running instance executable
// just don't know how to do that via script...
// XXXmano TBD: can probably add this to nsIShellService
#ifdef XP_WIN
#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
#endif
},
/**
* Rebuild the actions menu for the selected entry. Gets called by
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -292,34 +292,34 @@ libs::
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
AB := $(firstword $(subst -, ,$(AB_CD)))
ifdef MOZ_DEBUG
-APP_NAME = $(MOZ_APP_DISPLAYNAME)Debug
+MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)Debug
else
-APP_NAME = $(MOZ_APP_DISPLAYNAME)
+MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
endif
libs:: $(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/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
- sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(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/MacOS
- rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
- rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
- cp -RL $(DIST)/branding/icons/*.icns $(DIST)/$(APP_NAME).app/Contents/Resources/
- printf APPLMOZZ > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
+ 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/\@MAC_APP_NAME\@/$(MAC_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Info.plist
+ sed -e "s/\@MAC_APP_NAME\@/$(MAC_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" $(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/MacOS
+ rm -f $(DIST)/$(MAC_APP_NAME)/Contents/MacOS/$(PROGRAM)
+ rsync -aL $(PROGRAM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS
+ cp -RL $(DIST)/branding/icons/*.icns $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/
+ printf APPLMOZZ > $(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 {} \;
clean clobber::
- rm -rf $(DIST)/$(APP_NAME).app
+ rm -rf $(DIST)/$(MOZ_MACBUNDLE_NAME)
endif
# Anything below the above ifdef won't be included in mac builds. So be very
# careful what you add here.
--- a/suite/app/macbuild/Contents/Info.plist.in
+++ b/suite/app/macbuild/Contents/Info.plist.in
@@ -2,33 +2,33 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleExecutable</key>
<string>@MOZ_APP_NAME@-bin</string>
<key>CFBundleIdentifier</key>
- <string>org.mozilla.@MOZ_APP_NAME@</string>
+ <string>org.mozilla.@MAC_APP_NAME@</string>
<key>CFBundleVersion</key>
<string>@MOZ_APP_VERSION@</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleName</key>
<string>@MOZ_APP_DISPLAYNAME@</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>MOZZ</string>
<key>CFBundleIconFile</key>
<string>seamonkey.icns</string>
<key>CFBundleShortVersionString</key>
<string>@MOZ_APP_VERSION@</string>
<key>CFBundleGetInfoString</key>
- <string>@MOZ_APP_DISPLAYNAME@ @MOZ_APP_VERSION@</string>
+ <string>@MAC_APP_NAME@ @MOZ_APP_VERSION@</string>
<key>NSAppleScriptEnabled</key>
<true/>
<key>CGDisableCoalescedUpdates</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
--- a/suite/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
+++ b/suite/app/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
@@ -1,3 +1,3 @@
/* Localized versions of Info.plist keys */
-CFBundleName = "@MOZ_APP_DISPLAYNAME@";
+CFBundleName = "@MAC_APP_NAME@";
--- a/suite/common/Makefile.in
+++ b/suite/common/Makefile.in
@@ -55,10 +55,11 @@ abs_srcdir = $(call core_abspath,$(srcdi
CHROME_DEPS += $(abs_srcdir)/app-license.html
# DEFINES for preprocessing
# Use suite/common/app-license.html as input when generating
# chrome://content/communicator/license.html to override
# chrome://global/content/license.html (about:license)
DEFINES += -DAPP_EULA_BLOCK=$(abs_srcdir)/app-license.html \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+ -DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
$(NULL)
--- a/suite/common/pref/pref-applications.js
+++ b/suite/common/pref/pref-applications.js
@@ -1292,17 +1292,17 @@ var gApplicationsPane = {
aExecutable.isExecutable() &&
// XXXben - we need to compare this with the running instance executable
// just don't know how to do that via script...
// XXXmano TBD: can probably add this to nsIShellService
#ifdef XP_WIN
#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
#endif
},
/**
* Rebuild the actions menu for the selected entry. Gets called by
--- a/suite/feeds/src/FeedWriter.js
+++ b/suite/feeds/src/FeedWriter.js
@@ -755,17 +755,17 @@ FeedWriter.prototype = {
if (this._selectedApp) {
// XXXben - we need to compare this with the running instance executable
// just don't know how to do that via script...
// 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") {
+#expand if (fp.file.leafName != "__MOZ_MACBUNDLE_NAME__") {
#else
#expand if (fp.file.leafName != "__MOZ_APP_NAME__-bin") {
#endif
#endif
this._initMenuItemWithFile(this._contentSandbox.selectedAppMenuItem,
this._selectedApp);
// Show and select the selected application menuitem
--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@@ -43,17 +43,17 @@ include $(DEPTH)/config/autoconf.mk
MODULE = suitefeeds
LIBRARY_NAME = suitefeeds_s
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1
DEFINES += \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
- -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
+ -DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
$(NULL)
EXTRA_COMPONENTS = \
SuiteFeeds.manifest \
FeedConverter.js \
WebContentConverter.js \
nsAboutFeeds.js \
$(NULL)
