bug 588067 - Switch SeaMonkey to use omnijar for nightly/release builds, r=Callek
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -290,16 +290,58 @@ ifeq ($(OS_ARCH),WINNT)
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
else
$(INSTALL) $(topsrcdir)/suite/installer/license.txt $(DIST)/bin/
endif
libs:: blocklist.xml
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
+ifdef MOZ_OMNIJAR
+# Make extensions end up as XPIs instead of flat chrome when doing omni.jar.
+# NOTE: This is a hack to run this at the end of compilation, would be nicer
+# if this was done right away for built-in extensions in omnijar mode.
+# Listed extension GUIDs:
+# 972ce4c6-... Classic Theme, 59c81df5-... ChatZilla, f13b157f-... venkman
+EXTENSIONS = \
+ {972ce4c6-7e08-4474-a285-3208198ce6fd} \
+ modern@themes.mozilla.org \
+ debugQA@mozilla.org \
+ {59c81df5-4b7a-477b-912d-4e0fdf64e5f2} \
+ {f13b157f-b174-47e7-a34d-4815ddfdfeb8} \
+ inspector@mozilla.org \
+ $(NULL)
+
+ifneq (en-US, $(AB_CD))
+EXTENSIONS += \
+ langpack-$(AB_CD)@chatzilla.mozilla.org \
+ langpack-$(AB_CD)@venkman.mozilla.org \
+ $(NULL)
+endif
+
+ABS_DIST = $(call core_abspath,$(STAGEDIST))
+
+define _PACKAGE_EXTENSIONS
+@echo "Packaging $(dir).xpi..."
+if test -d "$(ABS_DIST)/extensions/$(dir)"; then \
+cd $(ABS_DIST)/extensions/$(dir)/; $(ZIP) -r9mX ../$(dir).xpi *; \
+rm -rf $(ABS_DIST)/extensions/$(dir); \
+fi
+
+endef # do not remove the blank line!
+
+pack-ext: $(STAGEDIST)
+ @echo "Packaging extensions..."
+ $(foreach dir,$(EXTENSIONS),$(_PACKAGE_EXTENSIONS))
+
+libs::
+ @$(MAKE) pack-ext STAGEDIST="$(DIST)/bin"
+
+endif
+
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
AB := $(firstword $(subst -, ,$(AB_CD)))
ifdef MOZ_DEBUG
APP_NAME = $(MOZ_APP_DISPLAYNAME)Debug
else
APP_NAME = $(MOZ_APP_DISPLAYNAME)
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -38,17 +38,17 @@
MOZ_APP_NAME=seamonkey
MOZ_APP_DISPLAYNAME=SeaMonkey
MOZ_MAIL_NEWS=1
if [ "$COMM_BUILD" ]; then
MOZ_LDAP_XPCOM=1
fi
MOZ_STATIC_MAIL_BUILD=1
-MOZ_CHROME_FILE_FORMAT=jar
+MOZ_CHROME_FILE_FORMAT=omni
MOZ_COMPOSER=1
MOZ_SUITE=1
MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
SEAMONKEY_VERSION=$MOZ_APP_VERSION
MOZ_BRANDING_DIRECTORY=suite/branding/nightly
MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs"
MOZ_UPDATER=1
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -71,16 +71,22 @@ MOZ_OPTIONAL_PKG_LIST = \
chatzilla \
debugqa \
inspector \
venkman \
$(NULL)
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+ifeq ($(MOZ_CHROME_FILE_FORMAT), jar)
+DEFINES += -DJAREXT=.jar
+else
+DEFINES += -DJAREXT=
+endif
+
ifdef ENABLE_TESTS
DEFINES += -DENABLE_TESTS=1
endif
ifdef MOZ_DEBUG
DEFINES += -DMOZ_DEBUG=1
endif
@@ -133,16 +139,18 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
MOZ_PKG_MAC_DSSTORE=branding/dsstore
MOZ_PKG_MAC_BACKGROUND=branding/background.png
MOZ_PKG_MAC_ICON=branding/disk.icns
MOZ_PKG_MAC_EXTRA=--format UDBZ \
--symlink "/Applications: " \
--copy "$(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/mac/README.txt"
endif
+NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
+
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (Darwin, $(OS_ARCH))
BINPATH = $(_BINPATH)
DEFINES += -DAPPNAME=$(_APPNAME)
else
BINPATH = bin
endif
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -20,17 +20,17 @@
; Mac bundle stuff
@APPNAME@/Contents/Info.plist
@APPNAME@/Contents/PkgInfo
@APPNAME@/Contents/Plug-Ins/
@APPNAME@/Contents/Resources/
#endif
[@AB_CD@]
-@BINPATH@/chrome/@AB_CD@.jar
+@BINPATH@/chrome/@AB_CD@@JAREXT@
@BINPATH@/chrome/@AB_CD@.manifest
@BINPATH@/defaults/messenger/mailViews.dat
@BINPATH@/defaults/profile/bookmarks.html
@BINPATH@/defaults/profile/localstore.rdf
@BINPATH@/defaults/profile/mimeTypes.rdf
@BINPATH@/defaults/profile/panels.rdf
@BINPATH@/defaults/profile/chrome/*
@BINPATH@/@PREF_DIR@/suite-l10n.js
@@ -105,16 +105,19 @@
@BINPATH@/license.txt
@BINPATH@/blocklist.xml
#ifdef UNIX_BUT_NOT_MAC
@BINPATH@/mozilla-xremote-client
@BINPATH@/run-mozilla.sh
#endif
; [Components]
+; Although components.manifest ends up being shipped inside omni.jar
+; it still needs listing here as it is parsed for various binary
+; components before being packaged inside omni.jar.
@BINPATH@/components/components.manifest
#ifdef ACCESSIBILITY
#ifdef XP_WIN32
@BINPATH@/AccessibleMarshal.dll
@BINPATH@/components/accessibility-msaa.xpt
#endif
@BINPATH@/components/accessibility.xpt
#endif
@@ -186,17 +189,16 @@
@BINPATH@/components/filepicker.xpt
#endif
@BINPATH@/components/find.xpt
@BINPATH@/components/gfx.xpt
@BINPATH@/components/htmlparser.xpt
@BINPATH@/components/imgicon.xpt
@BINPATH@/components/imglib2.xpt
@BINPATH@/components/inspector.xpt
-@BINPATH@/components/interfaces.manifest
@BINPATH@/components/intl.xpt
@BINPATH@/components/jar.xpt
@BINPATH@/components/jetpack.xpt
@BINPATH@/components/jsdservice.xpt
@BINPATH@/components/layout_base.xpt
@BINPATH@/components/layout_forms.xpt
#ifdef NS_PRINTING
@BINPATH@/components/layout_printing.xpt
@@ -403,34 +405,42 @@
@BINPATH@/components/txEXSLTRegExFunctions.js
@BINPATH@/components/txEXSLTRegExFunctions.manifest
@BINPATH@/components/WebContentConverter.js
; Modules
@BINPATH@/modules/*
; [Browser Chrome Files]
-@BINPATH@/chrome/comm.jar
+@BINPATH@/chrome/comm@JAREXT@
@BINPATH@/chrome/comm.manifest
-@BINPATH@/chrome/toolkit.jar
+@BINPATH@/chrome/toolkit@JAREXT@
@BINPATH@/chrome/toolkit.manifest
; classic theme
-@BINPATH@/chrome/classic.jar
+@BINPATH@/chrome/classic@JAREXT@
@BINPATH@/chrome/classic.manifest
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+#else
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+#endif
; modern theme
-@BINPATH@/extensions/modern@themes.mozilla.org/chrome/modern.jar
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/modern@themes.mozilla.org.xpi
+#else
+@BINPATH@/extensions/modern@themes.mozilla.org/chrome/modern@JAREXT@
@BINPATH@/extensions/modern@themes.mozilla.org/chrome.manifest
@BINPATH@/extensions/modern@themes.mozilla.org/icon.png
@BINPATH@/extensions/modern@themes.mozilla.org/install.rdf
@BINPATH@/extensions/modern@themes.mozilla.org/preview.png
+#endif
; shell icons
#ifdef MOZ_GTK2
@BINPATH@/chrome/icons/default/bmPropsWindow.png
@BINPATH@/chrome/icons/default/bmPropsWindow16.png
@BINPATH@/chrome/icons/default/bmPropsWindow48.png
@BINPATH@/chrome/icons/default/bookmark-window.png
@BINPATH@/chrome/icons/default/bookmark-window16.png
@@ -499,17 +509,17 @@
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js
; [Layout Engine Resources]
; Layout debug extension.
#ifdef ENABLE_TESTS
#ifdef MOZ_DEBUG
-@BINPATH@/chrome/layoutdebug.jar
+@BINPATH@/chrome/layoutdebug@JAREXT@
@BINPATH@/chrome/layoutdebug.manifest
@BINPATH@/components/layout_debug.xpt
#endif
#endif
; Style Sheets, Graphics and other Resources used by the layout engine.
@BINPATH@/res/contenteditable.css
@BINPATH@/res/designmode.css
@BINPATH@/res/EditorOverride.css
@@ -563,17 +573,17 @@
@BINPATH@/@DLL_PREFIX@softokn3.chk
#endif
#ifndef NSS_DISABLE_DBM
@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
#ifndef CROSS_COMPILE
@BINPATH@/@DLL_PREFIX@nssdbm3.chk
#endif
#endif
-@BINPATH@/chrome/pippki.jar
+@BINPATH@/chrome/pippki@JAREXT@
@BINPATH@/chrome/pippki.manifest
; for Solaris SPARC
#ifdef SOLARIS
bin/libfreebl_32fpu_3.chk
bin/libfreebl_32fpu_3.so
bin/libfreebl_32int_3.chk
bin/libfreebl_32int_3.so
@@ -671,19 +681,19 @@ bin/libfreebl_32int64_3.so
@BINPATH@/components/nsSMTPProtocolHandler.js
@BINPATH@/components/nsSMTPProtocolHandler.manifest
@BINPATH@/components/offlineStartup.js
@BINPATH@/components/offlineStartup.manifest
@BINPATH@/components/smime-service.js
@BINPATH@/components/smime-service.manifest
; MailNews chrome
-@BINPATH@/chrome/messenger.jar
+@BINPATH@/chrome/messenger@JAREXT@
@BINPATH@/chrome/messenger.manifest
-@BINPATH@/chrome/newsblog.jar
+@BINPATH@/chrome/newsblog@JAREXT@
@BINPATH@/chrome/newsblog.manifest
#ifdef MOZ_GTK2
@BINPATH@/chrome/icons/default/abcardWindow.png
@BINPATH@/chrome/icons/default/abcardWindow16.png
@BINPATH@/chrome/icons/default/abcardWindow48.png
@BINPATH@/chrome/icons/default/ablistWindow.png
@BINPATH@/chrome/icons/default/ablistWindow16.png
@BINPATH@/chrome/icons/default/ablistWindow48.png
@@ -717,74 +727,98 @@ bin/libfreebl_32int64_3.so
#ifdef MOZ_MOVEMAIL
@BINPATH@/isp/movemail.rdf
#endif
@BINPATH@/isp/rss.rdf
@BINPATH@/isp/SpamAssassin.sfd
@BINPATH@/isp/SpamPal.sfd
; Gloda
-@BINPATH@/chrome/gloda.jar
+@BINPATH@/chrome/gloda@JAREXT@
@BINPATH@/chrome/gloda.manifest
@BINPATH@/components/glautocomp.js
@BINPATH@/components/jsmimeemitter.js
@BINPATH@/components/gloda.manifest
[chatzilla]
-@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla.jar
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
+#else
+@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
#ifdef MOZ_GTK2
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
#elifdef WIN_OR_OS2
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
#endif
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
@BINPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
+#endif
#ifdef LOCALE_BUILD
-@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla.jar
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
+#else
+@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
@BINPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
#endif
+#endif
[venkman]
-@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/venkman.jar
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}.xpi
+#else
+@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/venkman@JAREXT@
@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome.manifest
@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/components.list
@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/venkman-service.js
@BINPATH@/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/install.rdf
+#endif
#ifdef LOCALE_BUILD
-@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/chrome/venkman.jar
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org.xpi
+#else
+@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/chrome/venkman@JAREXT@
@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/chrome.manifest
@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/install.js
@BINPATH@/extensions/langpack-@AB_CD@@venkman.mozilla.org/install.rdf
#endif
+#endif
[inspector]
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/inspector@mozilla.org.xpi
+#else
@BINPATH@/extensions/inspector@mozilla.org/install.rdf
@BINPATH@/extensions/inspector@mozilla.org/chrome.manifest
-@BINPATH@/extensions/inspector@mozilla.org/chrome/inspector.jar
+@BINPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
#ifdef MOZ_GTK2
@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
@BINPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
#elifdef XP_WIN32
@BINPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
#elifdef XP_OS2
@BINPATH@/extensions/inspector@mozilla.org/platform/OS2/chrome/icons/default/winInspectorMain.ico
#endif
@BINPATH@/extensions/inspector@mozilla.org/components/components.list
@BINPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
@BINPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+#endif
[debugqa]
+#ifdef MOZ_OMNIJAR
+@BINPATH@/extensions/debugQA@mozilla.org.xpi
+#else
@BINPATH@/extensions/debugQA@mozilla.org/install.rdf
@BINPATH@/extensions/debugQA@mozilla.org/chrome.manifest
-@BINPATH@/extensions/debugQA@mozilla.org/chrome/debugqa.jar
+@BINPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
+#endif
; [FastStart]
#ifdef WINCE
#ifdef MOZ_FASTSTART
@BINPATH@/@MOZ_APP_NAME@faststart.exe
@BINPATH@/components/FastStartup.js
#endif
#endif
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -394,16 +394,320 @@ updater.app/Contents/MacOS/updater.ini
#ifdef XP_OS2
@DLL_PREFIX@xpcomcor@DLL_SUFFIX@
#else
@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
#endif
xpicleanup@BIN_SUFFIX@
@DLL_PREFIX@xpistub@DLL_SUFFIX@
+#ifdef MOZ_OMNIJAR
+ chrome/@AB_CD@.jar
+ chrome/comm.jar
+ chrome/toolkit.jar
+ chrome/classic.jar
+ chrome/pippki.jar
+ chrome/messenger.jar
+ chrome/newsblog.jar
+ chrome/gloda.jar
+ chrome/nonlocalized.manifest
+ chrome/localized.manifest
+ components/addonManager.js
+ components/amContentHandler.js
+ components/amWebInstallListener.js
+ components/ConsoleAPI.js
+ components/contentAreaDropListener.js
+ components/contentSecurityPolicy.js
+ components/crypto-SDR.js
+ components/FeedConverter.js
+ components/FeedProcessor.js
+ components/FeedWriter.js
+ components/GPSDGeolocationProvider.js
+ components/jsconsole-clhandler.js
+ components/NetworkGeolocationProvider.js
+ components/nsAbout.js
+ components/nsAboutCertError.js
+ components/nsAboutData.js
+ components/nsAboutFeeds.js
+ components/nsAboutLife.js
+ components/nsAboutRights.js
+ components/nsAboutSessionRestore.js
+ components/nsBadCertHandler.js
+ components/nsBlocklistService.js
+ components/nsBrowserContentHandler.js
+ components/nsComposerCmdLineHandler.js
+ components/nsContentDispatchChooser.js
+ components/nsContentPrefService.js
+ components/nsDefaultCLH.js
+ #ifdef UNIX_BUT_NOT_MAC
+ components/nsFilePicker.js
+ #endif
+ components/nsFormAutoComplete.js
+ components/nsFormHistory.js
+ components/nsHandlerService.js
+ components/nsHelperAppDlg.js
+ components/nsINIProcessor.js
+ components/nsInputListAutoComplete.js
+ components/nsLivemarkService.js
+ components/nsLoginInfo.js
+ components/nsLoginManager.js
+ components/nsLoginManagerPrompter.js
+ components/nsMicrosummaryService.js
+ components/nsPlacesAutoComplete.js
+ components/nsPlacesDBFlush.js
+ components/nsPlacesExpiration.js
+ components/nsPrompter.js
+ components/nsProxyAutoConfig.js
+ components/nsSearchService.js
+ components/nsSearchSuggestions.js
+ components/nsSessionStartup.js
+ components/nsSessionStore.js
+ #ifdef XP_WIN
+ components/nsSetDefault.js
+ #endif
+ components/nsSidebar.js
+ components/nsSuiteDownloadManagerUI.js
+ components/nsSuiteGlue.js
+ components/nsTaggingService.js
+ components/nsTryToClose.js
+ components/nsTypeAheadFind.js
+ components/nsUpdateService.js
+ components/nsUpdateServiceStub.js
+ components/nsUpdateTimerManager.js
+ components/nsURLFormatter.js
+ components/nsWebHandlerApp.js
+ components/PlacesCategoriesStarter.js
+ components/smileApplication.js
+ components/storage-Legacy.js
+ components/storage-mozStorage.js
+ components/txEXSLTRegExFunctions.js
+ components/WebContentConverter.js
+ components/nsLDAPProtocolHandler.js
+ components/mdn-service.js
+ components/msgAsyncPrompter.js
+ components/newsblog.js
+ components/nsAbAutoCompleteMyDomain.js
+ components/nsAbAutoCompleteSearch.js
+ components/nsAbLDAPAttributeMap.js
+ components/nsMailNewsCommandLineHandler.js
+ components/nsMsgTraitService.js
+ components/nsSMTPProtocolHandler.js
+ components/offlineStartup.js
+ components/smime-service.js
+ components/glautocomp.js
+ components/jsmimeemitter.js
+ components/browser.xpt
+ components/interfaces.manifest
+ components/mail.xpt
+ components/components.manifest
+ defaults/profile
+ defaults/profile/bookmarks.html
+ defaults/profile/localstore.rdf
+ defaults/profile/mimeTypes.rdf
+ defaults/profile/panels.rdf
+ defaults/profile/chrome
+ defaults/profile/chrome/userChrome-example.css
+ defaults/profile/chrome/userContent-example.css
+ defaults/pref/suite-l10n.js
+ defaults/pref/browser-prefs.js
+ defaults/pref/composer.js
+ defaults/pref/mailnews.js
+ defaults/pref/mdn.js
+ defaults/pref/smime.js
+ defaults/autoconfig
+ defaults/autoconfig/platform.js
+ defaults/autoconfig/prefcalls.js
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla.jar
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
+ extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
+ extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+ extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+ extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+ extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+ extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}
+ extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome
+ extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/venkman.jar
+ extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome.manifest
+ extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components
+ extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/venkman-service.js
+ extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/install.rdf
+ extensions/debugQA@mozilla.org
+ extensions/debugQA@mozilla.org/install.rdf
+ extensions/debugQA@mozilla.org/chrome.manifest
+ extensions/debugQA@mozilla.org/chrome
+ extensions/debugQA@mozilla.org/chrome/debugqa.jar
+ extensions/inspector@mozilla.org
+ extensions/inspector@mozilla.org/install.rdf
+ extensions/inspector@mozilla.org/chrome.manifest
+ extensions/inspector@mozilla.org/chrome
+ extensions/inspector@mozilla.org/chrome/inspector.jar
+ extensions/inspector@mozilla.org/platform
+ extensions/inspector@mozilla.org/platform/Linux
+ extensions/inspector@mozilla.org/platform/Linux/chrome
+ extensions/inspector@mozilla.org/platform/Linux/chrome/icons
+ extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default
+ extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
+ extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
+ extensions/inspector@mozilla.org/platform/OS2/chrome/icons/default/winInspectorMain.ico
+ extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
+ extensions/inspector@mozilla.org/components
+ extensions/inspector@mozilla.org/components/inspector-cmdline.js
+ extensions/inspector@mozilla.org/defaults
+ extensions/inspector@mozilla.org/defaults/preferences
+ extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+ extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/venkman.jar
+ extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
+ extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
+ extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
+ extensions/langpack-@AB_CD@@venkman.mozilla.org/chrome/venkman.jar
+ extensions/langpack-@AB_CD@@venkman.mozilla.org/chrome.manifest
+ extensions/langpack-@AB_CD@@venkman.mozilla.org/install.js
+ extensions/langpack-@AB_CD@@venkman.mozilla.org/install.rdf
+ extensions/modern@themes.mozilla.org
+ extensions/modern@themes.mozilla.org/chrome
+ extensions/modern@themes.mozilla.org/chrome/modern.jar
+ extensions/modern@themes.mozilla.org/chrome.manifest
+ extensions/modern@themes.mozilla.org/icon.png
+ extensions/modern@themes.mozilla.org/install.rdf
+ extensions/modern@themes.mozilla.org/preview.png
+ modules/AddonLogging.jsm
+ modules/AddonManager.jsm
+ modules/AddonRepository.jsm
+ modules/AddonUpdateChecker.jsm
+ modules/CertUtils.jsm
+ modules/CommonDialog.jsm
+ modules/CSPUtils.jsm
+ modules/ctypes.jsm
+ modules/debug.js
+ modules/DownloadLastDir.jsm
+ modules/DownloadPaths.jsm
+ modules/DownloadUtils.jsm
+ modules/errUtils.js
+ modules/FileUtils.jsm
+ modules/folderUtils.jsm
+ modules/Geometry.jsm
+ modules/gloda
+ modules/gloda/mimeTypeCategories.js
+ modules/gloda/log4moz.js
+ modules/gloda/gloda.js
+ modules/gloda/datamodel.js
+ modules/gloda/databind.js
+ modules/gloda/index_ab.js
+ modules/gloda/msg_search.js
+ modules/gloda/public.js
+ modules/gloda/noun_freetag.js
+ modules/gloda/utils.js
+ modules/gloda/suffixtree.js
+ modules/gloda/indexer.js
+ modules/gloda/fundattr.js
+ modules/gloda/dbview.js
+ modules/gloda/datastore.js
+ modules/gloda/everybody.js
+ modules/gloda/collection.js
+ modules/gloda/query.js
+ modules/gloda/noun_tag.js
+ modules/gloda/connotent.js
+ modules/gloda/noun_mimetype.js
+ modules/gloda/index_msg.js
+ modules/gloda/mimemsg.js
+ modules/gloda/explattr.js
+ modules/gloda/facet.js
+ modules/InlineSpellChecker.jsm
+ modules/IOUtils.js
+ modules/ISO8601DateUtils.jsm
+ modules/iteratorUtils.jsm
+ modules/jsTreeSelection.js
+ modules/LightweightThemeConsumer.jsm
+ modules/LightweightThemeManager.jsm
+ modules/mailnewsMigrator.js
+ modules/MailUtils.js
+ modules/Microformats.js
+ modules/NetUtil.jsm
+ modules/nsFormAutoCompleteResult.jsm
+ modules/PerfMeasurement.jsm
+ modules/PlacesDBUtils.jsm
+ modules/PlacesUIUtils.jsm
+ modules/PlacesUtils.jsm
+ modules/PluginProvider.jsm
+ modules/PluralForm.jsm
+ modules/PopupNotifications.jsm
+ modules/Sanitizer.jsm
+ modules/Services.jsm
+ modules/SpatialNavigation.js
+ modules/StringBundle.js
+ modules/templateUtils.js
+ modules/traceHelper.js
+ modules/utils.js
+ modules/virtualFolderWrapper.js
+ modules/WindowDraggingUtils.jsm
+ modules/XPCOMUtils.jsm
+ modules/XPIProvider.jsm
+ greprefs.js
+ res
+ res/contenteditable.css
+ res/designmode.css
+ res/EditorOverride.css
+ res/grabber.gif
+ res/langGroups.properties
+ res/language.properties
+ res/svg.css
+ res/table-add-column-after-active.gif
+ res/table-add-column-after-hover.gif
+ res/table-add-column-after.gif
+ res/table-add-column-before-active.gif
+ res/table-add-column-before-hover.gif
+ res/table-add-column-before.gif
+ res/table-add-row-after-active.gif
+ res/table-add-row-after-hover.gif
+ res/table-add-row-after.gif
+ res/table-add-row-before-active.gif
+ res/table-add-row-before-hover.gif
+ res/table-add-row-before.gif
+ res/table-remove-column-active.gif
+ res/table-remove-column-hover.gif
+ res/table-remove-column.gif
+ res/table-remove-row-active.gif
+ res/table-remove-row-hover.gif
+ res/table-remove-row.gif
+ res/fonts
+ res/fonts/mathfont.properties
+ res/fonts/mathfontStandardSymbolsL.properties
+ res/fonts/mathfontSTIXNonUnicode.properties
+ res/fonts/mathfontSTIXSize1.properties
+ res/fonts/mathfontSTIXSizeOneSym.properties
+ #ifdef XP_WIN
+ res/fonts/mathfontSymbol.properties
+ #endif
+ res/fonts/mathfontUnicode.properties
+ res/dtd
+ res/dtd/mathml.dtd
+ res/dtd/xhtml11.dtd
+ res/html
+ res/html/folder.png
+ res/entityTables
+ res/entityTables/html40Latin1.properties
+ res/entityTables/html40Special.properties
+ res/entityTables/html40Symbols.properties
+ res/entityTables/htmlEntityVersions.properties
+ res/entityTables/mathml20.properties
+ res/entityTables/transliterate.properties
+#else
+ components/binary.manifest
+ omni.jar
+#endif
+
; pre-libxul static mail library
components/@DLL_PREFIX@mail@DLL_SUFFIX@
; shared mail libraries
components/@DLL_PREFIX@addrbook@DLL_SUFFIX@
components/@DLL_PREFIX@bayesflt@DLL_SUFFIX@
components/@DLL_PREFIX@fts3tok@DLL_SUFFIX@
components/@DLL_PREFIX@mailview@DLL_SUFFIX@
components/@DLL_PREFIX@mime@DLL_SUFFIX@
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -82,16 +82,18 @@ DEFINES += \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-DLOCALE_SRCDIR=$(call core_abspath,$(LOCALE_SRCDIR)) \
-DPKG_BASENAME="$(PKG_BASENAME)" \
-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
$(NULL)
PREF_JS_EXPORTS = $(LOCALE_SRCDIR)/suite-l10n.js
+NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
+
include $(topsrcdir)/config/rules.mk
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
README_FILES = \
installer/mac/README.txt \
$(NULL)
else
ifeq ($(OS_ARCH),WINNT)
@@ -290,16 +292,19 @@ endif
tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
mv $(STAGEDIST)/chrome/$(AB_CD).manifest $(STAGEDIST)/chrome/localized.manifest
if test -d ../../mozilla/extensions/irc; then \
$(MAKE) -C ../../mozilla/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
fi
if test -d ../../mozilla/extensions/venkman; then \
$(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
fi
+ifdef MOZ_OMNIJAR
+ $(MAKE) -C ../app pack-ext AB_CD=$(AB_CD) STAGEDIST=$(STAGEDIST);
+endif
ifneq (en,$(AB))
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj
endif
endif
$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
cd $(DIST)/l10n-stage; \
$(MAKE_PACKAGE)