mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 1438688, part 3 - Remove XPT files from the packaging process. r=glandium
Now that XPT files are not loaded from files at runtime, code for packaging XPT files can be removed. This means that a couple of test XPIDL interfaces will get shipped in builds to users that weren't before, but I don't think that matters much. This also puts XPT files into the local objdir for the XPIDL makefile, instead of dist/bin, because they are no longer part of the distribution. MozReview-Commit-ID: 7gWj8KWUun3 --HG-- extra : rebase_source : 6f7d4fd1d6cdea2c14866705a2dc972eb5f43382
This commit is contained in:
Andrew McCreight
parent
f8b6ed2d52
commit
fc09560f06
@ -149,13 +149,6 @@
|
||||
#endif
|
||||
|
||||
; [Components]
|
||||
#ifdef MOZ_ARTIFACT_BUILDS
|
||||
@RESPATH@/components/prebuilt-interfaces.manifest
|
||||
@RESPATH@/components/interfaces.xpt
|
||||
@RESPATH@/browser/components/prebuilt-interfaces.manifest
|
||||
@RESPATH@/browser/components/interfaces.xpt
|
||||
#endif
|
||||
@RESPATH@/components/alerts.xpt
|
||||
#ifdef ACCESSIBILITY
|
||||
#ifdef XP_WIN32
|
||||
@BINPATH@/Accessible.tlb
|
||||
@ -163,176 +156,7 @@
|
||||
@BINPATH@/AccessibleMarshal.dll
|
||||
@BINPATH@/IA2Marshal.dll
|
||||
#endif
|
||||
@RESPATH@/components/accessibility.xpt
|
||||
#endif
|
||||
@RESPATH@/components/appshell.xpt
|
||||
@RESPATH@/components/appstartup.xpt
|
||||
@RESPATH@/components/autocomplete.xpt
|
||||
@RESPATH@/components/autoconfig.xpt
|
||||
@RESPATH@/components/browser-element.xpt
|
||||
@RESPATH@/browser/components/browsercompsbase.xpt
|
||||
@RESPATH@/browser/components/browser-feeds.xpt
|
||||
@RESPATH@/components/caps.xpt
|
||||
@RESPATH@/components/chrome.xpt
|
||||
#ifdef MOZ_CODE_COVERAGE
|
||||
@RESPATH@/components/code-coverage.xpt
|
||||
#endif
|
||||
@RESPATH@/components/commandhandler.xpt
|
||||
@RESPATH@/components/commandlines.xpt
|
||||
@RESPATH@/components/composer.xpt
|
||||
@RESPATH@/components/content_events.xpt
|
||||
@RESPATH@/components/content_html.xpt
|
||||
@RESPATH@/components/content_geckomediaplugins.xpt
|
||||
#ifdef MOZ_WEBRTC
|
||||
@RESPATH@/components/content_webrtc.xpt
|
||||
#endif
|
||||
@RESPATH@/components/content_xslt.xpt
|
||||
@RESPATH@/components/directory.xpt
|
||||
@RESPATH@/components/docshell.xpt
|
||||
@RESPATH@/components/dom.xpt
|
||||
@RESPATH@/components/dom_base.xpt
|
||||
@RESPATH@/components/dom_bindings.xpt
|
||||
#ifdef MOZ_DEBUG
|
||||
@RESPATH@/components/dom_bindings_test.xpt
|
||||
#endif
|
||||
@RESPATH@/components/dom_file.xpt
|
||||
@RESPATH@/components/dom_system.xpt
|
||||
@RESPATH@/components/dom_core.xpt
|
||||
@RESPATH@/components/dom_events.xpt
|
||||
@RESPATH@/components/dom_geolocation.xpt
|
||||
@RESPATH@/components/dom_media.xpt
|
||||
@RESPATH@/components/dom_network.xpt
|
||||
@RESPATH@/components/dom_notification.xpt
|
||||
@RESPATH@/components/dom_html.xpt
|
||||
@RESPATH@/components/dom_offline.xpt
|
||||
@RESPATH@/components/dom_payments.xpt
|
||||
@RESPATH@/components/dom_power.xpt
|
||||
@RESPATH@/components/dom_push.xpt
|
||||
@RESPATH@/components/dom_quota.xpt
|
||||
@RESPATH@/components/dom_range.xpt
|
||||
@RESPATH@/components/dom_security.xpt
|
||||
@RESPATH@/components/dom_sidebar.xpt
|
||||
@RESPATH@/components/dom_storage.xpt
|
||||
@RESPATH@/components/dom_webauthn.xpt
|
||||
#ifdef MOZ_WEBSPEECH
|
||||
@RESPATH@/components/dom_webspeechrecognition.xpt
|
||||
#endif
|
||||
@RESPATH@/components/dom_workers.xpt
|
||||
@RESPATH@/components/dom_xul.xpt
|
||||
@RESPATH@/components/dom_presentation.xpt
|
||||
@RESPATH@/components/downloads.xpt
|
||||
@RESPATH@/components/editor.xpt
|
||||
@RESPATH@/components/enterprisepolicies.xpt
|
||||
@RESPATH@/components/extensions.xpt
|
||||
@RESPATH@/components/exthandler.xpt
|
||||
@RESPATH@/components/fastfind.xpt
|
||||
@RESPATH@/components/feeds.xpt
|
||||
@RESPATH@/components/gfx.xpt
|
||||
@RESPATH@/components/html5.xpt
|
||||
@RESPATH@/components/htmlparser.xpt
|
||||
@RESPATH@/components/imglib2.xpt
|
||||
@RESPATH@/components/inspector.xpt
|
||||
@RESPATH@/components/intl.xpt
|
||||
@RESPATH@/components/jar.xpt
|
||||
@RESPATH@/components/jsdebugger.xpt
|
||||
@RESPATH@/browser/components/jsinspector.xpt
|
||||
@RESPATH@/components/layout_base.xpt
|
||||
#ifdef MOZ_DEBUG
|
||||
@RESPATH@/components/layout_debug.xpt
|
||||
#endif
|
||||
#ifdef NS_PRINTING
|
||||
@RESPATH@/components/layout_printing.xpt
|
||||
#endif
|
||||
@RESPATH@/components/layout_xul_tree.xpt
|
||||
@RESPATH@/components/layout_xul.xpt
|
||||
@RESPATH@/components/locale.xpt
|
||||
@RESPATH@/browser/components/migration.xpt
|
||||
@RESPATH@/components/mimetype.xpt
|
||||
@RESPATH@/components/mozfind.xpt
|
||||
@RESPATH@/components/mozintl.xpt
|
||||
@RESPATH@/components/necko_about.xpt
|
||||
@RESPATH@/components/necko_cache.xpt
|
||||
@RESPATH@/components/necko_cache2.xpt
|
||||
@RESPATH@/components/necko_cookie.xpt
|
||||
@RESPATH@/components/necko_dns.xpt
|
||||
@RESPATH@/components/necko_file.xpt
|
||||
@RESPATH@/components/necko_ftp.xpt
|
||||
@RESPATH@/components/necko_http.xpt
|
||||
@RESPATH@/components/necko_mdns.xpt
|
||||
@RESPATH@/components/necko_res.xpt
|
||||
@RESPATH@/components/necko_socket.xpt
|
||||
@RESPATH@/components/necko_strconv.xpt
|
||||
@RESPATH@/components/necko_viewsource.xpt
|
||||
@RESPATH@/components/necko_websocket.xpt
|
||||
#ifdef NECKO_WIFI
|
||||
@RESPATH@/components/necko_wifi.xpt
|
||||
#endif
|
||||
@RESPATH@/components/necko_wyciwyg.xpt
|
||||
@RESPATH@/components/necko.xpt
|
||||
@RESPATH@/components/loginmgr.xpt
|
||||
@RESPATH@/components/parentalcontrols.xpt
|
||||
#ifdef MOZ_WEBRTC
|
||||
@RESPATH@/components/peerconnection.xpt
|
||||
#endif
|
||||
@RESPATH@/components/places.xpt
|
||||
@RESPATH@/components/plugin.xpt
|
||||
@RESPATH@/components/pref.xpt
|
||||
@RESPATH@/components/prefetch.xpt
|
||||
#ifdef MOZ_GECKO_PROFILER
|
||||
@RESPATH@/components/profiler.xpt
|
||||
#endif
|
||||
@RESPATH@/components/rdf.xpt
|
||||
@RESPATH@/components/reputationservice.xpt
|
||||
@RESPATH@/components/satchel.xpt
|
||||
@RESPATH@/components/saxparser.xpt
|
||||
@RESPATH@/browser/components/sessionstore.xpt
|
||||
@RESPATH@/components/services-crypto-component.xpt
|
||||
@RESPATH@/components/captivedetect.xpt
|
||||
@RESPATH@/browser/components/shellservice.xpt
|
||||
@RESPATH@/components/shistory.xpt
|
||||
@RESPATH@/components/spellchecker.xpt
|
||||
@RESPATH@/components/storage.xpt
|
||||
#ifdef ENABLE_MARIONETTE
|
||||
@RESPATH@/components/remote.xpt
|
||||
#endif
|
||||
@RESPATH@/components/toolkit_asyncshutdown.xpt
|
||||
@RESPATH@/components/toolkit_filewatcher.xpt
|
||||
@RESPATH@/components/toolkit_finalizationwitness.xpt
|
||||
@RESPATH@/components/toolkit_osfile.xpt
|
||||
@RESPATH@/components/toolkit_securityreporter.xpt
|
||||
@RESPATH@/components/toolkit_perfmonitoring.xpt
|
||||
@RESPATH@/components/toolkit_xulstore.xpt
|
||||
@RESPATH@/components/toolkitprofile.xpt
|
||||
#ifdef MOZ_ENABLE_XREMOTE
|
||||
@RESPATH@/components/toolkitremote.xpt
|
||||
#endif
|
||||
@RESPATH@/components/txtsvc.xpt
|
||||
@RESPATH@/components/txmgr.xpt
|
||||
@RESPATH@/components/uconv.xpt
|
||||
@RESPATH@/components/update.xpt
|
||||
@RESPATH@/components/uriloader.xpt
|
||||
@RESPATH@/components/urlformatter.xpt
|
||||
@RESPATH@/components/webBrowser_core.xpt
|
||||
@RESPATH@/components/webbrowserpersist.xpt
|
||||
@RESPATH@/components/webextensions.xpt
|
||||
@RESPATH@/components/widget.xpt
|
||||
#ifdef XP_MACOSX
|
||||
@RESPATH@/components/widget_cocoa.xpt
|
||||
#endif
|
||||
@RESPATH@/components/windowcreator.xpt
|
||||
@RESPATH@/components/windowwatcher.xpt
|
||||
@RESPATH@/components/xpcom_base.xpt
|
||||
@RESPATH@/components/xpcom_system.xpt
|
||||
@RESPATH@/components/xpcom_components.xpt
|
||||
@RESPATH@/components/xpcom_ds.xpt
|
||||
@RESPATH@/components/xpcom_io.xpt
|
||||
@RESPATH@/components/xpcom_threads.xpt
|
||||
@RESPATH@/components/xpcom_xpti.xpt
|
||||
@RESPATH@/components/xpconnect.xpt
|
||||
@RESPATH@/components/xulapp.xpt
|
||||
@RESPATH@/components/xul.xpt
|
||||
@RESPATH@/components/zipwriter.xpt
|
||||
@RESPATH@/components/telemetry.xpt
|
||||
|
||||
; JavaScript components
|
||||
@RESPATH@/components/ConsoleAPI.manifest
|
||||
@ -371,7 +195,6 @@
|
||||
@RESPATH@/browser/components/aboutcapabilities.manifest
|
||||
@RESPATH@/browser/components/Experiments.manifest
|
||||
@RESPATH@/browser/components/ExperimentsService.js
|
||||
@RESPATH@/browser/components/browser-newtab.xpt
|
||||
@RESPATH@/browser/components/aboutNewTabService.js
|
||||
@RESPATH@/browser/components/NewTabComponents.manifest
|
||||
@RESPATH@/browser/components/EnterprisePolicies.js
|
||||
@ -379,7 +202,6 @@
|
||||
@RESPATH@/browser/components/EnterprisePolicies.manifest
|
||||
@RESPATH@/components/Downloads.manifest
|
||||
@RESPATH@/components/DownloadLegacy.js
|
||||
@RESPATH@/components/thumbnails.xpt
|
||||
@RESPATH@/components/PageThumbsComponents.manifest
|
||||
@RESPATH@/components/crashmonitor.manifest
|
||||
@RESPATH@/components/nsCrashMonitor.js
|
||||
@ -399,7 +221,6 @@
|
||||
@RESPATH@/components/crypto-SDR.js
|
||||
@RESPATH@/components/TooltipTextProvider.js
|
||||
@RESPATH@/components/TooltipTextProvider.manifest
|
||||
@RESPATH@/components/webvtt.xpt
|
||||
@RESPATH@/components/WebVTT.manifest
|
||||
@RESPATH@/components/WebVTTParserWrapper.js
|
||||
@RESPATH@/components/nsHelperAppDlg.manifest
|
||||
@ -519,10 +340,6 @@
|
||||
@RESPATH@/components/marionette.manifest
|
||||
@RESPATH@/components/marionette.js
|
||||
|
||||
#ifdef MOZ_WEBSPEECH
|
||||
@RESPATH@/components/dom_webspeechsynth.xpt
|
||||
#endif
|
||||
|
||||
@RESPATH@/components/nsAsyncShutdown.manifest
|
||||
@RESPATH@/components/nsAsyncShutdown.js
|
||||
|
||||
@ -559,10 +376,8 @@
|
||||
@RESPATH@/components/nsUrlClassifierHashCompleter.js
|
||||
@RESPATH@/components/nsUrlClassifierListManager.js
|
||||
@RESPATH@/components/nsUrlClassifierLib.js
|
||||
@RESPATH@/components/url-classifier.xpt
|
||||
|
||||
; Private Browsing
|
||||
@RESPATH@/components/privatebrowsing.xpt
|
||||
@RESPATH@/components/PrivateBrowsing.manifest
|
||||
@RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
|
||||
|
||||
@ -718,15 +533,12 @@
|
||||
#endif
|
||||
@RESPATH@/chrome/pippki@JAREXT@
|
||||
@RESPATH@/chrome/pippki.manifest
|
||||
@RESPATH@/components/pipnss.xpt
|
||||
@RESPATH@/components/pippki.xpt
|
||||
|
||||
; For process sandboxing
|
||||
#if defined(MOZ_SANDBOX)
|
||||
#if defined(XP_LINUX)
|
||||
@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
|
||||
#endif
|
||||
@RESPATH@/components/sandbox.xpt
|
||||
#endif
|
||||
|
||||
; for Solaris SPARC
|
||||
@ -758,7 +570,6 @@ bin/libfreebl_32int64_3.so
|
||||
#ifdef MOZ_CRASHREPORTER
|
||||
@RESPATH@/components/CrashService.manifest
|
||||
@RESPATH@/components/CrashService.js
|
||||
@RESPATH@/components/toolkit_crashservice.xpt
|
||||
#ifdef XP_MACOSX
|
||||
@BINPATH@/crashreporter.app/
|
||||
#else
|
||||
@ -779,8 +590,6 @@ bin/libfreebl_32int64_3.so
|
||||
;
|
||||
@BINPATH@/pingsender@BIN_SUFFIX@
|
||||
|
||||
@RESPATH@/components/dom_audiochannel.xpt
|
||||
|
||||
; Shutdown Terminator
|
||||
@RESPATH@/components/nsTerminatorTelemetry.js
|
||||
@RESPATH@/components/terminator.manifest
|
||||
@ -816,9 +625,6 @@ bin/libfreebl_32int64_3.so
|
||||
#endif
|
||||
#endif
|
||||
|
||||
; Background Hang Monitor
|
||||
@RESPATH@/components/backgroundhangmonitor.xpt
|
||||
|
||||
; NOTE: This must match the config checks in
|
||||
; /toolkit/components/backgroundhangmonitor/moz.build.
|
||||
#if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN)
|
||||
|
||||
@ -36,14 +36,6 @@ TEST_DIRS += [
|
||||
DIST_SUBDIR = 'browser'
|
||||
export('DIST_SUBDIR')
|
||||
|
||||
if CONFIG['MOZ_ARTIFACT_BUILDS']:
|
||||
# Ensure a pre-built interfaces.xpt installed to the objdir by the artifact
|
||||
# code is included by the top-level chrome.manifest.
|
||||
EXTRA_COMPONENTS += [
|
||||
'../build/prebuilt-interfaces.manifest',
|
||||
]
|
||||
|
||||
|
||||
# These defines are read in firefox.js
|
||||
DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
|
||||
|
||||
|
||||
@ -117,10 +117,3 @@ if CONFIG['MOZ_VALGRIND']:
|
||||
'valgrind/i386-pc-linux-gnu.sup',
|
||||
'valgrind/x86_64-pc-linux-gnu.sup',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ARTIFACT_BUILDS']:
|
||||
# Ensure a pre-built interfaces.xpt installed to the objdir by the artifact
|
||||
# code is included by the top-level chrome.manifest.
|
||||
EXTRA_COMPONENTS += [
|
||||
'prebuilt-interfaces.manifest',
|
||||
]
|
||||
|
||||
@ -1 +0,0 @@
|
||||
interfaces interfaces.xpt
|
||||
@ -104,9 +104,6 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(addprefix $(TOPOBJDIR)/
|
||||
ifndef FASTER_RECURSIVE_MAKE
|
||||
$(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(TOPOBJDIR)/install-dist_idl
|
||||
endif
|
||||
# It also requires all the install manifests for dist/bin to have been processed
|
||||
# because it adds interfaces.manifest references with buildlist.py.
|
||||
$(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(addprefix install-,$(filter dist/bin%,$(INSTALL_MANIFESTS)))
|
||||
|
||||
$(TOPOBJDIR)/build/application.ini: $(TOPOBJDIR)/buildid.h $(TOPOBJDIR)/source-repo.h
|
||||
|
||||
|
||||
@ -48,24 +48,8 @@ process_py := $(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py
|
||||
# Note that removing previously built files is not covered.
|
||||
@echo $(basename $(notdir $@))_deps_built = $($(basename $(notdir $@))_deps) >> $(idl_deps_dir)/$(basename $(notdir $@)).pp
|
||||
|
||||
# Chrome manifests may be written from several Makefiles at various times during
|
||||
# the build. The 'buildlist' action adds to the file if it already exists, but
|
||||
# if it does exist, make considers it to be up-to-date (as we have no inputs to
|
||||
# depend on). We use FORCE to ensure that we always add the interface manifest,
|
||||
# whether or not the chrome manifest already exists.
|
||||
%/chrome.manifest: FORCE
|
||||
$(call py_action,buildlist,$@ 'manifest components/interfaces.manifest')
|
||||
|
||||
chrome_manifests := @chrome_manifests@
|
||||
|
||||
%/interfaces.manifest: Makefile
|
||||
$(call py_action,buildlist,$@ $(foreach xpt,$(filter $*/%,$(registered_xpt_files)),'interfaces $(notdir $(xpt))'))
|
||||
|
||||
interfaces_manifests := @interfaces_manifests@
|
||||
|
||||
xpidl_modules := @xpidl_modules@
|
||||
registered_xpt_files := @registered_xpt_files@
|
||||
xpt_files := $(registered_xpt_files) @xpt_files@
|
||||
xpt_files := $(addsuffix .xpt,$(xpidl_modules))
|
||||
|
||||
@xpidl_rules@
|
||||
|
||||
@ -74,7 +58,7 @@ depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)
|
||||
GARBAGE += $(xpt_files) $(depends_files)
|
||||
|
||||
ifdef COMPILE_ENVIRONMENT
|
||||
xpidl:: $(xpt_files) $(chrome_manifests) $(interfaces_manifests)
|
||||
xpidl:: $(xpt_files)
|
||||
endif
|
||||
|
||||
$(xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(dist_include_dir) $(dist_xpcrs_dir))
|
||||
|
||||
@ -14,12 +14,3 @@ XPIDL_SOURCES += [
|
||||
]
|
||||
|
||||
XPIDL_MODULE = 'xpctest'
|
||||
|
||||
# XXX: This relies on xpctest.xpt being created in dist/bin/components/ during
|
||||
# the export tier AND TEST_HARNESS_FILES being processed after that.
|
||||
TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.native.components += [
|
||||
'!/dist/bin/components/xpctest.xpt',
|
||||
]
|
||||
TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.js += [
|
||||
'!/dist/bin/components/xpctest.xpt',
|
||||
]
|
||||
|
||||
@ -89,165 +89,7 @@
|
||||
@BINPATH@/blocklist.xml
|
||||
|
||||
; [Components]
|
||||
#ifdef MOZ_ARTIFACT_BUILDS
|
||||
@BINPATH@/components/interfaces.xpt
|
||||
@BINPATH@/components/prebuilt-interfaces.manifest
|
||||
#endif
|
||||
@BINPATH@/components/components.manifest
|
||||
@BINPATH@/components/alerts.xpt
|
||||
#ifdef ACCESSIBILITY
|
||||
@BINPATH@/components/accessibility.xpt
|
||||
#endif
|
||||
@BINPATH@/components/appshell.xpt
|
||||
@BINPATH@/components/appstartup.xpt
|
||||
@BINPATH@/components/autocomplete.xpt
|
||||
@BINPATH@/components/autoconfig.xpt
|
||||
@BINPATH@/components/browser-element.xpt
|
||||
@BINPATH@/components/caps.xpt
|
||||
@BINPATH@/components/chrome.xpt
|
||||
@BINPATH@/components/commandhandler.xpt
|
||||
@BINPATH@/components/commandlines.xpt
|
||||
@BINPATH@/components/composer.xpt
|
||||
@BINPATH@/components/content_events.xpt
|
||||
@BINPATH@/components/content_geckomediaplugins.xpt
|
||||
@BINPATH@/components/content_html.xpt
|
||||
@BINPATH@/components/content_webrtc.xpt
|
||||
@BINPATH@/components/content_xslt.xpt
|
||||
@BINPATH@/components/directory.xpt
|
||||
@BINPATH@/components/docshell.xpt
|
||||
@BINPATH@/components/dom.xpt
|
||||
@BINPATH@/components/dom_base.xpt
|
||||
@BINPATH@/components/dom_bindings.xpt
|
||||
#ifdef MOZ_DEBUG
|
||||
@BINPATH@/components/dom_bindings_test.xpt
|
||||
#endif
|
||||
@BINPATH@/components/dom_core.xpt
|
||||
@BINPATH@/components/dom_events.xpt
|
||||
@BINPATH@/components/dom_file.xpt
|
||||
@BINPATH@/components/dom_geolocation.xpt
|
||||
@BINPATH@/components/dom_media.xpt
|
||||
@BINPATH@/components/dom_network.xpt
|
||||
@BINPATH@/components/dom_notification.xpt
|
||||
@BINPATH@/components/dom_html.xpt
|
||||
@BINPATH@/components/dom_offline.xpt
|
||||
@BINPATH@/components/dom_payments.xpt
|
||||
@BINPATH@/components/dom_power.xpt
|
||||
#ifdef MOZ_ANDROID_GCM
|
||||
@BINPATH@/components/dom_push.xpt
|
||||
#endif
|
||||
@BINPATH@/components/dom_quota.xpt
|
||||
@BINPATH@/components/dom_range.xpt
|
||||
@BINPATH@/components/dom_security.xpt
|
||||
@BINPATH@/components/dom_sidebar.xpt
|
||||
@BINPATH@/components/dom_storage.xpt
|
||||
@BINPATH@/components/dom_system.xpt
|
||||
#ifdef MOZ_WEBSPEECH
|
||||
@BINPATH@/components/dom_webspeechrecognition.xpt
|
||||
#endif
|
||||
@BINPATH@/components/dom_workers.xpt
|
||||
@BINPATH@/components/dom_xhr.xpt
|
||||
@BINPATH@/components/dom_xul.xpt
|
||||
@BINPATH@/components/dom_presentation.xpt
|
||||
@BINPATH@/components/downloads.xpt
|
||||
@BINPATH@/components/editor.xpt
|
||||
@BINPATH@/components/extensions.xpt
|
||||
@BINPATH@/components/exthandler.xpt
|
||||
@BINPATH@/components/fastfind.xpt
|
||||
@BINPATH@/components/feeds.xpt
|
||||
@BINPATH@/components/gfx.xpt
|
||||
@BINPATH@/components/html5.xpt
|
||||
@BINPATH@/components/htmlparser.xpt
|
||||
@BINPATH@/components/imglib2.xpt
|
||||
@BINPATH@/components/inspector.xpt
|
||||
@BINPATH@/components/intl.xpt
|
||||
@BINPATH@/components/jar.xpt
|
||||
@BINPATH@/components/jsdebugger.xpt
|
||||
@BINPATH@/components/jsinspector.xpt
|
||||
@BINPATH@/components/layout_base.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/mimetype.xpt
|
||||
@BINPATH@/components/mozfind.xpt
|
||||
@BINPATH@/components/mozintl.xpt
|
||||
@BINPATH@/components/necko_about.xpt
|
||||
@BINPATH@/components/necko_cache.xpt
|
||||
@BINPATH@/components/necko_cache2.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_mdns.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
|
||||
#ifdef MOZ_WEBRTC
|
||||
@BINPATH@/components/peerconnection.xpt
|
||||
#endif
|
||||
@BINPATH@/components/plugin.xpt
|
||||
@BINPATH@/components/pref.xpt
|
||||
@BINPATH@/components/prefetch.xpt
|
||||
#ifdef MOZ_GECKO_PROFILER
|
||||
@BINPATH@/components/profiler.xpt
|
||||
#endif
|
||||
@BINPATH@/components/rdf.xpt
|
||||
@BINPATH@/components/reputationservice.xpt
|
||||
@BINPATH@/components/satchel.xpt
|
||||
@BINPATH@/components/saxparser.xpt
|
||||
@BINPATH@/components/services-crypto-component.xpt
|
||||
@BINPATH@/components/captivedetect.xpt
|
||||
@BINPATH@/components/shistory.xpt
|
||||
@BINPATH@/components/spellchecker.xpt
|
||||
@BINPATH@/components/storage.xpt
|
||||
@BINPATH@/components/telemetry.xpt
|
||||
@BINPATH@/components/toolkit_asyncshutdown.xpt
|
||||
@BINPATH@/components/toolkit_filewatcher.xpt
|
||||
@BINPATH@/components/toolkit_finalizationwitness.xpt
|
||||
@BINPATH@/components/toolkit_osfile.xpt
|
||||
@BINPATH@/components/toolkit_securityreporter.xpt
|
||||
@BINPATH@/components/toolkit_perfmonitoring.xpt
|
||||
@BINPATH@/components/toolkit_xulstore.xpt
|
||||
@BINPATH@/components/toolkitprofile.xpt
|
||||
#ifdef MOZ_ENABLE_XREMOTE
|
||||
@BINPATH@/components/toolkitremote.xpt
|
||||
#endif
|
||||
@BINPATH@/components/txtsvc.xpt
|
||||
@BINPATH@/components/txmgr.xpt
|
||||
@BINPATH@/components/uconv.xpt
|
||||
@BINPATH@/components/update.xpt
|
||||
@BINPATH@/components/uriloader.xpt
|
||||
@BINPATH@/components/urlformatter.xpt
|
||||
@BINPATH@/components/webBrowser_core.xpt
|
||||
@BINPATH@/components/webbrowserpersist.xpt
|
||||
@BINPATH@/components/webextensions.xpt
|
||||
@BINPATH@/components/widget.xpt
|
||||
@BINPATH@/components/widget_android.xpt
|
||||
@BINPATH@/components/windowcreator.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/xul.xpt
|
||||
@BINPATH@/components/zipwriter.xpt
|
||||
|
||||
; JavaScript components
|
||||
@BINPATH@/components/ConsoleAPI.manifest
|
||||
@ -304,7 +146,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@BINPATH@/components/webvtt.xpt
|
||||
@BINPATH@/components/WebVTT.manifest
|
||||
@BINPATH@/components/WebVTTParserWrapper.js
|
||||
|
||||
@ -366,10 +207,6 @@
|
||||
@BINPATH@/components/CaptivePortalDetectComponents.manifest
|
||||
@BINPATH@/components/captivedetect.js
|
||||
|
||||
#ifdef MOZ_WEBSPEECH
|
||||
@BINPATH@/components/dom_webspeechsynth.xpt
|
||||
#endif
|
||||
|
||||
#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
|
||||
@BINPATH@/components/TestInterfaceJS.js
|
||||
@BINPATH@/components/TestInterfaceJS.manifest
|
||||
@ -404,10 +241,8 @@
|
||||
@BINPATH@/components/nsUrlClassifierHashCompleter.js
|
||||
@BINPATH@/components/nsUrlClassifierListManager.js
|
||||
@BINPATH@/components/nsUrlClassifierLib.js
|
||||
@BINPATH@/components/url-classifier.xpt
|
||||
|
||||
; Private Browsing
|
||||
@BINPATH@/components/privatebrowsing.xpt
|
||||
@BINPATH@/components/PrivateBrowsing.manifest
|
||||
@BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
|
||||
|
||||
@ -482,10 +317,6 @@
|
||||
; svg
|
||||
@BINPATH@/res/svg.css
|
||||
|
||||
; [Personal Security Manager]
|
||||
;
|
||||
@BINPATH@/components/pipnss.xpt
|
||||
|
||||
; For process sandboxing
|
||||
#if defined(MOZ_SANDBOX)
|
||||
@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
|
||||
@ -499,8 +330,6 @@
|
||||
@BINPATH@/crashreporter-override.ini
|
||||
#endif
|
||||
|
||||
@BINPATH@/components/dom_audiochannel.xpt
|
||||
|
||||
@BINPATH@/components/RemoteWebNavigation.js
|
||||
@BINPATH@/components/remotebrowserutils.manifest
|
||||
|
||||
@ -531,7 +360,6 @@
|
||||
@BINPATH@/components/HelperAppDialog.js
|
||||
@BINPATH@/components/LoginManagerPrompter.js
|
||||
@BINPATH@/components/MobileComponents.manifest
|
||||
@BINPATH@/components/MobileComponents.xpt
|
||||
@BINPATH@/components/NSSDialogService.js
|
||||
@BINPATH@/components/PersistentNotificationHandler.js
|
||||
@BINPATH@/components/PresentationDevicePrompt.js
|
||||
@ -553,9 +381,6 @@
|
||||
#include @PKG_LOCALE_MANIFEST@
|
||||
#endif
|
||||
|
||||
; Background Hang Monitor
|
||||
@BINPATH@/components/backgroundhangmonitor.xpt
|
||||
|
||||
; NOTE: This must match the config checks in
|
||||
; /toolkit/components/backgroundhangmonitor/moz.build.
|
||||
#if defined(NIGHTLY_BUILD) && !defined(MOZ_DEBUG) && !defined(MOZ_TSAN)
|
||||
|
||||
@ -10,9 +10,6 @@ XPIDL_SOURCES += [
|
||||
|
||||
XPIDL_MODULE = 'test_necko'
|
||||
|
||||
# Don't add our test-only .xpt files to the normal manifests
|
||||
XPIDL_NO_MANIFEST = True
|
||||
|
||||
XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
|
||||
|
||||
EXTRA_COMPONENTS += [
|
||||
|
||||
@ -245,7 +245,6 @@ class AndroidArtifactJob(ArtifactJob):
|
||||
'application.ini',
|
||||
'platform.ini',
|
||||
'**/*.so',
|
||||
'**/interfaces.xpt',
|
||||
}
|
||||
|
||||
def process_package_artifact(self, filename, processed_filename):
|
||||
@ -283,7 +282,6 @@ class LinuxArtifactJob(ArtifactJob):
|
||||
'firefox/plugin-container',
|
||||
'firefox/updater',
|
||||
'firefox/**/*.so',
|
||||
'firefox/**/interfaces.xpt',
|
||||
}
|
||||
|
||||
def process_package_artifact(self, filename, processed_filename):
|
||||
@ -382,7 +380,6 @@ class MacArtifactJob(ArtifactJob):
|
||||
'gmp-clearkey/0.1/libclearkey.dylib',
|
||||
# 'gmp-fake/1.0/libfake.dylib',
|
||||
# 'gmp-fakeopenh264/1.0/libfakeopenh264.dylib',
|
||||
'**/interfaces.xpt',
|
||||
]),
|
||||
]
|
||||
|
||||
@ -425,7 +422,6 @@ class WinArtifactJob(ArtifactJob):
|
||||
'firefox/application.ini',
|
||||
'firefox/**/*.dll',
|
||||
'firefox/*.exe',
|
||||
'firefox/**/interfaces.xpt',
|
||||
'firefox/*.tlb',
|
||||
}
|
||||
|
||||
|
||||
@ -58,8 +58,6 @@ class XPIDLManager(object):
|
||||
|
||||
self.idls = {}
|
||||
self.modules = {}
|
||||
self.interface_manifests = {}
|
||||
self.chrome_manifests = set()
|
||||
|
||||
def register_idl(self, idl, allow_existing=False):
|
||||
"""Registers an IDL file with this instance.
|
||||
@ -69,15 +67,12 @@ class XPIDLManager(object):
|
||||
basename = mozpath.basename(idl.source_path)
|
||||
root = mozpath.splitext(basename)[0]
|
||||
xpt = '%s.xpt' % idl.module
|
||||
manifest = mozpath.join(idl.install_target, 'components', 'interfaces.manifest')
|
||||
chrome_manifest = mozpath.join(idl.install_target, 'chrome.manifest')
|
||||
|
||||
entry = {
|
||||
'source': idl.source_path,
|
||||
'module': idl.module,
|
||||
'basename': basename,
|
||||
'root': root,
|
||||
'manifest': manifest,
|
||||
}
|
||||
|
||||
if not allow_existing and entry['basename'] in self.idls:
|
||||
@ -87,11 +82,6 @@ class XPIDLManager(object):
|
||||
t = self.modules.setdefault(entry['module'], (idl.install_target, set()))
|
||||
t[1].add(entry['root'])
|
||||
|
||||
if idl.add_to_manifest:
|
||||
self.interface_manifests.setdefault(manifest, set()).add(xpt)
|
||||
self.chrome_manifests.add(chrome_manifest)
|
||||
|
||||
|
||||
class BinariesCollection(object):
|
||||
"""Tracks state of binaries produced by the build."""
|
||||
|
||||
|
||||
@ -1063,8 +1063,6 @@ class RecursiveMakeBackend(CommonBackend):
|
||||
|
||||
modules = manager.modules
|
||||
xpt_modules = sorted(modules.keys())
|
||||
xpt_files = set()
|
||||
registered_xpt_files = set()
|
||||
|
||||
mk = Makefile()
|
||||
|
||||
@ -1082,37 +1080,13 @@ class RecursiveMakeBackend(CommonBackend):
|
||||
# listing the .idls here, we ensure the make file has a
|
||||
# reference to the new .idl. Since the new .idl presumably has
|
||||
# an mtime newer than the .xpt, it will trigger xpt generation.
|
||||
xpt_path = '$(DEPTH)/%s/components/%s.xpt' % (install_target, module)
|
||||
xpt_files.add(xpt_path)
|
||||
mk.add_statement('%s_deps = %s' % (module, ' '.join(deps)))
|
||||
|
||||
if install_target.startswith('dist/'):
|
||||
path = mozpath.relpath(xpt_path, '$(DEPTH)/dist')
|
||||
prefix, subpath = path.split('/', 1)
|
||||
key = 'dist_%s' % prefix
|
||||
|
||||
self._install_manifests[key].add_optional_exists(subpath)
|
||||
build_files.add_optional_exists('%s.xpt' % module)
|
||||
|
||||
rules = StringIO()
|
||||
mk.dump(rules, removal_guard=False)
|
||||
|
||||
interfaces_manifests = []
|
||||
dist_dir = mozpath.join(self.environment.topobjdir, 'dist')
|
||||
for manifest, entries in manager.interface_manifests.items():
|
||||
interfaces_manifests.append(mozpath.join('$(DEPTH)', manifest))
|
||||
for xpt in sorted(entries):
|
||||
registered_xpt_files.add(mozpath.join(
|
||||
'$(DEPTH)', mozpath.dirname(manifest), xpt))
|
||||
|
||||
if install_target.startswith('dist/'):
|
||||
path = mozpath.join(self.environment.topobjdir, manifest)
|
||||
path = mozpath.relpath(path, dist_dir)
|
||||
prefix, subpath = path.split('/', 1)
|
||||
key = 'dist_%s' % prefix
|
||||
self._install_manifests[key].add_optional_exists(subpath)
|
||||
|
||||
chrome_manifests = [mozpath.join('$(DEPTH)', m) for m in sorted(manager.chrome_manifests)]
|
||||
|
||||
# Create dependency for output header so we force regeneration if the
|
||||
# header was deleted. This ideally should not be necessary. However,
|
||||
# some processes (such as PGO at the time this was implemented) wipe
|
||||
@ -1127,12 +1101,8 @@ class RecursiveMakeBackend(CommonBackend):
|
||||
obj.topobjdir = self.environment.topobjdir
|
||||
obj.config = self.environment
|
||||
self._create_makefile(obj, extra=dict(
|
||||
chrome_manifests = ' '.join(chrome_manifests),
|
||||
interfaces_manifests = ' '.join(interfaces_manifests),
|
||||
xpidl_rules=rules.getvalue(),
|
||||
xpidl_modules=' '.join(xpt_modules),
|
||||
xpt_files=' '.join(sorted(xpt_files - registered_xpt_files)),
|
||||
registered_xpt_files=' '.join(sorted(registered_xpt_files)),
|
||||
))
|
||||
|
||||
def _process_program(self, obj, backend_file):
|
||||
|
||||
@ -1779,14 +1779,6 @@ VARIABLES = {
|
||||
as ``MODULE``.
|
||||
"""),
|
||||
|
||||
'XPIDL_NO_MANIFEST': (bool, bool,
|
||||
"""Indicate that the XPIDL module should not be added to a manifest.
|
||||
|
||||
This flag exists primarily to prevent test-only XPIDL modules from being
|
||||
added to the application's chrome manifest. Most XPIDL modules should
|
||||
not use this flag.
|
||||
"""),
|
||||
|
||||
'PREPROCESSED_IPDL_SOURCES': (StrictOrderingOnAppendList, list,
|
||||
"""Preprocessed IPDL source files.
|
||||
|
||||
|
||||
@ -196,16 +196,14 @@ class XPIDLFile(ContextDerived):
|
||||
'source_path',
|
||||
'basename',
|
||||
'module',
|
||||
'add_to_manifest',
|
||||
)
|
||||
|
||||
def __init__(self, context, source, module, add_to_manifest):
|
||||
def __init__(self, context, source, module):
|
||||
ContextDerived.__init__(self, context)
|
||||
|
||||
self.source_path = source
|
||||
self.basename = mozpath.basename(source)
|
||||
self.module = module
|
||||
self.add_to_manifest = add_to_manifest
|
||||
|
||||
class BaseDefines(ContextDerived):
|
||||
"""Context derived container object for DEFINES/HOST_DEFINES,
|
||||
|
||||
@ -1344,7 +1344,7 @@ class TreeMetadataEmitter(LoggingMixin):
|
||||
|
||||
for idl in context['XPIDL_SOURCES']:
|
||||
yield XPIDLFile(context, mozpath.join(context.srcdir, idl),
|
||||
xpidl_module, add_to_manifest=not context['XPIDL_NO_MANIFEST'])
|
||||
xpidl_module)
|
||||
|
||||
def _process_generated_files(self, context):
|
||||
for path in context['CONFIGURE_DEFINE_FILES']:
|
||||
|
||||
@ -687,9 +687,8 @@ class TestRecursiveMakeBackend(BackendTester):
|
||||
m = InstallManifest(path=mozpath.join(install_dir, 'xpidl'))
|
||||
self.assertIn('.deps/my_module.pp', m)
|
||||
|
||||
m = InstallManifest(path=os.path.join(install_dir, 'dist_bin'))
|
||||
self.assertIn('components/my_module.xpt', m)
|
||||
self.assertIn('components/interfaces.manifest', m)
|
||||
m = InstallManifest(path=mozpath.join(install_dir, 'xpidl'))
|
||||
self.assertIn('my_module.xpt', m)
|
||||
|
||||
m = InstallManifest(path=mozpath.join(install_dir, 'dist_include'))
|
||||
self.assertIn('foo.h', m)
|
||||
|
||||
@ -185,9 +185,6 @@ class NoPkgFilesRemover(object):
|
||||
def add_manifest(self, entry):
|
||||
self._formatter.add_manifest(entry)
|
||||
|
||||
def add_interfaces(self, path, content):
|
||||
self._formatter.add_interfaces(path, content)
|
||||
|
||||
def contains(self, path):
|
||||
return self._formatter.contains(path)
|
||||
|
||||
|
||||
@ -29,9 +29,6 @@ USE_LIBS += ['mfbt']
|
||||
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
|
||||
|
||||
if CONFIG['COMPILE_ENVIRONMENT']:
|
||||
TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [
|
||||
'!/dist/bin/components/xpcomtest.xpt',
|
||||
]
|
||||
TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [
|
||||
'!%s%s' % (f, CONFIG['BIN_SUFFIX']) for f in test_progs
|
||||
]
|
||||
@ -41,9 +38,6 @@ XPIDL_SOURCES += [
|
||||
'NotXPCOMTest.idl',
|
||||
]
|
||||
|
||||
# Don't add our test-only .xpt files to the normal manifests
|
||||
XPIDL_NO_MANIFEST = True
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../ds',
|
||||
]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user