[go: nahoru, domu]
Skip to content

Commit

Permalink
Backed out 7 changesets (bug 1438688) for android xpcshell failures o…
Browse files Browse the repository at this point in the history 
…n builds/worker/workspace/build/tests/bin/components/test_necko.xpt

Backed out changeset 8786eabb61a4 (bug 1438688)
Backed out changeset e05ec1e08b46 (bug 1438688)
Backed out changeset 4c437ba9d984 (bug 1438688)
Backed out changeset 2f243bca1af3 (bug 1438688)
Backed out changeset 4da0e1839353 (bug 1438688)
Backed out changeset 186f916dcc7a (bug 1438688)
Backed out changeset 08b1a5f904e4 (bug 1438688)
  • Loading branch information
@dgluca
dgluca committed Apr 2, 2018
1 parent 20a7f5a commit 0ed76ef
Show file tree
Hide file tree
Showing 33 changed files with 1,512 additions and 403 deletions.
196 changes: 195 additions & 1 deletion browser/installer/package-manifest.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,190 @@
#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
@BINPATH@/AccessibleHandler.dll
@BINPATH@/AccessibleMarshal.dll
@BINPATH@/IA2Marshal.dll
#endif
#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
Expand Down Expand Up @@ -195,13 +371,15 @@
@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
@RESPATH@/browser/components/EnterprisePoliciesContent.js
@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
Expand All @@ -221,6 +399,7 @@
@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
Expand Down Expand Up @@ -340,6 +519,10 @@
@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

Expand Down Expand Up @@ -376,8 +559,10 @@
@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

Expand Down Expand Up @@ -533,12 +718,15 @@
#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
Expand Down Expand Up @@ -570,6 +758,7 @@ 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
Expand All @@ -590,6 +779,8 @@ bin/libfreebl_32int64_3.so
;
@BINPATH@/pingsender@BIN_SUFFIX@

@RESPATH@/components/dom_audiochannel.xpt

; Shutdown Terminator
@RESPATH@/components/nsTerminatorTelemetry.js
@RESPATH@/components/terminator.manifest
Expand Down Expand Up @@ -625,6 +816,9 @@ 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)
Expand Down
8 changes: 8 additions & 0 deletions browser/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ 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']

Expand Down
7 changes: 7 additions & 0 deletions build/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,10 @@ 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 change: 1 addition & 0 deletions build/prebuilt-interfaces.manifest
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
interfaces interfaces.xpt
3 changes: 3 additions & 0 deletions config/faster/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ $(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

Expand Down
30 changes: 19 additions & 11 deletions config/makefiles/xpidl/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ dist_idl_dir := $(DIST)/idl
dist_include_dir := $(DIST)/include
dist_xpcrs_dir := $(DIST)/xpcrs
process_py := $(topsrcdir)/python/mozbuild/mozbuild/action/xpidl-process.py
generated_file := $(topobjdir)/xpcom/typelib/xpt/XPTInfo.cpp
code_gen_py := $(topsrcdir)/xpcom/typelib/xpt/tools/xpt.py

# TODO we should use py_action, but that would require extra directories to be
# in the virtualenv.
Expand All @@ -50,27 +48,37 @@ code_gen_py := $(topsrcdir)/xpcom/typelib/xpt/tools/xpt.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@
xpt_files := $(addsuffix .xpt,$(xpidl_modules))
registered_xpt_files := @registered_xpt_files@
xpt_files := $(registered_xpt_files) @xpt_files@

@xpidl_rules@

depends_files := $(foreach root,$(xpidl_modules),$(idl_deps_dir)/$(root).pp)

GARBAGE += $(xpt_files) $(depends_files) $(generated_file)
GARBAGE += $(xpt_files) $(depends_files)

ifdef COMPILE_ENVIRONMENT
xpidl:: $(generated_file)
xpidl:: $(xpt_files) $(chrome_manifests) $(interfaces_manifests)
endif

$(xpt_files): $(process_py) $(call mkdir_deps,$(idl_deps_dir) $(dist_include_dir) $(dist_xpcrs_dir))

$(generated_file): $(xpt_files) $(code_gen_py)
$(REPORT_BUILD)
$(PYTHON_PATH) $(PLY_INCLUDE) \
$(code_gen_py) linkgen \
$(generated_file) $(xpt_files)

-include $(depends_files)

define xpt_deps
Expand Down
9 changes: 9 additions & 0 deletions js/xpconnect/tests/idl/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,12 @@ 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',
]
Loading

0 comments on commit 0ed76ef

Please sign in to comment.