Part of Bug 668869 - port ffox work to lazily load libxul to speed up start-up perf and remove wrapper startup script - finish the Mac port which creates a thunderbird executable. The duplication of thunderbird-bin will be dealt with by bug 697218. r=bienvenu
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 25 Oct 2011 20:27:53 +0100
changeset 8711 7582d11356ffbcccd5c93ec275a08e1cd39c888c
parent 8710 3fa232956b097cbb0b2e9115400c0354eb7ece1b
child 8712 88ee178d968d35e35d727e55a41da1f19a3d9d15
push id6699
push userbugzilla@standard8.plus.com
push dateTue, 25 Oct 2011 19:28:44 +0000
treeherdercomm-central@7582d11356ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbienvenu
bugs668869, 697218
Part of Bug 668869 - port ffox work to lazily load libxul to speed up start-up perf and remove wrapper startup script - finish the Mac port which creates a thunderbird executable. The duplication of thunderbird-bin will be dealt with by bug 697218. r=bienvenu
mail/app/Makefile.in
mail/app/macbuild/Contents/Info.plist.in
mail/installer/package-manifest.in
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -74,17 +74,17 @@ GARBAGE += \
 	$(FINAL_TARGET)/license.html \
 	$(NULL)
 
 PREF_JS_EXPORTS = \
     $(srcdir)/profile/all-thunderbird.js \
     $(srcdir)/profile/channel-prefs.js \
     $(NULL)
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 Darwin WINCE WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
 
 CPPSRCS = nsMailApp.cpp
 
@@ -98,18 +98,16 @@ LOCAL_INCLUDES += \
 
 DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := -framework Cocoa $(TK_LIBS)
 endif
 
-APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
-
 LIBS += \
 	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)
 
 ifdef MOZ_JPROF
 LIBS += -ljprof
 endif
@@ -230,31 +228,37 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 libs::
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DIST)/bin/chrome/icons/default
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
 endif
 
-ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+ifneq (,$(filter-out Darwin,$(OS_ARCH)))
 $(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
 	chmod +x $@
 
 libs:: $(MOZ_APP_NAME)
 	$(INSTALL) $< $(DIST)/bin
 
 install:: $(MOZ_APP_NAME)
 	$(SYSINSTALL) $< $(DESTDIR)$(bindir)
 
 GARBAGE += $(MOZ_APP_NAME)
+else
+libs::
+	cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
+
+endif # ! Mac
 GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-thunderbird.js channel-prefs.js mailnews.js)
-endif
+endif # ! OS 2 or WinNT
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
 LIBS += -lphexlib
 endif
 
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
--- a/mail/app/macbuild/Contents/Info.plist.in
+++ b/mail/app/macbuild/Contents/Info.plist.in
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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-bin</string>
+	<string>thunderbird</string>
 	<key>CFBundleGetInfoString</key>
 	<string>%APP_NAME% %APP_VERSION%</string>
 	<key>CFBundleIconFile</key>
 	<string>thunderbird</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.mozilla.%LOWER_APP_NAME%</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -91,20 +91,18 @@
 @BINPATH@/components/newsblog.js
 @BINPATH@/components/newsblog.manifest
 
 [mail]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
-#ifndef XP_MACOSX
 @BINPATH@/@MOZ_APP_NAME@
 #endif
-#endif
 @BINPATH@/application.ini
 @BINPATH@/blocklist.xml
 @BINPATH@/platform.ini
 #ifdef XP_OS2
 @BINPATH@/@DLL_PREFIX@mozsqlt3@DLL_SUFFIX@
 #else
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif