Use a package manifest on all OSes.

This commit is contained in:
Florian Quèze 2010-09-10 17:46:02 +02:00
Родитель fa2d9844f1
Коммит 2869e4038c
5 изменённых файлов: 572 добавлений и 475 удалений

Просмотреть файл

@ -43,67 +43,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
NO_PKG_FILES = \
$(MOZ_APP_NAME)-config \
$(MOZ_APP_NAME)-bin.elf \
nspr-config \
regchrome* \
dependentlibs.list \
IA2Marshal.dll \
js \
js.exe \
js3250.lib \
TestGtkEmbed \
bloaturls.txt \
codesighs* \
elf-dynstr-gc \
mangle* \
maptsv* \
mfc* \
mkdepend* \
msdump* \
msmap* \
nm2tsv* \
nsinstall* \
regxpcom* \
xpcshell* \
xpidl* \
xpt_dump* \
xpt_link* \
dirver* \
plugins \
res/arrow.gif \
res/arrowd.gif \
res/bloatcycle.html \
res/html \
res/loading-image.gif \
res/rdf \
res/viewer.properties \
res/viewsource.css \
chrome/chromelist.txt \
chrome/embed-sample.jar \
PalmSyncInstall.exe \
components/libgkplugin.so \
components/gkplugin.dll \
components/libpurplexpcom.dylib.dSYM \
$(NULL)
include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
ifdef MOZ_ENABLE_LIBXUL
ifeq (WINNT,$(OS_ARCH))
MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
endif
else
define message
You need to build with --enable-libxul (the default, unless you specify
--disable-libxul or --enable-shared or --enable-debug) to package a build.
endef
default libs installer::
$(error $(message))
endif
MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
MOZ_NONLOCALIZED_PKG_LIST = \
xpcom \
@ -133,8 +77,22 @@ ifdef MOZ_MEMORY
DEFINES += -DMOZ_MEMORY=1
endif
ifdef _MSC_VER
DEFINES += -D_MSC_VER=$(_MSC_VER)
endif
ifeq ($(MOZ_CHROME_FILE_FORMAT),jar)
DEFINES += -DJAREXT=.jar
else
DEFINES += -DJAREXT=
endif
# Don't ifdef MOZ_IPC this because mac ppc needs it too.
include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = packages-static
MOZ_PKG_MANIFEST = package-manifest
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
@ -149,31 +107,38 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
endif
# On mozilla-central, packager.mk uses core_abspath to redefine DIST
# As the comm-central config.mk doesn't set it, do it ourselves instead
core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (Darwin, $(OS_ARCH))
DEFINES += \
-DBINPATH=$(_BINPATH) \
-DAPPNAME=$(_APPNAME) \
$(NULL)
ifdef MOZ_PKG_PRETTYNAMES
libs::
$(MAKE) -C $(DEPTH)/instantbird/locales langpack-$(AB_CD)
UPLOAD_EXTRA_FILES += $(LANGPACK)
else
# Every other platform just winds up in dist/bin
DEFINES += -DBINPATH=bin
libs::
$(MAKE) -C $(DEPTH)/instantbird/locales langpack-$(AB_CD) PKG_LANGPACK_PATH=
UPLOAD_EXTRA_FILES += $(PKG_LANGPACK_BASENAME).xpi
endif
ifeq ($(OS_TARGET),WINCE)
VSINSTALLDIR ?= $(error VSINSTALLDIR not set, must be set to the Visual Studio install directory)
UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
ifeq (Darwin, $(OS_ARCH))
BINPATH = $(_BINPATH)
DEFINES += -DAPPNAME=$(_APPNAME)
else
BINPATH = bin
endif
DEFINES += -DBINPATH=$(BINPATH)
installer: stage-package
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
cd $(DIST) && $(PYTHON) $(MOZILLA_SRCDIR)/build/package/wince/make_wince_cab.py -s "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_DISPLAYNAME)" "$(PKG_PATH)$(PKG_BASENAME).cab" && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR)
@echo Installer $(PKG_PATH)$(PKG_BASENAME).cab created!
ifeq (WINNT,$(OS_ARCH))
PKGCOMP_FIND_OPTS =
else
PKGCOMP_FIND_OPTS = -L
endif
ifeq (Darwin, $(OS_ARCH))
FINDPATH = $(_APPNAME)/Contents/MacOS
else
FINDPATH=bin
endif
package-compare:: $(MOZ_PKG_MANIFEST)
@ -184,7 +149,7 @@ ifdef MOZ_PKG_MANIFEST_P
rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
endif
installer:: removed-files
ifeq ($(OS_ARCH),WINNT)
$(MAKE) -C windows
installer: removed-files
ifdef INSTALLER_DIR
$(MAKE) -C $(INSTALLER_DIR)
endif

