From 1fbd662311b246118d65adfe33563421542c9e0b Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Mon, 11 Nov 2013 22:44:09 +0100 Subject: [PATCH] Bug 955017 - Re-sync build scripts with comm-central, r=florian. --- im/installer/Makefile.in | 75 ++- im/installer/package-manifest.in | 903 +++++++++++++++++-------------- im/installer/removed-files.in | 1 - im/themes/Makefile.in | 4 + im/themes/icon.png | Bin 0 -> 2185 bytes 5 files changed, 543 insertions(+), 440 deletions(-) create mode 100644 im/themes/icon.png diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in index 6e0b9136a4..1a730eaee3 100644 --- a/im/installer/Makefile.in +++ b/im/installer/Makefile.in @@ -16,6 +16,10 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in +# Some files have been already bundled with xulrunner +ifndef SYSTEM_LIBXUL +MOZ_PKG_FATAL_WARNINGS = 1 +endif MOZ_NONLOCALIZED_PKG_LIST = \ xpcom \ @@ -25,6 +29,11 @@ MOZ_NONLOCALIZED_PKG_LIST = \ MOZ_LOCALIZED_PKG_LIST = $(AB_CD) DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR) + +ifdef MOZ_DEBUG +DEFINES += -DMOZ_DEBUG=1 +endif + ifdef MOZ_ENABLE_GNOME_COMPONENT DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1 endif @@ -33,18 +42,6 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT)) DEFINES += -DMOZ_GTK2=1 endif -ifdef NSS_DISABLE_DBM -DEFINES += -DNSS_DISABLE_DBM=1 -endif - -ifdef MOZ_UPDATER -DEFINES += -DMOZ_UPDATER=1 -endif - -ifdef MOZ_MEMORY -DEFINES += -DMOZ_MEMORY=1 -endif - ifdef _MSC_VER DEFINES += -D_MSC_VER=$(_MSC_VER) endif @@ -52,15 +49,29 @@ endif DEFINES += -DJAREXT= ifdef MOZ_ANGLE_RENDERER -DEFINES += \ - -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) \ - -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) \ - -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) \ - $(NULL) +DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) +DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) +endif + +ifdef MOZ_UPDATER +DEFINES += -DMOZ_UPDATER=1 +endif + +ifdef MOZ_NATIVE_NSPR +DEFINES += -DMOZ_NATIVE_NSPR=1 +endif + +ifdef MOZ_NATIVE_NSS +DEFINES += -DMOZ_NATIVE_NSS=1 endif DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) +# Set MSVC dlls version to package, if any. +ifdef WIN32_REDIST_DIR +DEFINES += -DMOZ_MSVC_REDIST=$(_MSC_VER) +endif + ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) DEFINES += -DMOZ_SHARED_MOZGLUE=1 endif @@ -85,20 +96,16 @@ MOZ_PKG_MAC_ICON=branding/disk.icns MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ " endif -include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk +NON_OMNIJAR_FILES = -ifdef MOZ_PKG_PRETTYNAMES -libs:: - $(MAKE) -C $(DEPTH)/instantbird/locales langpack-$(AB_CD) - -UPLOAD_EXTRA_FILES += $(LANGPACK) -else -libs:: - $(MAKE) -C $(DEPTH)/instantbird/locales langpack-$(AB_CD) PKG_LANGPACK_PATH= - -UPLOAD_EXTRA_FILES += $(PKG_LANGPACK_BASENAME).xpi +ifndef LIBXUL_SDK +INSTALL_SDK = 1 endif +GENERATE_CACHE=1 + +include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk +include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk ifeq (Darwin, $(OS_ARCH)) BINPATH = $(_BINPATH) @@ -108,6 +115,9 @@ BINPATH = bin endif DEFINES += -DBINPATH=$(BINPATH) +libs:: + $(MAKE) -C $(DEPTH)/instantbird/locales langpack + ifeq (WINNT,$(OS_ARCH)) PKGCOMP_FIND_OPTS = else @@ -128,6 +138,11 @@ ifdef MOZ_PKG_MANIFEST_P endif installer: -ifeq ($(OS_ARCH),WINNT) - $(MAKE) -C windows +ifdef INSTALLER_DIR + $(MAKE) -C $(INSTALLER_DIR) endif + +APP_SOURCE_STAMP = $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) +APP_SOURCE_REPO = $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/") +make-sourcestamp-file:: + @echo "$(APP_SOURCE_REPO)/rev/$(APP_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE) diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in index ec14f2f785..d1b62a96ad 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in @@ -12,8 +12,7 @@ ; 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 +; * wildcard ; ; file comment ; @@ -37,31 +36,52 @@ @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/* @BINPATH@/hyphenation/* #ifdef XP_WIN32 @BINPATH@/uninstall/helper.exe #endif +#ifdef MOZ_UPDATER +@BINPATH@/update.locale +@BINPATH@/updater.ini +#endif [xpcom] +@BINPATH@/dependentlibs.list +#ifndef MOZ_NATIVE_NSPR +@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ +#endif +#ifndef MOZ_STATIC_JS +@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ +#endif #ifdef XP_WIN32 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ +#ifndef MOZ_DEBUG +#if MOZ_MSVC_REDIST == 1400 +@BINPATH@/Microsoft.VC80.CRT.manifest +@BINPATH@/msvcm80.dll +@BINPATH@/msvcp80.dll +@BINPATH@/msvcr80.dll +#elif MOZ_MSVC_REDIST == 1500 +@BINPATH@/Microsoft.VC90.CRT.manifest +@BINPATH@/msvcm90.dll +@BINPATH@/msvcp90.dll +@BINPATH@/msvcr90.dll +#elif MOZ_MSVC_REDIST == 1600 +@BINPATH@/msvcp100.dll +@BINPATH@/msvcr100.dll +#elif MOZ_MSVC_REDIST == 1700 +@BINPATH@/msvcp110.dll +@BINPATH@/msvcr110.dll +#endif +#endif #endif @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ #ifdef MOZ_SHARED_MOZGLUE @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #endif -#ifndef MOZ_STATIC_JS -@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ -#endif -@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else @@ -73,24 +93,6 @@ #else @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ #endif -#ifdef XP_WIN32 -#ifndef MOZ_DEBUG -#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 -#endif -#endif ; ANGLE GLES-on-D3D rendering library #ifdef MOZ_ANGLE_RENDERER @BINPATH@/libEGL.dll @@ -98,6 +100,9 @@ @BINPATH@/@MOZ_D3DCOMPILER_DLL@ #endif +; Modules +@BINPATH@/modules/* + [instantbird] #ifndef XP_UNIX @BINPATH@/@MOZ_APP_NAME@.exe @@ -112,332 +117,32 @@ #ifdef XP_OS2 @BINPATH@/@DLL_PREFIX@mozsqlt3@DLL_SUFFIX@ #else +#ifndef MOZ_NATIVE_SQLITE @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@ #endif -#ifdef XP_UNIX -#ifndef XP_MACOSX +#endif +#ifdef UNIX_BUT_NOT_MAC @BINPATH@/run-mozilla.sh -@BINPATH@/mozilla-xremote-client -#endif -#endif -#ifdef MOZ_SPLASHSCREEN -@BINPATH@/splash.bmp -#endif -@BINPATH@/LICENSE.txt - -; [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/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_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_json.xpt -@BINPATH@/components/dom_notification.xpt -@BINPATH@/components/dom_offline.xpt -@BINPATH@/components/dom_range.xpt -@BINPATH@/components/dom_sidebar.xpt -@BINPATH@/components/dom_system.xpt -@BINPATH@/components/dom_storage.xpt -@BINPATH@/components/dom_stylesheets.xpt -@BINPATH@/components/dom_traversal.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/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_websocket.xpt -#ifdef NECKO_WIFI -@BINPATH@/components/necko_wifi.xpt -#endif -@BINPATH@/components/necko_wyciwyg.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/profiler.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/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 -@BINPATH@/components/telemetry.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/TelemetryPing.manifest -@BINPATH@/components/TelemetryPing.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/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.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 -@BINPATH@/components/ConsoleAPI.js -@BINPATH@/components/ConsoleAPI.manifest -@BINPATH@/components/servicesComponents.manifest - -; 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@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest -@BINPATH@/chrome/toolkit@JAREXT@ -@BINPATH@/chrome/toolkit.manifest -#ifdef XP_UNIX -#ifndef XP_MACOSX -@BINPATH@/chrome/icons/default/blistWindow.png -@BINPATH@/chrome/icons/default/blistWindow16.png -@BINPATH@/chrome/icons/default/blistWindow48.png -@BINPATH@/chrome/icons/default/convWindow.png -@BINPATH@/chrome/icons/default/convWindow16.png -@BINPATH@/chrome/icons/default/convWindow48.png -@BINPATH@/chrome/icons/default/default.png -@BINPATH@/chrome/icons/default/default16.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@/chrome/purple@JAREXT@ -@BINPATH@/chrome/purple.manifest -@BINPATH@/components/@DLL_PREFIX@purplexpcom@DLL_SUFFIX@ -@BINPATH@/components/purplexpcom.xpt -@BINPATH@/components/prpl.manifest -#ifdef UNIX_BUT_NOT_MAC -@BINPATH@/components/@DLL_PREFIX@bonjour@DLL_SUFFIX@ +; [OS/2] +#ifdef XP_OS2 +@BINPATH@/MozSounds.cmd +@BINPATH@/*.xqs +@BINPATH@/components/*.xqs #endif -; [chat] -@BINPATH@/chrome/chat@JAREXT@ -@BINPATH@/chrome/chat.manifest -@BINPATH@/components/chat.xpt -@BINPATH@/components/imAccounts.js -@BINPATH@/components/imAccounts.manifest -@BINPATH@/components/imCommands.js -@BINPATH@/components/imCommands.manifest -@BINPATH@/components/imContacts.js -@BINPATH@/components/imContacts.manifest -@BINPATH@/components/imConversations.js -@BINPATH@/components/imConversations.manifest -@BINPATH@/components/imCore.js -@BINPATH@/components/imCore.manifest +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Instantbird Specific Files +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +@BINPATH@/defaults/profile/localstore.rdf +@BINPATH@/defaults/profile/prefs.js +@BINPATH@/defaults/profile/mimeTypes.rdf +@BINPATH@/components/components.manifest #ifdef XP_MACOSX @BINPATH@/components/ibDockBadge.js @BINPATH@/components/ibDockBadge.manifest @@ -456,46 +161,464 @@ @BINPATH@/components/ibConvStatsService.manifest @BINPATH@/components/ibStatusCommandLineHandler.js @BINPATH@/components/ibStatusCommandLineHandler.manifest -@BINPATH@/components/irc.js -@BINPATH@/components/irc.manifest +@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@/chrome/toolkit@JAREXT@ +@BINPATH@/chrome/toolkit.manifest +@BINPATH@/chrome/instantbird@JAREXT@ +@BINPATH@/chrome/instantbird.manifest +#ifndef XP_UNIX +@BINPATH@/chrome/icons/default/blistWindow.ico +@BINPATH@/chrome/icons/default/convWindow.ico +@BINPATH@/chrome/icons/default/default.ico +#elifdef UNIX_BUT_NOT_MAC +@BINPATH@/chrome/icons/default/*.png +#endif +@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@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; chat +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +@BINPATH@/@PREF_DIR@/chat-prefs.js +@BINPATH@/chrome/chat@JAREXT@ +@BINPATH@/chrome/chat.manifest +@BINPATH@/components/chat.xpt +@BINPATH@/components/imAccounts.js +@BINPATH@/components/imAccounts.manifest +@BINPATH@/components/imCommands.js +@BINPATH@/components/imCommands.manifest +@BINPATH@/components/imContacts.js +@BINPATH@/components/imContacts.manifest +@BINPATH@/components/imConversations.js +@BINPATH@/components/imConversations.manifest +@BINPATH@/components/imCore.js +@BINPATH@/components/imCore.manifest @BINPATH@/components/facebook.js @BINPATH@/components/facebook.manifest @BINPATH@/components/gtalk.js @BINPATH@/components/gtalk.manifest -@BINPATH@/components/odnoklassniki.js -@BINPATH@/components/odnoklassniki.manifest @BINPATH@/components/twitter.js @BINPATH@/components/twitter.manifest -@BINPATH@/components/vkontakte.js -@BINPATH@/components/vkontakte.manifest +@BINPATH@/components/irc.js +@BINPATH@/components/irc.manifest @BINPATH@/components/xmpp.js @BINPATH@/components/xmpp.manifest @BINPATH@/components/yahoo.js @BINPATH@/components/yahoo.manifest +@BINPATH@/components/odnoklassniki.js +@BINPATH@/components/odnoklassniki.manifest +@BINPATH@/components/vkontakte.js +@BINPATH@/components/vkontakte.manifest @BINPATH@/components/smileProtocolHandler.js @BINPATH@/components/smileProtocolHandler.manifest @BINPATH@/components/logger.js @BINPATH@/components/logger.manifest -; [Default Preferences] -; All the pref files must be part of base to prevent migration bugs -@BINPATH@/@PREF_DIR@/all-instantbird.js -@BINPATH@/@PREF_DIR@/chat-prefs.js -@BINPATH@/@PREF_DIR@/purple-prefs.js -@BINPATH@/@PREF_DIR@/channel-prefs.js -#ifdef MOZ_SERVICES_SYNC -@BINPATH@/@PREF_DIR@/services-sync.js +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; libpurple +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +@BINPATH@/chrome/purple@JAREXT@ +@BINPATH@/chrome/purple.manifest +@BINPATH@/components/@DLL_PREFIX@purplexpcom@DLL_SUFFIX@ +@BINPATH@/components/purplexpcom.xpt +@BINPATH@/components/prpl.manifest +#ifdef UNIX_BUT_NOT_MAC +@BINPATH@/components/@DLL_PREFIX@bonjour@DLL_SUFFIX@ #endif + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Default Profile Settings +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; default pref files +@BINPATH@/defaults/pref/all-instantbird.js +@BINPATH@/defaults/pref/channel-prefs.js +@BINPATH@/defaults/pref/purple-prefs.js @BINPATH@/greprefs.js + +; login manager +@BINPATH@/components/loginmgr.xpt +@BINPATH@/components/nsLoginInfo.js +@BINPATH@/components/nsLoginManager.js +@BINPATH@/components/nsLoginManagerPrompter.js +@BINPATH@/components/passwordmgr.manifest +@BINPATH@/components/storage-Legacy.js +@BINPATH@/components/storage-mozStorage.js +@BINPATH@/components/crypto-SDR.js + +; download progress +@BINPATH@/components/nsHelperAppDlg.js +@BINPATH@/components/nsHelperAppDlg.manifest +@BINPATH@/components/nsDownloadManagerUI.js +@BINPATH@/components/nsDownloadManagerUI.manifest +@BINPATH@/components/downloads.xpt + +; Protocol/Content handling +@BINPATH@/components/nsContentDispatchChooser.js +@BINPATH@/components/nsContentDispatchChooser.manifest +@BINPATH@/components/nsHandlerService.js +@BINPATH@/components/nsHandlerService.manifest +@BINPATH@/components/nsWebHandlerApp.js +@BINPATH@/components/nsWebHandlerApp.manifest + +; spellchecker (may not be present) +@BINPATH@/components/spellchecker.xpt + +; misson control, autoconfig @BINPATH@/defaults/autoconfig/platform.js @BINPATH@/defaults/autoconfig/prefcalls.js -@BINPATH@/defaults/profile/prefs.js +@BINPATH@/components/autoconfig.xpt -; [Layout Engine Resources] -; Style Sheets, Graphics and other Resources used by the layout engine. -@BINPATH@/res/EditorOverride.css +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Base Package Files +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +; xpconnect +@BINPATH@/components/xpconnect.xpt + +; XP widgets/graphics +@BINPATH@/components/widget.xpt +#ifdef XP_MACOSX +@BINPATH@/components/widget_cocoa.xpt +#endif +@BINPATH@/components/gfx.xpt + +; layout +@BINPATH@/components/content_base.xpt +@BINPATH@/components/content_canvas.xpt +@BINPATH@/components/content_events.xpt +@BINPATH@/components/content_html.xpt +@BINPATH@/components/content_htmldoc.xpt +@BINPATH@/components/content_xslt.xpt +@BINPATH@/components/html5.xpt +@BINPATH@/components/htmlparser.xpt +@BINPATH@/components/identity.xpt +@BINPATH@/components/layout_base.xpt +#ifdef NS_PRINTING +@BINPATH@/components/layout_printing.xpt +#endif +@BINPATH@/components/layout_xul.xpt +@BINPATH@/components/xulapp.xpt +@BINPATH@/components/xul.xpt +@BINPATH@/components/xuldoc.xpt +@BINPATH@/components/xultmpl.xpt + +@BINPATH@/components/inspector.xpt + +; Imaging: +@BINPATH@/components/imgicon.xpt +@BINPATH@/components/imglib2.xpt + +; accessibility (out of process API support) +#ifdef ACCESSIBILITY +@BINPATH@/components/accessibility.xpt +#ifdef XP_WIN32 +@BINPATH@/AccessibleMarshal.dll +#endif +#endif + +; caps (JavaScript security) +@BINPATH@/components/caps.xpt + +; glue: appshell, docshell, uriloader, chrome, components +@BINPATH@/components/appshell.xpt +@BINPATH@/components/appstartup.xpt +@BINPATH@/components/docshell.xpt +@BINPATH@/components/uriloader.xpt +@BINPATH@/components/webBrowser_core.xpt +@BINPATH@/components/windowwatcher.xpt +@BINPATH@/components/webbrowserpersist.xpt +@BINPATH@/components/commandhandler.xpt + +; jar +@BINPATH@/components/jar.xpt + +; prefs +@BINPATH@/components/pref.xpt + +; profile +@BINPATH@/components/profile.xpt +@BINPATH@/components/toolkitprofile.xpt + +; toolkit +@BINPATH@/components/AppProtocolHandler.js +@BINPATH@/components/AppProtocolHandler.manifest +@BINPATH@/components/AppsService.js +@BINPATH@/components/AppsService.manifest +@BINPATH@/components/BrowserElementParent.js +@BINPATH@/components/BrowserElementParent.manifest +@BINPATH@/components/ColorAnalyzer.js +@BINPATH@/components/Identity.manifest +@BINPATH@/components/PageThumbsProtocol.js +@BINPATH@/components/PermissionSettings.js +@BINPATH@/components/SettingsManager.js +@BINPATH@/components/SettingsManager.manifest +@BINPATH@/components/SiteSpecificUserAgent.js +@BINPATH@/components/SiteSpecificUserAgent.manifest +@BINPATH@/components/Webapps.js +@BINPATH@/components/Webapps.manifest +@BINPATH@/components/commandlines.xpt +@BINPATH@/components/chrome.xpt +@BINPATH@/components/cryptoComponents.manifest +@BINPATH@/components/Downloads.manifest +@BINPATH@/components/DownloadLegacy.js +@BINPATH@/components/nsDefaultCLH.js +@BINPATH@/components/nsDefaultCLH.manifest +@BINPATH@/components/nsDOMIdentity.js +@BINPATH@/components/nsFormAutoComplete.js +@BINPATH@/components/nsFormHistory.js +@BINPATH@/components/FormHistoryStartup.js +@BINPATH@/components/nsIDService.js +@BINPATH@/components/nsInputListAutoComplete.js +@BINPATH@/components/nsLivemarkService.js +@BINPATH@/components/nsPlacesAutoComplete.js +@BINPATH@/components/nsPlacesAutoComplete.manifest +@BINPATH@/components/nsPlacesExpiration.js +@BINPATH@/components/nsPrompter.js +@BINPATH@/components/nsPrompter.manifest +@BINPATH@/components/nsSearchService.js +@BINPATH@/components/nsSearchSuggestions.js +@BINPATH@/components/nsTaggingService.js +@BINPATH@/components/PlacesCategoriesStarter.js +@BINPATH@/components/servicesComponents.manifest +@BINPATH@/components/TCPSocket.js +@BINPATH@/components/TCPServerSocket.js +@BINPATH@/components/TCPSocketParentIntermediary.js +@BINPATH@/components/TCPSocket.manifest +#ifdef MOZ_WEBRTC +@BINPATH@/components/PeerConnection.js +@BINPATH@/components/PeerConnection.manifest +#endif +@BINPATH@/components/TelemetryPing.js +@BINPATH@/components/TelemetryPing.manifest +@BINPATH@/components/toolkitplaces.manifest +@BINPATH@/components/toolkitsearch.manifest +#ifdef UNIX_BUT_NOT_MAC +@BINPATH@/components/toolkitremote.xpt +@BINPATH@/mozilla-xremote-client +#endif +#ifdef MOZ_GTK2 +@BINPATH@/components/filepicker.xpt +@BINPATH@/components/nsFilePicker.js +@BINPATH@/components/nsFilePicker.manifest +#endif +#ifdef MOZ_ENABLE_DBUS +@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@ +#endif +#ifdef MOZ_ENABLE_PROFILER_SPS +@BINPATH@/components/profiler.xpt +#endif + +; rdf +@BINPATH@/components/rdf.xpt + +; required i18n libraries +@BINPATH@/components/intl.xpt +@BINPATH@/components/locale.xpt +@BINPATH@/components/uconv.xpt +@BINPATH@/components/unicharutil.xpt + +; dom +@BINPATH@/components/dom.xpt +@BINPATH@/components/dom_alarm.xpt +@BINPATH@/components/dom_apps.xpt +@BINPATH@/components/dom_base.xpt +@BINPATH@/components/dom_browserelement.xpt +@BINPATH@/components/dom_camera.xpt +@BINPATH@/components/dom_canvas.xpt +@BINPATH@/components/dom_contacts.xpt +@BINPATH@/components/dom_core.xpt +@BINPATH@/components/dom_css.xpt +@BINPATH@/components/dom_devicestorage.xpt +@BINPATH@/components/dom_events.xpt +@BINPATH@/components/dom_file.xpt +@BINPATH@/components/dom_gamepad.xpt +@BINPATH@/components/dom_geolocation.xpt +@BINPATH@/components/dom_html.xpt +@BINPATH@/components/dom_indexeddb.xpt +@BINPATH@/components/dom_json.xpt +@BINPATH@/components/dom_media.xpt +@BINPATH@/components/dom_mobilemessage.xpt +@BINPATH@/components/dom_network.xpt +@BINPATH@/components/dom_notification.xpt +@BINPATH@/components/dom_offline.xpt +@BINPATH@/components/dom_permissionsettings.xpt +@BINPATH@/components/dom_power.xpt +@BINPATH@/components/dom_quota.xpt +@BINPATH@/components/dom_range.xpt +@BINPATH@/components/dom_settings.xpt +@BINPATH@/components/dom_sidebar.xpt +@BINPATH@/components/dom_smil.xpt +@BINPATH@/components/dom_storage.xpt +@BINPATH@/components/dom_stylesheets.xpt +@BINPATH@/components/dom_system.xpt +@BINPATH@/components/dom_traversal.xpt +@BINPATH@/components/dom_webspeechrecognition.xpt +@BINPATH@/components/dom_webspeechsynth.xpt +@BINPATH@/components/dom_xbl.xpt +@BINPATH@/components/dom_xul.xpt +@BINPATH@/components/NetworkGeolocationProvider.js +@BINPATH@/components/NetworkGeolocationProvider.manifest + +; editor / composer for HTML compose +@BINPATH@/components/editor.xpt +@BINPATH@/components/composer.xpt +@BINPATH@/components/txmgr.xpt + +; find functionality +@BINPATH@/components/txtsvc.xpt + +; moz storage +@BINPATH@/components/storage.xpt + +; netwerk +@BINPATH@/components/necko.xpt +@BINPATH@/components/necko_about.xpt +@BINPATH@/components/necko_dns.xpt +@BINPATH@/components/necko_http.xpt +@BINPATH@/components/necko_ipc.xpt +@BINPATH@/components/necko_res.xpt +@BINPATH@/components/necko_strconv.xpt +@BINPATH@/components/necko_file.xpt +@BINPATH@/components/necko_ftp.xpt +@BINPATH@/components/necko_cache.xpt +@BINPATH@/components/necko_cookie.xpt +@BINPATH@/components/necko_socket.xpt +@BINPATH@/components/necko_viewsource.xpt +@BINPATH@/components/necko_websocket.xpt +#ifdef NECKO_WIFI +@BINPATH@/components/necko_wifi.xpt +#endif +@BINPATH@/components/necko_wyciwyg.xpt + +; extensions +@BINPATH@/components/addonManager.js +@BINPATH@/components/amContentHandler.js +@BINPATH@/components/amWebInstallListener.js +@BINPATH@/components/nsBlocklistService.js +#ifdef MOZ_UPDATER +@BINPATH@/components/nsUpdateService.js +@BINPATH@/components/nsUpdateService.manifest +@BINPATH@/components/nsUpdateServiceStub.js +#endif +@BINPATH@/components/nsUpdateTimerManager.js +@BINPATH@/components/nsUpdateTimerManager.manifest +@BINPATH@/components/extensions.xpt +@BINPATH@/components/extensions.manifest +@BINPATH@/components/update.xpt +#ifdef MOZ_WEBSERVICES +@BINPATH@/components/websrvcs.xpt +#endif +@BINPATH@/components/nsURLFormatter.js +@BINPATH@/components/nsURLFormatter.manifest +@BINPATH@/components/urlformatter.xpt +@BINPATH@/components/nsContentPrefService.js +@BINPATH@/components/nsContentPrefService.manifest + +; [Personal Security Manager] +; +; NSS libraries are signed in the staging directory, +; meaning their .chk files are created there directly. +; +#ifndef MOZ_NATIVE_NSS +@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ +#ifndef NSS_DISABLE_DBM +@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@ +#endif +@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ +#endif +@BINPATH@/chrome/pippki@JAREXT@ +@BINPATH@/chrome/pippki.manifest +@BINPATH@/components/pipboot.xpt +@BINPATH@/components/pipnss.xpt +@BINPATH@/components/pippki.xpt + +; for Solaris SPARC +#ifdef SOLARIS +@BINPATH@/@DLL_PREFIX@freebl_32fpu_3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@freebl_32int_3@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@freebl_32int64_3@DLL_SUFFIX@ +#endif + +; core platform files +@BINPATH@/components/FeedProcessor.js +@BINPATH@/components/FeedProcessor.manifest +@BINPATH@/components/autocomplete.xpt +@BINPATH@/components/alerts.xpt +@BINPATH@/components/jsdebugger.xpt +@BINPATH@/components/jsdservice.xpt +@BINPATH@/components/jsinspector.xpt +@BINPATH@/components/fastfind.xpt +@BINPATH@/components/find.xpt +@BINPATH@/components/ConsoleAPI.js +@BINPATH@/components/ConsoleAPI.manifest +@BINPATH@/components/ContactManager.js +@BINPATH@/components/ContactManager.manifest +@BINPATH@/components/contentAreaDropListener.js +@BINPATH@/components/contentAreaDropListener.manifest +@BINPATH@/components/contentSecurityPolicy.js +@BINPATH@/components/contentSecurityPolicy.manifest +@BINPATH@/components/directory.xpt +@BINPATH@/components/jsconsole-clhandler.js +@BINPATH@/components/jsconsole-clhandler.manifest +@BINPATH@/components/layout_xul_tree.xpt +@BINPATH@/components/mozfind.xpt +@BINPATH@/components/mimetype.xpt +@BINPATH@/components/parentalcontrols.xpt +#ifdef MOZ_WEBRTC +@BINPATH@/components/peerconnection.xpt +#endif +@BINPATH@/components/exthandler.xpt +@BINPATH@/components/exthelper.xpt +@BINPATH@/components/embed_base.xpt +@BINPATH@/components/windowds.xpt +@BINPATH@/components/dom_xpath.xpt +@BINPATH@/components/lwbrk.xpt +@BINPATH@/components/nsINIProcessor.js +@BINPATH@/components/nsINIProcessor.manifest +@BINPATH@/components/pluginGlue.manifest +@BINPATH@/components/txEXSLTRegExFunctions.js +@BINPATH@/components/txEXSLTRegExFunctions.manifest +@BINPATH@/components/feeds.xpt +@BINPATH@/components/saxparser.xpt +@BINPATH@/components/satchel.manifest +@BINPATH@/components/satchel.xpt +@BINPATH@/components/shistory.xpt +@BINPATH@/components/telemetry.xpt +@BINPATH@/components/zipwriter.xpt +@BINPATH@/components/cookie.xpt +@BINPATH@/components/places.xpt +@BINPATH@/components/plugin.xpt +@BINPATH@/components/prefetch.xpt +@BINPATH@/res/langGroups.properties +@BINPATH@/res/language.properties +@BINPATH@/res/entityTables/* +@BINPATH@/res/dtd/* +@BINPATH@/res/fonts/* @BINPATH@/res/contenteditable.css @BINPATH@/res/designmode.css +@BINPATH@/res/html/folder.png +#ifdef XP_MACOSX +@BINPATH@/res/cursors/ +@BINPATH@/res/MainMenu.nib/ +#endif + +; editor resource files +@BINPATH@/res/EditorOverride.css +@BINPATH@/res/grabber.gif @BINPATH@/res/table-add-column-after-active.gif @BINPATH@/res/table-add-column-after-hover.gif @BINPATH@/res/table-add-column-after.gif @@ -514,61 +637,19 @@ @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] -; -; NSS libraries are signed in the staging directory, -; meaning their .chk files are created there directly. -; -@BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ -#ifndef NSS_DISABLE_DBM -@BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@ -#endif -@BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ -@BINPATH@/chrome/pippki@JAREXT@ -@BINPATH@/chrome/pippki.manifest -@BINPATH@/components/pipboot.xpt -@BINPATH@/components/pipnss.xpt -@BINPATH@/components/pippki.xpt - -; for Solaris SPARC -#ifdef SOLARIS -bin/libfreebl_32fpu_3.so -bin/libfreebl_32int_3.so -bin/libfreebl_32int64_3.so -#endif ; [Updater] +#ifdef MOZ_UPDATER #ifdef XP_MACOSX @BINPATH@/updater.app/ #else @BINPATH@/updater@BIN_SUFFIX@ #endif +#endif ; [Crash Reporter] ; @@ -576,13 +657,17 @@ bin/libfreebl_32int64_3.so #ifdef XP_MACOSX @BINPATH@/crashreporter.app/ #else +#ifndef XP_OS2 @BINPATH@/crashreporter@BIN_SUFFIX@ @BINPATH@/crashreporter.ini #ifdef XP_UNIX @BINPATH@/Throbber-small.gif #endif #endif -@BINPATH@/crashreporter-override.ini +#endif +#ifdef MOZ_CRASHREPORTER_INJECTOR +@BINPATH@/breakpadinjector.dll +#endif #endif ; GNOME hooks diff --git a/im/installer/removed-files.in b/im/installer/removed-files.in index 92bc4330fb..131dc5d537 100644 --- a/im/installer/removed-files.in +++ b/im/installer/removed-files.in @@ -169,7 +169,6 @@ components/zipwriter.xpt components/nsPostUpdateWin.js #endif /* XP_WIN */ components/nsResetPref.js -dependentlibs.list d3dx9_43.dll #ifdef XP_WIN IA2Marshal.dll diff --git a/im/themes/Makefile.in b/im/themes/Makefile.in index ef40c1e3e8..353289fb22 100644 --- a/im/themes/Makefile.in +++ b/im/themes/Makefile.in @@ -9,4 +9,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +ICON_FILES := icon.png +ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +INSTALL_TARGETS += ICON + include $(topsrcdir)/config/rules.mk diff --git a/im/themes/icon.png b/im/themes/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ff4f21f9a6115db4829bb0ac6094ee1cd78c603d GIT binary patch literal 2185 zcmV;42zK|0P)CWtooo)Zv+OeHowY6&Nqt=z}wm!Pzii+S0f~cr~pu8;VC<_7t zqP*n&)J=ehJVfLbkf%Hol7QhA2?T^h!z%=YBscfllPfr)0e5HHZf3qo?mc(T=llEp z&iS4D4uE%lO8unp|A~RneXIUXBp@pKzZ)RXUlVn9hkvdmzkUBz18!dI)vjJ_FTdbC zc6e+VFY&vFy!6~=aPovm&S;QFCROsT+wUK3ytbVxabBwpw%l^|M;mZI$NtEjKof6P zb=2{s=o=WruxbkG=Q^mTC`{{UOzD8}DLpE0C!;cG7uo|hA<5kaoI)}DBFb8ho?##S z!3I3eu@@1zLv|j2WI&;UMyrRO1|v!j=!mowFim7IAbli6%;7DVNZ)~I+s)`~6+xk< zA(2m`ptc_uf{PmtyRcV$F9QVrLE!cLBB^YMz-Z6}O3%WHv>GLJ!?&R8x5s3+E#&Q? zxaGPRT}k^;<*^>6sbNq~0#7G^!Erz~N<$!>KsbvxV&lyE^MVEp@R-Chk$Pepg!Mu* zaD%iu9jKuMpnn&c`72P;?YQT=2K5np@#OkOq?|T`T&cn{0#~SkfpHqLF_NJX8qK|v z2uW!evp&W8-Mj{TujFKojZe*m6Y^~IYE>_^Jyr}@-?IZPoXsc?G6ix?arfkU2r7$T zL{HK`prX(-s=?zS4Z4(CbSU+xYE$8~@BK2P21w0K_(Iu>l+VC58V%ILN>Xo%sr|%+ z5~Ghyp%R;*uVM@0?N&pXZH0QzRmctT#L%Q3{6R79h|^IcYer=+9~FkaHmiZe7{Dbqd$0sx|Ypx?uS@T15-e+S(A!inzhI}bHuRvD23v9Q)p*7VO zs;G5{wc7|;kBp?ALZaw8f*U-MB8mow7>TY8Lnc2TwY>un$|;nI$Km2zSoVei*6q4y zI*NW-?-70(I{XfyBftjjao$h}8lfSpenLHnl4xgCM_2@Pu?Yu3NDh;XmH26c6 zvVdFmG4N!=5RmBk12pRUX~gDtWB*B($s7Y2*-c|wLZ02{e9PZLXz?2e>{g=o;HM}u zT@Ix}ffSeB=)HRy+PJ?kd%j)R%q+YoDlHoOB*<^CMqsHQ966To$T@`!K|QKvG%9*% zly%c6c}ydr_zBEUvQEu05S3Uim>^w+X);72Z!6U7_ywxBy$9}=#VED;0y%z8Xo|N3 zvUY&$v<`*w!RRO3Ofn2SdI~1O#wRbLeAq|NfGLzqX_U^uizGBsDxSj9DgD|U1Fl|a zVSS2mro$O(J;=}bd0g_&TX9Ql^ zOTPgx=%R76Y6#ZuS#fg=xSVBwl3mzJO=|Q^tqm=9k~mTJ$6Uh%%3_QP+7^ohBjb|?VjYj0;$@Z*j?8UHJOW5rJ6} z4Mtk8(Z(OQRFnUv#!UJpG|IW1S|;s=$X^}XdxG`h)lA7tIHyIAD6SHRyz)y-kFplc zYkA*W7tU9rU~;0BNc2q24QYRMY|n9)ZA5-Q1J4jqh)Fx1?Tc0=R__=PxrT}tgZ z(u7(>6e(cuTiQb49~+y?@OhVL5z){6cCB!~eqhyx(#z!D@`beLNa&->$(0Dp5g;GyO81UJ-;`GHG%gdd=SQhiu%8&QG4Q|lV&rH7jr@3#zA-CkmC%(;u z-Fdchzf;^JlRe+2uiRi|HS^qO-^akq5)dt(FYP}