Просмотреть файл

@ -0,0 +1,527 @@
; Package file for the Instantbird build.
;
; File format:
;
; [] designates a toplevel component. Example: [xpcom]
; - in front of a file specifies it to be removed from the destination
; * wildcard support to recursively copy the entire directory
; ; file comment
;
#filter substitution
#ifdef XP_UNIX
#ifndef XP_MACOSX
#define UNIX_BUT_NOT_MAC
#endif
#endif
#ifdef XP_MACOSX
; Mac bundle stuff
@APPNAME@/Contents/Info.plist
@APPNAME@/Contents/PkgInfo
; @APPNAME@/Contents/Plug-Ins/
@APPNAME@/Contents/Resources/
#endif
[@AB_CD@]
@BINPATH@/chrome/@AB_CD@@JAREXT@
@BINPATH@/chrome/@AB_CD@.manifest
@BINPATH@/@PREF_DIR@/all-l10n.js
@BINPATH@/searchplugins/*
@BINPATH@/defaults/profile/localstore.rdf
@BINPATH@/defaults/profile/mimeTypes.rdf
@BINPATH@/defaults/profile/chrome/*
@BINPATH@/update.locale
@BINPATH@/updater.ini
@BINPATH@/dictionaries/*
#ifdef XP_WIN32
#ifndef WINCE
@BINPATH@/uninstall/helper.exe
#endif
#endif
[xpcom]
@BINPATH@/dependentlibs.list
#ifndef MOZ_STATIC_JS
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
#endif
@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
#ifdef XP_MACOSX
@BINPATH@/XUL
#else
@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
#endif
#ifdef MOZ_IPC
#ifdef XP_MACOSX
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
#else
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
#endif
#endif
#ifdef WINCE
@BINPATH@/mozce_shunt.dll
#elifdef XP_WIN32
#ifndef MOZ_MEMORY
#if _MSC_VER == 1400
@BINPATH@/Microsoft.VC80.CRT.manifest
@BINPATH@/msvcm80.dll
@BINPATH@/msvcp80.dll
@BINPATH@/msvcr80.dll
#elif _MSC_VER == 1500
@BINPATH@/Microsoft.VC90.CRT.manifest
@BINPATH@/msvcm90.dll
@BINPATH@/msvcp90.dll
@BINPATH@/msvcr90.dll
#elif _MSC_VER == 1600
@BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll
#endif
#else
@BINPATH@/mozcrt19.dll
@BINPATH@/mozcpp19.dll
#endif
#endif
[instantbird]
; [Base Browser Files]
#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@/platform.ini
#ifndef XP_OS2
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
#else
@BINPATH@/mozsqlt3@DLL_SUFFIX@
#endif
#ifdef XP_UNIX
@BINPATH@/run-mozilla.sh
#ifndef XP_MACOSX
@BINPATH@/mozilla-xremote-client
#endif
#endif
#ifdef MOZ_SPLASHSCREEN
@BINPATH@/splash.bmp
#endif
; [Components]
@BINPATH@/components/components.manifest
@BINPATH@/components/alerts.xpt
#ifdef ACCESSIBILITY
#ifdef XP_WIN32
@BINPATH@/AccessibleMarshal.dll
@BINPATH@/components/accessibility-msaa.xpt
#endif
@BINPATH@/components/accessibility.xpt
#endif
@BINPATH@/components/appshell.xpt
@BINPATH@/components/appstartup.xpt
@BINPATH@/components/autocomplete.xpt
@BINPATH@/components/autoconfig.xpt
@BINPATH@/components/caps.xpt
@BINPATH@/components/chardet.xpt
@BINPATH@/components/chrome.xpt
@BINPATH@/components/commandhandler.xpt
@BINPATH@/components/commandlines.xpt
@BINPATH@/components/composer.xpt
@BINPATH@/components/content_base.xpt
@BINPATH@/components/content_events.xpt
@BINPATH@/components/content_canvas.xpt
@BINPATH@/components/content_htmldoc.xpt
@BINPATH@/components/content_html.xpt
@BINPATH@/components/content_xmldoc.xpt
@BINPATH@/components/content_xslt.xpt
@BINPATH@/components/content_xtf.xpt
@BINPATH@/components/cookie.xpt
@BINPATH@/components/directory.xpt
@BINPATH@/components/docshell.xpt
@BINPATH@/components/dom.xpt
@BINPATH@/components/dom_base.xpt
@BINPATH@/components/dom_canvas.xpt
@BINPATH@/components/dom_core.xpt
@BINPATH@/components/dom_css.xpt
@BINPATH@/components/dom_events.xpt
@BINPATH@/components/dom_geolocation.xpt
@BINPATH@/components/dom_html.xpt
@BINPATH@/components/dom_indexeddb.xpt
@BINPATH@/components/dom_offline.xpt
@BINPATH@/components/dom_json.xpt
@BINPATH@/components/dom_range.xpt
@BINPATH@/components/dom_sidebar.xpt
@BINPATH@/components/dom_storage.xpt
@BINPATH@/components/dom_stylesheets.xpt
@BINPATH@/components/dom_threads.xpt
@BINPATH@/components/dom_traversal.xpt
@BINPATH@/components/dom_views.xpt
@BINPATH@/components/dom_xbl.xpt
@BINPATH@/components/dom_xpath.xpt
@BINPATH@/components/dom_xul.xpt
@BINPATH@/components/dom_loadsave.xpt
@BINPATH@/components/downloads.xpt
@BINPATH@/components/editor.xpt
@BINPATH@/components/embed_base.xpt
@BINPATH@/components/extensions.xpt
@BINPATH@/components/exthandler.xpt
@BINPATH@/components/exthelper.xpt
@BINPATH@/components/fastfind.xpt
@BINPATH@/components/feeds.xpt
#ifdef MOZ_GTK2
@BINPATH@/components/filepicker.xpt
#endif
@BINPATH@/components/find.xpt
@BINPATH@/components/gfx.xpt
@BINPATH@/components/htmlparser.xpt
@BINPATH@/components/imglib2.xpt
@BINPATH@/components/imgicon.xpt
@BINPATH@/components/inspector.xpt
@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
#endif
@BINPATH@/components/layout_xul_tree.xpt
@BINPATH@/components/layout_xul.xpt
@BINPATH@/components/locale.xpt
@BINPATH@/components/lwbrk.xpt
@BINPATH@/components/mimetype.xpt
@BINPATH@/components/mozfind.xpt
@BINPATH@/components/necko_about.xpt
@BINPATH@/components/necko_cache.xpt
@BINPATH@/components/necko_cookie.xpt
@BINPATH@/components/necko_dns.xpt
@BINPATH@/components/necko_file.xpt
@BINPATH@/components/necko_ftp.xpt
@BINPATH@/components/necko_http.xpt
@BINPATH@/components/necko_res.xpt
@BINPATH@/components/necko_socket.xpt
@BINPATH@/components/necko_strconv.xpt
@BINPATH@/components/necko_viewsource.xpt
@BINPATH@/components/necko_wifi.xpt
@BINPATH@/components/necko.xpt
@BINPATH@/components/loginmgr.xpt
@BINPATH@/components/parentalcontrols.xpt
@BINPATH@/components/places.xpt
@BINPATH@/components/plugin.xpt
@BINPATH@/components/pref.xpt
@BINPATH@/components/prefetch.xpt
@BINPATH@/components/profile.xpt
@BINPATH@/components/proxyObject.xpt
@BINPATH@/components/rdf.xpt
@BINPATH@/components/satchel.xpt
@BINPATH@/components/saxparser.xpt
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/components/services-crypto.xpt
#endif
@BINPATH@/components/shistory.xpt
@BINPATH@/components/spellchecker.xpt
@BINPATH@/components/storage.xpt
@BINPATH@/components/toolkitprofile.xpt
#ifdef MOZ_ENABLE_XREMOTE
@BINPATH@/components/toolkitremote.xpt
#endif
@BINPATH@/components/txtsvc.xpt
@BINPATH@/components/txmgr.xpt
#ifdef MOZ_USE_NATIVE_UCONV
@BINPATH@/components/ucnative.xpt
#endif
@BINPATH@/components/uconv.xpt
@BINPATH@/components/unicharutil.xpt
@BINPATH@/components/update.xpt
@BINPATH@/components/uriloader.xpt
@BINPATH@/components/urlformatter.xpt
@BINPATH@/components/webBrowser_core.xpt
@BINPATH@/components/webbrowserpersist.xpt
@BINPATH@/components/webshell_idls.xpt
@BINPATH@/components/widget.xpt
#ifdef XP_MACOSX
@BINPATH@/components/widget_cocoa.xpt
#endif
@BINPATH@/components/windowds.xpt
@BINPATH@/components/windowwatcher.xpt
@BINPATH@/components/xpcom_base.xpt
@BINPATH@/components/xpcom_system.xpt
@BINPATH@/components/xpcom_components.xpt
@BINPATH@/components/xpcom_ds.xpt
@BINPATH@/components/xpcom_io.xpt
@BINPATH@/components/xpcom_threads.xpt
@BINPATH@/components/xpcom_xpti.xpt
@BINPATH@/components/xpconnect.xpt
@BINPATH@/components/xulapp.xpt
@BINPATH@/components/xuldoc.xpt
@BINPATH@/components/xultmpl.xpt
@BINPATH@/components/zipwriter.xpt
; JavaScript components
@BINPATH@/components/FeedProcessor.manifest
@BINPATH@/components/FeedProcessor.js
@BINPATH@/components/toolkitsearch.manifest
@BINPATH@/components/nsSearchService.js
@BINPATH@/components/nsSearchSuggestions.js
@BINPATH@/components/nsTryToClose.manifest
@BINPATH@/components/nsTryToClose.js
@BINPATH@/components/passwordmgr.manifest
@BINPATH@/components/nsLoginInfo.js
@BINPATH@/components/nsLoginManager.js
@BINPATH@/components/nsLoginManagerPrompter.js
@BINPATH@/components/storage-Legacy.js
@BINPATH@/components/storage-mozStorage.js
@BINPATH@/components/crypto-SDR.js
@BINPATH@/components/jsconsole-clhandler.manifest
@BINPATH@/components/jsconsole-clhandler.js
#ifdef MOZ_GTK2
@BINPATH@/components/nsFilePicker.manifest
@BINPATH@/components/nsFilePicker.js
#endif
@BINPATH@/components/nsHelperAppDlg.manifest
@BINPATH@/components/nsHelperAppDlg.js
@BINPATH@/components/nsDownloadManagerUI.manifest
@BINPATH@/components/nsDownloadManagerUI.js
@BINPATH@/components/nsProxyAutoConfig.manifest
@BINPATH@/components/nsProxyAutoConfig.js
@BINPATH@/components/NetworkGeolocationProvider.manifest
@BINPATH@/components/NetworkGeolocationProvider.js
@BINPATH@/components/GPSDGeolocationProvider.manifest
@BINPATH@/components/GPSDGeolocationProvider.js
@BINPATH@/components/extensions.manifest
@BINPATH@/components/addonManager.js
@BINPATH@/components/amContentHandler.js
@BINPATH@/components/amWebInstallListener.js
@BINPATH@/components/nsBlocklistService.js
#ifdef MOZ_UPDATER
@BINPATH@/components/nsUpdateService.manifest
@BINPATH@/components/nsUpdateService.js
@BINPATH@/components/nsUpdateServiceStub.js
#endif
@BINPATH@/components/nsUpdateTimerManager.manifest
@BINPATH@/components/nsUpdateTimerManager.js
@BINPATH@/components/pluginGlue.manifest
@BINPATH@/components/nsURLFormatter.manifest
@BINPATH@/components/nsURLFormatter.js
@BINPATH@/components/txEXSLTRegExFunctions.manifest
@BINPATH@/components/txEXSLTRegExFunctions.js
@BINPATH@/components/toolkitplaces.manifest
@BINPATH@/components/nsLivemarkService.js
@BINPATH@/components/nsTaggingService.js
@BINPATH@/components/nsPlacesDBFlush.js
@BINPATH@/components/nsPlacesAutoComplete.manifest
@BINPATH@/components/nsPlacesAutoComplete.js
@BINPATH@/components/nsPlacesExpiration.js
@BINPATH@/components/nsDefaultCLH.manifest
@BINPATH@/components/nsDefaultCLH.js
@BINPATH@/components/nsContentPrefService.manifest
@BINPATH@/components/nsContentPrefService.js
@BINPATH@/components/nsContentDispatchChooser.manifest
@BINPATH@/components/nsContentDispatchChooser.js
@BINPATH@/components/nsHandlerService.manifest
@BINPATH@/components/nsHandlerService.js
@BINPATH@/components/nsWebHandlerApp.manifest
@BINPATH@/components/nsWebHandlerApp.js
@BINPATH@/components/nsBadCertHandler.manifest
@BINPATH@/components/nsBadCertHandler.js
@BINPATH@/components/satchel.manifest
@BINPATH@/components/nsFormAutoComplete.js
@BINPATH@/components/nsFormHistory.js
@BINPATH@/components/contentSecurityPolicy.manifest
@BINPATH@/components/contentSecurityPolicy.js
@BINPATH@/components/contentAreaDropListener.manifest
@BINPATH@/components/contentAreaDropListener.js
#ifdef XP_MACOSX
@BINPATH@/components/libalerts_s.dylib
#endif
#ifdef MOZ_ENABLE_DBUS
@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
#endif
@BINPATH@/components/nsINIProcessor.manifest
@BINPATH@/components/nsINIProcessor.js
@BINPATH@/components/nsPrompter.manifest
@BINPATH@/components/nsPrompter.js
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/components/SyncComponents.manifest
@BINPATH@/components/Weave.js
@BINPATH@/components/WeaveCrypto.manifest
@BINPATH@/components/WeaveCrypto.js
#endif
; Modules
@BINPATH@/modules/*
; GNOME hooks
#ifdef MOZ_ENABLE_GNOME_COMPONENT
@BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
#endif
; [Instantbird Chrome Files]
@BINPATH@/chrome/instantbird@JAREXT@
@BINPATH@/chrome/instantbird.manifest
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
@BINPATH@/chrome/toolkit@JAREXT@
@BINPATH@/chrome/toolkit.manifest
#ifdef XP_UNIX
#ifndef XP_MACOSX
@BINPATH@/chrome/icons/default/default16.png
@BINPATH@/chrome/icons/default/default32.png
@BINPATH@/chrome/icons/default/default48.png
#endif
#else
@BINPATH@/chrome/icons/default/blistWindow.ico
@BINPATH@/chrome/icons/default/convWindow.ico
@BINPATH@/chrome/icons/default/default.ico
#endif
; shell icons
#ifdef XP_UNIX
#ifndef XP_MACOSX
@BINPATH@/icons/*.xpm
@BINPATH@/icons/*.png
#endif
#endif
; [libpurple]
@BINPATH@/@DLL_PREFIX@purple@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@purplexpcom@DLL_SUFFIX@
@BINPATH@/components/purplexpcom.xpt
#ifndef XP_MACOSX
@BINPATH@/components/profileMigrator.js
#endif
@BINPATH@/components/autoLoginHandler.js
@BINPATH@/components/facebookOverrideProtocol.js
@BINPATH@/components/gtalkOverrideProtocol.js
@BINPATH@/components/smileProtocolHandler.js
@BINPATH@/components/logger.js
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
@BINPATH@/@PREF_DIR@/all-instantbird.js
@BINPATH@/@PREF_DIR@/purple-prefs.js
@BINPATH@/@PREF_DIR@/channel-prefs.js
#ifdef MOZ_SERVICES_SYNC
@BINPATH@/@PREF_DIR@/services-sync.js
#endif
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/defaults/profile/prefs.js
; [Layout Engine Resources]
; Style Sheets, Graphics and other Resources used by the layout engine.
@BINPATH@/res/EditorOverride.css
@BINPATH@/res/contenteditable.css
@BINPATH@/res/designmode.css
@BINPATH@/res/table-add-column-after-active.gif
@BINPATH@/res/table-add-column-after-hover.gif
@BINPATH@/res/table-add-column-after.gif
@BINPATH@/res/table-add-column-before-active.gif
@BINPATH@/res/table-add-column-before-hover.gif
@BINPATH@/res/table-add-column-before.gif
@BINPATH@/res/table-add-row-after-active.gif
@BINPATH@/res/table-add-row-after-hover.gif
@BINPATH@/res/table-add-row-after.gif
@BINPATH@/res/table-add-row-before-active.gif
@BINPATH@/res/table-add-row-before-hover.gif
@BINPATH@/res/table-add-row-before.gif
@BINPATH@/res/table-remove-column-active.gif
@BINPATH@/res/table-remove-column-hover.gif
@BINPATH@/res/table-remove-column.gif
@BINPATH@/res/table-remove-row-active.gif
@BINPATH@/res/table-remove-row-hover.gif
@BINPATH@/res/table-remove-row.gif
@BINPATH@/res/grabber.gif
#ifdef XP_MACOSX
@BINPATH@/res/cursors/*
#endif
@BINPATH@/res/fonts/*
@BINPATH@/res/dtd/*
@BINPATH@/res/html/*
@BINPATH@/res/langGroups.properties
@BINPATH@/res/language.properties
@BINPATH@/res/entityTables/*
#ifdef XP_MACOSX
@BINPATH@/res/MainMenu.nib/
#endif
; svg
@BINPATH@/res/svg.css
@BINPATH@/components/dom_svg.xpt
#ifdef MOZ_SMIL
@BINPATH@/components/dom_smil.xpt
#endif
; [Personal Security Manager]
;
@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
@BINPATH@/components/pipboot.xpt
@BINPATH@/components/pipnss.xpt
@BINPATH@/components/pippki.xpt
@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
#ifndef CROSS_COMPILE
@BINPATH@/@DLL_PREFIX@freebl3.chk
@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@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
bin/libfreebl_32int64_3.chk
bin/libfreebl_32int64_3.so
#endif
; [Updater]
#ifdef XP_MACOSX
@BINPATH@/updater.app/
#else
@BINPATH@/updater@BIN_SUFFIX@
#endif
; [Crash Reporter]
;
#ifdef MOZ_CRASHREPORTER
#ifdef XP_MACOSX
@BINPATH@/crashreporter.app/
#else
@BINPATH@/crashreporter@BIN_SUFFIX@
@BINPATH@/crashreporter.ini
#ifdef XP_UNIX
@BINPATH@/Throbber-small.gif
#endif
#endif
@BINPATH@/crashreporter-override.ini
#endif
; [Extensions]
;
#ifdef MOZ_ENABLE_GNOMEVFS
bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
#endif

Просмотреть файл

@ -58,10 +58,6 @@ ifdef MOZ_UPDATER
DEFINES += -DMOZ_UPDATER=1
endif
PP_LOCALIZED_FILES = \
packages-static \
$(NULL)
INSTALLER_FILES = \
app.tag \
nsis/installer.nsi \
@ -95,10 +91,6 @@ uninstaller::
$(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(EXIT_ON_ERROR) \
for i in $(PP_LOCALIZED_FILES); do \
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \
done
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
@ -109,10 +101,6 @@ $(CONFIG_DIR)/setup.exe::
$(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(EXIT_ON_ERROR) \
for i in $(PP_LOCALIZED_FILES); do \
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \
done
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \

Просмотреть файл

@ -1,383 +0,0 @@
#filter substitution
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Base Instantbird Package File for Win32
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[@AB_CD@]
bin\chrome\@AB_CD@.jar
bin\chrome\@AB_CD@.manifest
bin\defaults\pref\all-l10n.js
bin\dictionaries\*
bin\searchplugins\*.xml
bin\update.locale
bin\updater.ini
#ifdef XP_WIN32
#ifndef WINCE
bin\uninstall\helper.exe
#endif
#endif
bin\crashreporter.ini
[xpcom]
bin\xul.dll
bin\xpcom.dll
bin\nspr4.dll
bin\plc4.dll
bin\plds4.dll
bin\js3250.dll
#ifndef MOZ_MEMORY
bin\Microsoft.VC80.CRT.manifest
bin\msvcm80.dll
bin\msvcp80.dll
bin\msvcr80.dll
#else
bin\mozcrt19.dll
bin\mozcpp19.dll
#endif
; Modules
bin\modules\*
[instantbird]
bin\instantbird.exe
bin\application.ini
bin\platform.ini
bin\LICENSE.txt
bin\license.html
bin\sqlite3.dll
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; App Specific Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
bin\defaults\profile\localstore.rdf
bin\defaults\profile\prefs.js
bin\defaults\profile\mimeTypes.rdf
bin\components\components.list
bin\components\xpcom_base.xpt
bin\components\xpcom_system.xpt
bin\components\xpcom_components.xpt
bin\components\xpcom_ds.xpt
bin\components\xpcom_io.xpt
bin\components\xpcom_thread.xpt
bin\components\xpcom_xpti.xpt
bin\chrome\toolkit.jar
bin\chrome\toolkit.manifest
bin\chrome\comm.jar
bin\chrome\comm.manifest
bin\chrome\pippki.jar
bin\chrome\pippki.manifest
bin\chrome\instantbird.jar
bin\chrome\instantbird.manifest
bin\chrome\icons\default\blistWindow.ico
bin\chrome\icons\default\convWindow.ico
bin\chrome\icons\default\default.ico
bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
; [libpurple]
bin\purple.dll
bin\components\purplexpcom.dll
bin\components\purplexpcom.xpt
bin\components\instantbird.xpt
bin\components\profileMigrator.js
bin\components\autoLoginHandler.js
bin\components\facebookOverrideProtocol.js
bin\components\gtalkOverrideProtocol.js
bin\components\smileProtocolHandler.js
bin\components\logger.js
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Chrome Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
bin\chrome\classic.jar
bin\chrome\classic.manifest
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Default Profile Settings
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; default pref files
bin\defaults\pref\all-instantbird.js
bin\defaults\pref\purple-prefs.js
bin\defaults\pref\channel-prefs.js
bin\greprefs\*
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; App extensions
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; login manager
bin\components\loginmgr.xpt
bin\components\nsLoginInfo.js
bin\components\nsLoginManager.js
bin\components\nsLoginManagerPrompter.js
bin\components\storage-Legacy.js
bin\components\storage-mozStorage.js
; download progress
bin\components\nsHelperAppDlg.js
bin\components\nsDownloadManagerUI.js
bin\components\nsProgressDialog.js
bin\components\downloads.xpt
; Protocol/Content handling
bin\components\nsContentDispatchChooser.js
bin\components\nsHandlerService.js
bin\components\nsWebHandlerApp.js
; spellchecker (may not be present)
bin\components\spellchecker.xpt
; xpinstall (needed to dynamically install themes
bin\components\xpinstall.xpt
; misson control, autoconfig
bin\defaults\autoconfig\platform.js
bin\defaults\autoconfig\prefcalls.js
bin\components\autoconfig.xpt
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Base Package Files
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; xpconnect
bin\components\xpconnect.xpt
; XP widgets/graphics
bin\components\widget.xpt
bin\components\gfx.xpt
; layout
bin\components\layout_base.xpt
bin\components\layout_printing.xpt
bin\components\layout_xul.xpt
bin\components\content_base.xpt
bin\components\htmlparser.xpt
bin\components\content_html.xpt
bin\components\content_htmldoc.xpt
bin\components\content_xmldoc.xpt
bin\components\content_xslt.xpt
bin\components\xultmpl.xpt
bin\components\xuldoc.xpt
bin\components\xulapp.xpt
bin\components\inspector.xpt
; Imaging:
bin\components\imgicon.xpt
bin\components\imglib2.xpt
; accessibility (out of process API support)
bin\components\accessibility.xpt
bin\components\accessibility-msaa.xpt
; caps (JavaScript security)
bin\components\caps.xpt
; glue: appshell, docshell, uriloader, chrome, components
bin\components\appshell.xpt
bin\components\appstartup.xpt
bin\components\docshell_base.xpt
bin\components\uriloader.xpt
bin\components\webBrowser_core.xpt
bin\components\windowwatcher.xpt
bin\components\webbrowserpersist.xpt
bin\components\commandhandler.xpt
; we need mozbrwser.xpt for nsIXULWindow.xpt
bin\components\mozbrwsr.xpt
; jar
bin\components\jar.xpt
; prefs
bin\components\pref.xpt
; profile
bin\components\profile.xpt
bin\components\toolkitprofile.xpt
; toolkit
bin\components\appstartup.xpt
bin\components\commandlines.xpt
bin\components\chrome.xpt
bin\components\nsDefaultCLH.js
bin\components\nsFormAutoComplete.js
bin\components\toolkitsearch.xpt
bin\components\nsSearchService.js
bin\components\nsSearchSuggestions.js
; rdf
bin\components\rdf.xpt
; required i18n libraries
bin\components\intl.xpt
bin\components\locale.xpt
bin\components\uconv.xpt
bin\components\unicharutil.xpt
; dom
bin\components\dom.xpt
bin\components\dom_base.xpt
bin\components\dom_canvas.xpt
bin\components\dom_core.xpt
bin\components\dom_css.xpt
bin\components\dom_events.xpt
bin\components\dom_html.xpt
bin\components\dom_json.xpt
bin\components\dom_offline.xpt
bin\components\dom_range.xpt
bin\components\dom_storage.xpt
bin\components\dom_stylesheets.xpt
bin\components\dom_traversal.xpt
bin\components\dom_views.xpt
bin\components\dom_xbl.xpt
bin\components\dom_xul.xpt
bin\components\dom_loadsave.xpt
bin\components\NetworkGeolocationProvider.js
bin\components\GPSDGeolocationProvider.js
; editor / composer for HTML compose
bin\components\editor.xpt
bin\components\composer.xpt
bin\components\txmgr.xpt
; find functionality
; Optional - only if your code uses nsIWebBrowserFind
bin\components\txtsvc.xpt
; moz storage
bin\components\storage.xpt
; netwerk
bin\components\necko.xpt
bin\components\necko_dns.xpt
bin\components\necko_http.xpt
bin\components\necko_res.xpt
bin\components\necko_strconv.xpt
bin\components\necko_file.xpt
bin\components\necko_cache.xpt
bin\components\necko_cookie.xpt
bin\components\necko_socket.xpt
bin\components\nsProxyAutoConfig.js
; extensions
bin\components\nsAddonRepository.js
bin\components\nsExtensionManager.js
bin\components\nsBlocklistService.js
#ifdef MOZ_UPDATER
bin\components\nsUpdateService.js
bin\components\nsUpdateServiceStub.js
#endif
bin\components\nsUpdateTimerManager.js
bin\components\extensions.xpt
bin\components\update.xpt
#ifdef MOZ_WEBSERVICES
bin\components\websrvcs.xpt
#endif
bin\components\nsURLFormatter.js
bin\components\urlformatter.xpt
bin\components\nsContentPrefService.js
; plugins
bin\components\plugin.xpt
; psm2
; Optional - only if you need HTTPS support
bin\components\pipboot.xpt
bin\components\pipnss.xpt
bin\components\pippki.xpt
bin\nss3.dll
bin\nssutil3.dll
bin\smime3.dll
bin\softokn3.chk
bin\softokn3.dll
bin\freebl3.chk
bin\freebl3.dll
bin\ssl3.dll
bin\nssckbi.dll
bin\nssdbm3.chk
bin\nssdbm3.dll
; core platform files
bin\components\FeedProcessor.js
bin\components\autocomplete.xpt
bin\components\alerts.xpt
bin\components\jsdservice.xpt
bin\components\fastfind.xpt
bin\components\find.xpt
bin\components\chardet.xpt
bin\components\jsconsole-clhandler.js
bin\components\layout_xul_tree.xpt
bin\components\mozfind.xpt
bin\components\mimetype.xpt
bin\components\proxyObject.xpt
bin\components\exthandler.xpt
bin\components\embed_base.xpt
bin\components\webshell_idls.xpt
bin\components\widget.xpt
bin\components\windowds.xpt
bin\components\dom_xpath.xpt
bin\AccessibleMarshal.dll
bin\components\lwbrk.xpt
bin\components\nsTryToClose.js
bin\components\pluginGlue.js
bin\components\txEXSLTRegExFunctions.js
bin\components\feeds.xpt
bin\components\saxparser.xpt
bin\components\zipwriter.xpt
bin\components\nsBadCertHandler.js
bin\res\hiddenWindow.html
bin\res\ua.css
bin\res\html.css
bin\res\quirk.css
bin\res\forms.css
bin\res\viewsource.css
bin\res\contenteditable.css
bin\res\designmode.css
bin\res\charsetData.properties
bin\res\charsetalias.properties
bin\res\langGroups.properties
bin\res\language.properties
bin\res\wincharset.properties
bin\res\entityTables\*
bin\res\dtd\xhtml11.dtd
bin\res\fonts\*
bin\res\broken-image.png
bin\res\loading-image.png
bin\res\html\folder.png
; editor resource files
bin\res\EditorOverride.css
bin\res\grabber.gif
bin\res\table-add-column-after-active.gif
bin\res\table-add-column-after-hover.gif
bin\res\table-add-column-after.gif
bin\res\table-add-column-before-active.gif
bin\res\table-add-column-before-hover.gif
bin\res\table-add-column-before.gif
bin\res\table-add-row-after-active.gif
bin\res\table-add-row-after-hover.gif
bin\res\table-add-row-after.gif
bin\res\table-add-row-before-active.gif
bin\res\table-add-row-before-hover.gif
bin\res\table-add-row-before.gif
bin\res\table-remove-column-active.gif
bin\res\table-remove-column-hover.gif
bin\res\table-remove-column.gif
bin\res\table-remove-row-active.gif
bin\res\table-remove-row-hover.gif
bin\res\table-remove-row.gif
; svg
bin\res\svg.css
bin\components\dom_svg.xpt
; [Updater]
bin\updater.exe
; [crash reporter]
bin\crashreporter.exe

Просмотреть файл

@ -1,4 +1,4 @@
classic.jar:
instantbird.jar:
#ifndef XP_WIN
% skin instantbird classic/1.0 %skin/classic/instantbird/
#else