diff --git a/toolkit/Makefile.in b/toolkit/Makefile.in index ca75ddb464fc..1f1c870bd056 100644 --- a/toolkit/Makefile.in +++ b/toolkit/Makefile.in @@ -9,60 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS = \ - components \ - content \ - devtools \ - forgetaboutsite \ - identity \ - locales \ - modules \ - mozapps/downloads \ - mozapps/extensions \ - mozapps/handling \ - mozapps/preferences \ - mozapps/plugins \ - mozapps/shared \ - obsolete \ - profile \ - themes \ - webapps \ - $(NULL) - -DIRS += \ - mozapps/update \ - $(NULL) - -ifdef MOZ_MAINTENANCE_SERVICE -DIRS += \ - components/maintenanceservice \ - $(NULL) -endif - -ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) -PARALLEL_DIRS += system/unixproxy -endif - -ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT))) -PARALLEL_DIRS += system/osxproxy -endif - -ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT))) -PARALLEL_DIRS += system/windowsproxy -endif - -ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT))) -PARALLEL_DIRS += system/androidproxy -endif - -ifdef MOZ_CRASHREPORTER -PARALLEL_DIRS += crashreporter -endif - -DIRS += \ - xre \ - $(NULL) - include $(topsrcdir)/config/rules.mk export:: diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in index c4ccab5a0fe8..2ccee673d8f1 100644 --- a/toolkit/components/Makefile.in +++ b/toolkit/components/Makefile.in @@ -9,91 +9,6 @@ VPATH = @srcdir@ include $(topsrcdir)/config/config.mk -# These component dirs are built for all apps (including suite) - -ifdef MOZ_ENABLE_XREMOTE -PARALLEL_DIRS += remote -endif - -PARALLEL_DIRS += \ - aboutmemory \ - alerts \ - apppicker \ - commandlines \ - console \ - contentprefs \ - cookie \ - downloads \ - exthelper \ - filepicker \ - find \ - intl \ - mediasniffer \ - microformats \ - osfile \ - parentalcontrols \ - passwordmgr \ - perf \ - places \ - prompts \ - protobuf \ - reflect \ - social \ - startup \ - statusfilter \ - telemetry \ - thumbnails \ - typeaheadfind \ - urlformatter \ - viewconfig \ - viewsource \ - $(NULL) - -ifdef BUILD_CTYPES -PARALLEL_DIRS += \ - ctypes \ - $(NULL) -endif - -ifdef MOZ_FEEDS -PARALLEL_DIRS += feeds -endif - -ifdef MOZ_HELP_VIEWER -PARALLEL_DIRS += help -endif - -ifdef MOZ_JSDOWNLOADS -PARALLEL_DIRS += jsdownloads -endif - -ifdef NS_PRINTING -PARALLEL_DIRS += printing -endif - -ifdef MOZ_XUL -PARALLEL_DIRS += \ - autocomplete \ - satchel \ - $(NULL) -endif - -ifdef MOZ_TOOLKIT_SEARCH -PARALLEL_DIRS += search -endif - -ifdef MOZ_URL_CLASSIFIER -PARALLEL_DIRS += url-classifier -endif - -ifdef MOZ_CAPTIVEDETECT -PARALLEL_DIRS += captivedetect -endif - -DIRS += \ - build \ - $(NULL) - EXTRA_COMPONENTS = \ nsDefaultCLH.manifest \ nsDefaultCLH.js \ diff --git a/toolkit/components/aboutmemory/Makefile.in b/toolkit/components/aboutmemory/Makefile.in index bd90c1680bc0..ef40c1e3e807 100644 --- a/toolkit/components/aboutmemory/Makefile.in +++ b/toolkit/components/aboutmemory/Makefile.in @@ -9,6 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS = tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/aboutmemory/moz.build b/toolkit/components/aboutmemory/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/aboutmemory/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/aboutmemory/tests/moz.build b/toolkit/components/aboutmemory/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/aboutmemory/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index be90e177c1fa..642f94c339aa 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -1,4 +1,3 @@ -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -23,15 +22,8 @@ LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT))) XPIDLSRCS += nsINotificationsList.idl -# mac/growl needs to be first for linking to work! -TOOL_DIRS += \ - mac/growl \ - mac \ - $(NULL) endif -TEST_DIRS += test - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/alerts/mac/growl/moz.build b/toolkit/components/alerts/mac/growl/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/alerts/mac/growl/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/alerts/mac/moz.build b/toolkit/components/alerts/mac/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/alerts/mac/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build new file mode 100644 index 000000000000..2f7fadfd4726 --- /dev/null +++ b/toolkit/components/alerts/moz.build @@ -0,0 +1,10 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + # mac/growl needs to be first for linking to work! + TOOL_DIRS += ['mac/growl', 'mac'] + +TEST_DIRS += ['test'] diff --git a/toolkit/components/alerts/test/moz.build b/toolkit/components/alerts/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/alerts/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/apppicker/moz.build b/toolkit/components/apppicker/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/apppicker/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in index cfa0f454f66d..6e999647c0ae 100644 --- a/toolkit/components/autocomplete/Makefile.in +++ b/toolkit/components/autocomplete/Makefile.in @@ -32,6 +32,4 @@ CPPSRCS = \ nsAutoCompleteSimpleResult.cpp \ $(NULL) -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/autocomplete/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/autocomplete/tests/moz.build b/toolkit/components/autocomplete/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/autocomplete/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/build/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/captivedetect/Makefile.in b/toolkit/components/captivedetect/Makefile.in index 87fdfde17a8e..9576f4983889 100644 --- a/toolkit/components/captivedetect/Makefile.in +++ b/toolkit/components/captivedetect/Makefile.in @@ -20,6 +20,4 @@ EXTRA_COMPONENTS = \ captivedetect.js \ $(NULL) -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/captivedetect/moz.build b/toolkit/components/captivedetect/moz.build new file mode 100644 index 000000000000..fb0e881f4277 --- /dev/null +++ b/toolkit/components/captivedetect/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] + diff --git a/toolkit/components/captivedetect/test/moz.build b/toolkit/components/captivedetect/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/captivedetect/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/commandlines/Makefile.in b/toolkit/components/commandlines/Makefile.in index 69456bfc79bf..39d8c3867695 100644 --- a/toolkit/components/commandlines/Makefile.in +++ b/toolkit/components/commandlines/Makefile.in @@ -29,6 +29,4 @@ CPPSRCS = \ nsCommandLine.cpp \ $(NULL) -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/commandlines/moz.build b/toolkit/components/commandlines/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/commandlines/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/commandlines/test/moz.build b/toolkit/components/commandlines/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/commandlines/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/console/Makefile.in b/toolkit/components/console/Makefile.in index d21d3f8b1a1c..2f861059faef 100644 --- a/toolkit/components/console/Makefile.in +++ b/toolkit/components/console/Makefile.in @@ -15,6 +15,4 @@ EXTRA_COMPONENTS = \ jsconsole-clhandler.manifest \ $(NULL) -TEST_DIRS = tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/console/moz.build b/toolkit/components/console/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/console/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/console/tests/moz.build b/toolkit/components/console/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/console/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/contentprefs/Makefile.in b/toolkit/components/contentprefs/Makefile.in index 5203817853f4..9635c927a136 100644 --- a/toolkit/components/contentprefs/Makefile.in +++ b/toolkit/components/contentprefs/Makefile.in @@ -22,6 +22,4 @@ EXTRA_JS_MODULES = \ ContentPrefStore.jsm \ $(NULL) -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/contentprefs/moz.build b/toolkit/components/contentprefs/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/contentprefs/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/contentprefs/tests/moz.build b/toolkit/components/contentprefs/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/contentprefs/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/cookie/moz.build b/toolkit/components/cookie/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/cookie/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in index 80789ec4c0eb..8456e709ca8e 100644 --- a/toolkit/components/ctypes/Makefile.in +++ b/toolkit/components/ctypes/Makefile.in @@ -30,6 +30,4 @@ LOCAL_INCLUDES := \ -I$(topsrcdir)/js/xpconnect/loader \ $(NULL) -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/ctypes/moz.build b/toolkit/components/ctypes/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/ctypes/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/ctypes/tests/moz.build b/toolkit/components/ctypes/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/ctypes/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index cd6ca96d16fc..37f05ff01dc2 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -43,8 +43,6 @@ EXTRA_COMPONENTS = \ $(NULL) endif -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/downloads/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/downloads/test/Makefile.in b/toolkit/components/downloads/test/Makefile.in index 3f0c8025edc7..8cbef3d1c4d5 100644 --- a/toolkit/components/downloads/test/Makefile.in +++ b/toolkit/components/downloads/test/Makefile.in @@ -18,9 +18,5 @@ XPCSHELL_TESTS = \ schema_migration \ $(NULL) -DIRS = \ - browser \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/downloads/test/browser/moz.build b/toolkit/components/downloads/test/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/downloads/test/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/downloads/test/moz.build b/toolkit/components/downloads/test/moz.build new file mode 100644 index 000000000000..bed689a83ccb --- /dev/null +++ b/toolkit/components/downloads/test/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['browser'] diff --git a/toolkit/components/exthelper/moz.build b/toolkit/components/exthelper/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/exthelper/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in index 2c7557ceb476..329d41a6f11e 100644 --- a/toolkit/components/feeds/Makefile.in +++ b/toolkit/components/feeds/Makefile.in @@ -10,10 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS -TOOL_DIRS += test -endif - MODULE = feeds LIBRARY_NAME = feed_s MOZILLA_INTERNAL_API = 1 diff --git a/toolkit/components/feeds/moz.build b/toolkit/components/feeds/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/feeds/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/feeds/test/moz.build b/toolkit/components/feeds/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/feeds/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/filepicker/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/find/moz.build b/toolkit/components/find/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/find/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/help/moz.build b/toolkit/components/help/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/help/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/intl/moz.build b/toolkit/components/intl/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/intl/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/jsdownloads/Makefile.in b/toolkit/components/jsdownloads/Makefile.in index a46146ecc034..51341c30aea1 100644 --- a/toolkit/components/jsdownloads/Makefile.in +++ b/toolkit/components/jsdownloads/Makefile.in @@ -9,8 +9,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = src - -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk + diff --git a/toolkit/components/jsdownloads/moz.build b/toolkit/components/jsdownloads/moz.build new file mode 100644 index 000000000000..dbadf8f2ca85 --- /dev/null +++ b/toolkit/components/jsdownloads/moz.build @@ -0,0 +1,8 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['src'] +TEST_DIRS += ['test'] + diff --git a/toolkit/components/jsdownloads/src/moz.build b/toolkit/components/jsdownloads/src/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/jsdownloads/src/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/jsdownloads/test/Makefile.in b/toolkit/components/jsdownloads/test/Makefile.in index 2b7cabe2598e..7002adf1e0f8 100644 --- a/toolkit/components/jsdownloads/test/Makefile.in +++ b/toolkit/components/jsdownloads/test/Makefile.in @@ -10,8 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = data - XPCSHELL_TESTS = unit include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/jsdownloads/test/data/moz.build b/toolkit/components/jsdownloads/test/data/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/jsdownloads/test/data/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/jsdownloads/test/moz.build b/toolkit/components/jsdownloads/test/moz.build new file mode 100644 index 000000000000..19e05ae28fe7 --- /dev/null +++ b/toolkit/components/jsdownloads/test/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['data'] + diff --git a/toolkit/components/maintenanceservice/moz.build b/toolkit/components/maintenanceservice/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/maintenanceservice/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in index 05e758668b9e..738ba006da8c 100644 --- a/toolkit/components/mediasniffer/Makefile.in +++ b/toolkit/components/mediasniffer/Makefile.in @@ -26,7 +26,5 @@ EXPORTS = \ nsMediaSniffer.h \ $(NULL) -TEST_DIRS += test - include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/mediasniffer/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/mediasniffer/test/moz.build b/toolkit/components/mediasniffer/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/mediasniffer/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/microformats/Makefile.in b/toolkit/components/microformats/Makefile.in index 638217ee47b0..62384fb13309 100644 --- a/toolkit/components/microformats/Makefile.in +++ b/toolkit/components/microformats/Makefile.in @@ -13,6 +13,4 @@ MODULE = microformats EXTRA_JS_MODULES = Microformats.js -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/microformats/moz.build b/toolkit/components/microformats/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/microformats/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/microformats/tests/moz.build b/toolkit/components/microformats/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/microformats/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build new file mode 100644 index 000000000000..ceb40ed7b7da --- /dev/null +++ b/toolkit/components/moz.build @@ -0,0 +1,71 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# These component dirs are built for all apps (including suite) +if CONFIG['MOZ_ENABLE_XREMOTE']: + PARALLEL_DIRS += ['remote'] + +PARALLEL_DIRS += [ + 'aboutmemory', + 'alerts', + 'apppicker', + 'commandlines', + 'console', + 'contentprefs', + 'cookie', + 'downloads', + 'exthelper', + 'filepicker', + 'find', + 'intl', + 'mediasniffer', + 'microformats', + 'osfile', + 'parentalcontrols', + 'passwordmgr', + 'perf', + 'places', + 'prompts', + 'protobuf', + 'reflect', + 'social', + 'startup', + 'statusfilter', + 'telemetry', + 'thumbnails', + 'typeaheadfind', + 'urlformatter', + 'viewconfig', + 'viewsource', +] + +if CONFIG['BUILD_CTYPES']: + PARALLEL_DIRS += ['ctypes'] + +if CONFIG['MOZ_FEEDS']: + PARALLEL_DIRS += ['feeds'] + +if CONFIG['MOZ_HELP_VIEWER']: + PARALLEL_DIRS += ['help'] + +if CONFIG['MOZ_JSDOWNLOADS']: + PARALLEL_DIRS += ['jsdownloads'] + +if CONFIG['NS_PRINTING']: + PARALLEL_DIRS += ['printing'] + +if CONFIG['MOZ_XUL']: + PARALLEL_DIRS += ['autocomplete', 'satchel'] + +if CONFIG['MOZ_TOOLKIT_SEARCH']: + PARALLEL_DIRS += ['search'] + +if CONFIG['MOZ_URL_CLASSIFIER']: + PARALLEL_DIRS += ['url-classifier'] + +if CONFIG['MOZ_CAPTIVEDETECT']: + PARALLEL_DIRS += ['captivedetect'] + +DIRS += ['build'] diff --git a/toolkit/components/osfile/Makefile.in b/toolkit/components/osfile/Makefile.in index e8221255a826..870e4d7e8667 100644 --- a/toolkit/components/osfile/Makefile.in +++ b/toolkit/components/osfile/Makefile.in @@ -1,4 +1,3 @@ -# ***** BEGIN LICENSE BLOCK ***** # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. @@ -19,10 +18,6 @@ EXTRA_PP_JS_MODULES = \ osfile.jsm \ $(NULL) -ifdef ENABLE_TESTS -DIRS += tests -endif - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/components/osfile/moz.build b/toolkit/components/osfile/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/osfile/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/osfile/tests/Makefile.in b/toolkit/components/osfile/tests/Makefile.in index dc20c5cf96a4..e83b9ef4c072 100644 --- a/toolkit/components/osfile/tests/Makefile.in +++ b/toolkit/components/osfile/tests/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ MODULE = test_osfile -DIRS = mochi XPCSHELL_TESTS = xpcshell diff --git a/toolkit/components/osfile/tests/mochi/moz.build b/toolkit/components/osfile/tests/mochi/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/osfile/tests/mochi/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/osfile/tests/moz.build b/toolkit/components/osfile/tests/moz.build new file mode 100644 index 000000000000..d24824bfa45f --- /dev/null +++ b/toolkit/components/osfile/tests/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['mochi'] diff --git a/toolkit/components/parentalcontrols/moz.build b/toolkit/components/parentalcontrols/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/parentalcontrols/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/passwordmgr/Makefile.in b/toolkit/components/passwordmgr/Makefile.in index 008a3be0f0b8..290a3c099d6b 100644 --- a/toolkit/components/passwordmgr/Makefile.in +++ b/toolkit/components/passwordmgr/Makefile.in @@ -34,6 +34,4 @@ EXTRA_PP_COMPONENTS = \ storage-mozStorage.js \ $(NULL) -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/passwordmgr/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in index c3a91692e043..9385d5ddd047 100644 --- a/toolkit/components/passwordmgr/test/Makefile.in +++ b/toolkit/components/passwordmgr/test/Makefile.in @@ -11,11 +11,6 @@ relativesrcdir = @relativesrcdir@ include $(topsrcdir)/config/config.mk -DIRS = \ - browser \ - auth2 \ - $(NULL) - # Module name for xpcshell tests. MODULE = test_passwordmgr XPCSHELL_TESTS = unit diff --git a/toolkit/components/passwordmgr/test/auth2/moz.build b/toolkit/components/passwordmgr/test/auth2/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/passwordmgr/test/auth2/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/passwordmgr/test/browser/moz.build b/toolkit/components/passwordmgr/test/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/passwordmgr/test/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/passwordmgr/test/moz.build b/toolkit/components/passwordmgr/test/moz.build new file mode 100644 index 000000000000..89713bd390b5 --- /dev/null +++ b/toolkit/components/passwordmgr/test/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['browser', 'auth2'] diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/perf/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index f01d22e4c313..bd46c21079da 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -1,4 +1,3 @@ -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -92,8 +91,6 @@ EXTRA_PP_JS_MODULES = \ PlacesUtils.jsm \ $(NULL) -TEST_DIRS += tests - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build new file mode 100644 index 000000000000..f2ab7b7b1368 --- /dev/null +++ b/toolkit/components/places/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['MOZ_PLACES']: + TEST_DIRS += ['tests'] diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in index 84b9a955df9b..3d4a01432f3f 100644 --- a/toolkit/components/places/tests/Makefile.in +++ b/toolkit/components/places/tests/Makefile.in @@ -1,4 +1,3 @@ -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -41,17 +40,6 @@ MOCHITEST_CHROME_FILES = \ mochitest/test_bug_461710_perwindowpb.html \ $(NULL) -DIRS = \ - chrome \ - mochitest/bug_411966 \ - mochitest/bug_461710 \ - browser \ - $(NULL) - -TOOL_DIRS = \ - cpp \ - $(NULL) - include $(topsrcdir)/config/rules.mk libs:: $(XPCSHELL_TESTS_COMMON) diff --git a/toolkit/components/places/tests/browser/moz.build b/toolkit/components/places/tests/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/places/tests/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/places/tests/chrome/moz.build b/toolkit/components/places/tests/chrome/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/places/tests/chrome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/places/tests/cpp/moz.build b/toolkit/components/places/tests/cpp/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/places/tests/cpp/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/places/tests/mochitest/bug_411966/moz.build b/toolkit/components/places/tests/mochitest/bug_411966/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/places/tests/mochitest/bug_411966/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/places/tests/mochitest/bug_461710/moz.build b/toolkit/components/places/tests/mochitest/bug_461710/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/places/tests/mochitest/bug_461710/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/places/tests/moz.build b/toolkit/components/places/tests/moz.build new file mode 100644 index 000000000000..13c82943f352 --- /dev/null +++ b/toolkit/components/places/tests/moz.build @@ -0,0 +1,13 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += [ + 'chrome', + 'mochitest/bug_411966', + 'mochitest/bug_461710', + 'browser', +] + +TEST_TOOL_DIRS += ['cpp'] diff --git a/toolkit/components/printing/moz.build b/toolkit/components/printing/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/printing/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/prompts/Makefile.in b/toolkit/components/prompts/Makefile.in index a46146ecc034..38649037bdb2 100644 --- a/toolkit/components/prompts/Makefile.in +++ b/toolkit/components/prompts/Makefile.in @@ -8,9 +8,4 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -DIRS = src - -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/prompts/moz.build b/toolkit/components/prompts/moz.build new file mode 100644 index 000000000000..a66939e28a8d --- /dev/null +++ b/toolkit/components/prompts/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['src'] +TEST_DIRS += ['test'] diff --git a/toolkit/components/prompts/src/moz.build b/toolkit/components/prompts/src/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/prompts/src/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/prompts/test/moz.build b/toolkit/components/prompts/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/prompts/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/protobuf/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/reflect/Makefile.in b/toolkit/components/reflect/Makefile.in index 7fd3769206b1..b0540400ffe6 100644 --- a/toolkit/components/reflect/Makefile.in +++ b/toolkit/components/reflect/Makefile.in @@ -31,8 +31,4 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_JS_LIBS) \ $(NULL) -#ifdef ENABLE_TESTS -#DIRS += tests -#endif - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/reflect/moz.build b/toolkit/components/reflect/moz.build new file mode 100644 index 000000000000..89251dc3962a --- /dev/null +++ b/toolkit/components/reflect/moz.build @@ -0,0 +1,4 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/remote/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in index 9df813c7b53b..850162c6cc38 100644 --- a/toolkit/components/satchel/Makefile.in +++ b/toolkit/components/satchel/Makefile.in @@ -45,6 +45,4 @@ EXTRA_JS_MODULES = \ nsFormAutoCompleteResult.jsm \ $(NULL) -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/satchel/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/satchel/test/Makefile.in b/toolkit/components/satchel/test/Makefile.in index 5d2c713907ba..b79c839dc6a2 100644 --- a/toolkit/components/satchel/test/Makefile.in +++ b/toolkit/components/satchel/test/Makefile.in @@ -1,4 +1,3 @@ -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -12,9 +11,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk MODULE = test_satchel -DIRS = \ - browser \ - $(NULL) XPCSHELL_TESTS = \ unit \ diff --git a/toolkit/components/satchel/test/browser/moz.build b/toolkit/components/satchel/test/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/satchel/test/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/satchel/test/moz.build b/toolkit/components/satchel/test/moz.build new file mode 100644 index 000000000000..bed689a83ccb --- /dev/null +++ b/toolkit/components/satchel/test/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['browser'] diff --git a/toolkit/components/search/Makefile.in b/toolkit/components/search/Makefile.in index 7d553fd403ee..fdf8e0b6ffa4 100644 --- a/toolkit/components/search/Makefile.in +++ b/toolkit/components/search/Makefile.in @@ -20,6 +20,4 @@ EXTRA_PP_COMPONENTS = \ DEFINES += -DMOZ_DISTRIBUTION_ID=$(MOZ_DISTRIBUTION_ID) -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/search/moz.build b/toolkit/components/search/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/search/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/search/tests/moz.build b/toolkit/components/search/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/search/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/social/Makefile.in b/toolkit/components/social/Makefile.in index 9dccd09dfd51..bde5f2895339 100644 --- a/toolkit/components/social/Makefile.in +++ b/toolkit/components/social/Makefile.in @@ -18,8 +18,4 @@ EXTRA_JS_MODULES = \ MozSocialAPI.jsm \ $(NULL) -TEST_DIRS += \ - test \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/social/moz.build b/toolkit/components/social/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/social/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/social/test/Makefile.in b/toolkit/components/social/test/Makefile.in index 35c2336943e5..230f4259f404 100644 --- a/toolkit/components/social/test/Makefile.in +++ b/toolkit/components/social/test/Makefile.in @@ -10,10 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -# mochitest tests -DIRS += browser \ - $(NULL) - XPCSHELL_TESTS = \ xpcshell \ $(NULL) diff --git a/toolkit/components/social/test/browser/moz.build b/toolkit/components/social/test/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/social/test/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/social/test/moz.build b/toolkit/components/social/test/moz.build new file mode 100644 index 000000000000..bed689a83ccb --- /dev/null +++ b/toolkit/components/social/test/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['browser'] diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in index 398fbb3950ae..d29b408f9768 100644 --- a/toolkit/components/startup/Makefile.in +++ b/toolkit/components/startup/Makefile.in @@ -10,8 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public - MODULE = toolkitcomps LIBRARY_NAME = appstartup_s FORCE_STATIC_LIB = 1 @@ -41,6 +39,4 @@ endif XPCSHELL_TESTS = tests/unit -TEST_DIRS += tests/browser - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build new file mode 100644 index 000000000000..e3d49aba4fe1 --- /dev/null +++ b/toolkit/components/startup/moz.build @@ -0,0 +1,9 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['public'] + +TEST_DIRS += ['tests/browser'] + diff --git a/toolkit/components/startup/public/moz.build b/toolkit/components/startup/public/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/startup/public/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/startup/tests/browser/moz.build b/toolkit/components/startup/tests/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/startup/tests/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/statusfilter/moz.build b/toolkit/components/statusfilter/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/statusfilter/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index 199d39b2d4fc..d16ef607dbee 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -59,8 +59,6 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_JS_LIBS) \ $(NULL) -TEST_DIRS += tests - ifdef MOZILLA_OFFICIAL DEFINES += -DMOZILLA_OFFICIAL endif diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/telemetry/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/telemetry/tests/moz.build b/toolkit/components/telemetry/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/telemetry/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/thumbnails/Makefile.in b/toolkit/components/thumbnails/Makefile.in index 253c1b41a8ed..477666594a7f 100644 --- a/toolkit/components/thumbnails/Makefile.in +++ b/toolkit/components/thumbnails/Makefile.in @@ -19,6 +19,4 @@ EXTRA_JS_MODULES = \ PageThumbs.jsm \ $(NULL) -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/thumbnails/moz.build b/toolkit/components/thumbnails/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/thumbnails/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/thumbnails/test/moz.build b/toolkit/components/thumbnails/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/thumbnails/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/typeaheadfind/moz.build b/toolkit/components/typeaheadfind/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/typeaheadfind/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in index 883c21b618bd..bdb5efa8a0da 100644 --- a/toolkit/components/url-classifier/Makefile.in +++ b/toolkit/components/url-classifier/Makefile.in @@ -1,4 +1,3 @@ -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -61,8 +60,4 @@ EXTRA_JS_MODULES = \ SafeBrowsing.jsm \ $(NULL) -ifdef ENABLE_TESTS -TOOL_DIRS += tests -endif - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build new file mode 100644 index 000000000000..5243706d0ace --- /dev/null +++ b/toolkit/components/url-classifier/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_TOOL_DIRS += ['tests'] diff --git a/toolkit/components/url-classifier/tests/Makefile.in b/toolkit/components/url-classifier/tests/Makefile.in index a115c54d47a2..ef87c9b680b7 100644 --- a/toolkit/components/url-classifier/tests/Makefile.in +++ b/toolkit/components/url-classifier/tests/Makefile.in @@ -16,12 +16,6 @@ MODULE = test_url-classifier MOZILLA_INTERNAL_API = 1 - -# mochitest tests -DIRS += mochitest \ - $(NULL) - -# xpcshell tests XPCSHELL_TESTS=unit # XXX Get this to work in libxul builds. diff --git a/toolkit/components/url-classifier/tests/mochitest/moz.build b/toolkit/components/url-classifier/tests/mochitest/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/url-classifier/tests/mochitest/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/url-classifier/tests/moz.build b/toolkit/components/url-classifier/tests/moz.build new file mode 100644 index 000000000000..ddf140810ffe --- /dev/null +++ b/toolkit/components/url-classifier/tests/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['mochitest'] diff --git a/toolkit/components/urlformatter/Makefile.in b/toolkit/components/urlformatter/Makefile.in index 6f869c4dbc69..607ade210675 100644 --- a/toolkit/components/urlformatter/Makefile.in +++ b/toolkit/components/urlformatter/Makefile.in @@ -21,6 +21,4 @@ EXTRA_COMPONENTS = \ nsURLFormatter.js \ $(NULL) -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/urlformatter/moz.build b/toolkit/components/urlformatter/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/components/urlformatter/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/components/urlformatter/tests/moz.build b/toolkit/components/urlformatter/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/urlformatter/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/viewconfig/moz.build b/toolkit/components/viewconfig/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/viewconfig/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/viewsource/Makefile.in b/toolkit/components/viewsource/Makefile.in index 5cf9d09f4cc3..8127798f241e 100644 --- a/toolkit/components/viewsource/Makefile.in +++ b/toolkit/components/viewsource/Makefile.in @@ -11,6 +11,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/viewsource/moz.build b/toolkit/components/viewsource/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/components/viewsource/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/components/viewsource/test/Makefile.in b/toolkit/components/viewsource/test/Makefile.in index 7de6b9472b2d..4892ebb4b755 100644 --- a/toolkit/components/viewsource/test/Makefile.in +++ b/toolkit/components/viewsource/test/Makefile.in @@ -12,9 +12,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = browser - - MOCHITEST_CHROME_FILES = \ test_428653.xul \ $(NULL) diff --git a/toolkit/components/viewsource/test/browser/moz.build b/toolkit/components/viewsource/test/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/components/viewsource/test/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/components/viewsource/test/moz.build b/toolkit/components/viewsource/test/moz.build new file mode 100644 index 000000000000..bed689a83ccb --- /dev/null +++ b/toolkit/components/viewsource/test/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['browser'] diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in index 54afe5367086..7571b8f42108 100644 --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in @@ -50,8 +50,6 @@ ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif -TEST_DIRS += tests - EXTRA_JS_MODULES = \ debug.js \ DeferredTask.jsm \ diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/content/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/content/tests/Makefile.in b/toolkit/content/tests/Makefile.in index 8b4e7e6d16f6..d3ff1781f4b3 100644 --- a/toolkit/content/tests/Makefile.in +++ b/toolkit/content/tests/Makefile.in @@ -1,4 +1,3 @@ -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -15,6 +14,4 @@ MODULE = test_toolkit_general XPCSHELL_TESTS = unit -DIRS = chrome widgets browser - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in index a53df312ec49..5f05ab1995d2 100644 --- a/toolkit/content/tests/browser/Makefile.in +++ b/toolkit/content/tests/browser/Makefile.in @@ -11,12 +11,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = \ - common \ - data \ - $(NULL) - - MOCHITEST_BROWSER_FILES = \ browser_keyevents_during_autoscrolling.js \ browser_bug295977_autoscroll_overflow.js \ diff --git a/toolkit/content/tests/browser/common/moz.build b/toolkit/content/tests/browser/common/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/content/tests/browser/common/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/content/tests/browser/data/moz.build b/toolkit/content/tests/browser/data/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/content/tests/browser/data/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/content/tests/browser/moz.build b/toolkit/content/tests/browser/moz.build new file mode 100644 index 000000000000..3f6434bbb82c --- /dev/null +++ b/toolkit/content/tests/browser/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['common', 'data'] diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in index c2c1de00b7ce..afaf50c82b6c 100644 --- a/toolkit/content/tests/chrome/Makefile.in +++ b/toolkit/content/tests/chrome/Makefile.in @@ -1,4 +1,3 @@ -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -11,9 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = rtltest rtlchrome - - MOCHITEST_CHROME_FILES = findbar_window.xul \ test_findbar.xul \ findbar_events_window.xul \ diff --git a/toolkit/content/tests/chrome/moz.build b/toolkit/content/tests/chrome/moz.build new file mode 100644 index 000000000000..e1d9a04579af --- /dev/null +++ b/toolkit/content/tests/chrome/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['rtltest', 'rtlchrome'] diff --git a/toolkit/content/tests/chrome/rtlchrome/moz.build b/toolkit/content/tests/chrome/rtlchrome/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/content/tests/chrome/rtlchrome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/content/tests/chrome/rtltest/moz.build b/toolkit/content/tests/chrome/rtltest/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/content/tests/chrome/rtltest/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/content/tests/moz.build b/toolkit/content/tests/moz.build new file mode 100644 index 000000000000..cee6b3a0866a --- /dev/null +++ b/toolkit/content/tests/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['chrome', 'widgets', 'browser'] + diff --git a/toolkit/content/tests/widgets/moz.build b/toolkit/content/tests/widgets/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/content/tests/widgets/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index 9384d39c9278..8bec54f2513d 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -13,24 +13,8 @@ MODULE = crashreporter LIBXUL_LIBRARY = 1 LIBRARY_NAME = exception_handler_s -ifeq ($(OS_ARCH),WINNT) -DIRS += breakpad-windows-libxul -ifdef MOZ_CRASHREPORTER_INJECTOR -DIRS += breakpad-windows-standalone -endif -endif - ifeq ($(OS_ARCH),Darwin) CMMSRCS = mac_utils.mm - -DIRS += \ - google-breakpad/src/common \ - google-breakpad/src/common/mac \ - google-breakpad/src/client \ - google-breakpad/src/client/mac/crash_generation \ - google-breakpad/src/client/mac/handler \ - google-breakpad/src/tools/mac/dump_syms \ - $(NULL) endif ifeq ($(OS_ARCH),Linux) @@ -41,31 +25,14 @@ DEFINES += \ -DXP_LINUX \ -DANDROID_PACKAGE_NAME=\"$(ANDROID_PACKAGE_NAME)\" $(NULL) -DIRS += \ - google-breakpad/src/common \ - google-breakpad/src/common/linux \ - google-breakpad/src/client \ - google-breakpad/src/client/linux/crash_generation \ - google-breakpad/src/client/linux/handler \ - google-breakpad/src/client/linux/minidump_writer \ - google-breakpad/src/tools/linux/dump_syms \ - $(NULL) endif ifeq ($(OS_ARCH),SunOS) # there's no define for this normally DEFINES += -DXP_SOLARIS -DIRS += \ - google-breakpad/src/common \ - google-breakpad/src/common/solaris \ - google-breakpad/src/client \ - google-breakpad/src/client/solaris/handler \ - google-breakpad/src/tools/solaris/dump_syms \ - $(NULL) endif ifeq ($(OS_TARGET),Android) -DIRS += fileid # NDK5 workarounds DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES TARGET_LOCAL_INCLUDES = \ @@ -73,12 +40,6 @@ TARGET_LOCAL_INCLUDES = \ $(NULL) endif -DIRS += client - -ifdef MOZ_CRASHREPORTER_INJECTOR -DIRS += injector -endif - LOCAL_INCLUDES += -I$(srcdir)/google-breakpad/src DEFINES += -DUNICODE -D_UNICODE @@ -104,10 +65,6 @@ EXTRA_JS_MODULES = \ KeyValueParser.jsm \ $(NULL) -ifdef ENABLE_TESTS -TOOL_DIRS = test -endif - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/toolkit/crashreporter/breakpad-windows-libxul/moz.build b/toolkit/crashreporter/breakpad-windows-libxul/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/breakpad-windows-standalone/moz.build b/toolkit/crashreporter/breakpad-windows-standalone/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/breakpad-windows-standalone/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/client/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/fileid/moz.build b/toolkit/crashreporter/fileid/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/fileid/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/moz.build b/toolkit/crashreporter/google-breakpad/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/client/moz.build b/toolkit/crashreporter/google-breakpad/src/client/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index 8b7ca1855153..1bf14be34a3a 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -15,10 +15,6 @@ HOST_LIBRARY_NAME = host_breakpad_common_s LOCAL_INCLUDES = -I$(srcdir)/.. -ifeq (,$(filter-out Darwin Linux,$(OS_ARCH))) -DIRS = dwarf -endif - CPPSRCS = \ md5.cc \ string_conversion.cc \ diff --git a/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build b/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/dwarf/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build new file mode 100644 index 000000000000..361051be5609 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['OS_ARCH'] in ('Darwin', 'Linux'): + DIRS += ['dwarf'] diff --git a/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/glog/moz.build b/toolkit/crashreporter/google-breakpad/src/third_party/glog/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/third_party/glog/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/injector/moz.build b/toolkit/crashreporter/injector/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/injector/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build new file mode 100644 index 000000000000..d89fd269d3b7 --- /dev/null +++ b/toolkit/crashreporter/moz.build @@ -0,0 +1,50 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['OS_ARCH'] == 'WINNT': + DIRS += ['breakpad-windows-libxul'] + + if CONFIG['MOZ_CRASHREPORTER_INJECTOR']: + DIRS += ['breakpad-windows-standalone'] + +elif CONFIG['OS_ARCH'] == 'Darwin': + DIRS += [ + 'google-breakpad/src/common', + 'google-breakpad/src/common/mac', + 'google-breakpad/src/client', + 'google-breakpad/src/client/mac/crash_generation', + 'google-breakpad/src/client/mac/handler', + 'google-breakpad/src/tools/mac/dump_syms', + ] + +elif CONFIG['OS_ARCH'] == 'Linux': + DIRS += [ + 'google-breakpad/src/common', + 'google-breakpad/src/common/linux', + 'google-breakpad/src/client', + 'google-breakpad/src/client/linux/crash_generation', + 'google-breakpad/src/client/linux/handler', + 'google-breakpad/src/client/linux/minidump_writer', + 'google-breakpad/src/tools/linux/dump_syms', + ] + +elif CONFIG['OS_ARCH'] == 'SunOS': + DIRS += [ + 'google-breakpad/src/common', + 'google-breakpad/src/common/solaris', + 'google-breakpad/src/client', + 'google-breakpad/src/client/solaris/handler', + 'google-breakpad/src/tools/solaris/dump_syms', + ] + +if CONFIG['OS_TARGET'] == 'Android': + DIRS += ['fileid'] + +DIRS += ['client'] + +if CONFIG['MOZ_CRASHREPORTER_INJECTOR']: + DIRS += ['injector'] + +TEST_TOOL_DIRS += ['test'] diff --git a/toolkit/crashreporter/test/moz.build b/toolkit/crashreporter/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/crashreporter/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/devtools/Makefile.in b/toolkit/devtools/Makefile.in index a546b455666b..0b24d041f746 100644 --- a/toolkit/devtools/Makefile.in +++ b/toolkit/devtools/Makefile.in @@ -9,12 +9,6 @@ VPATH = @srcdir@ include $(topsrcdir)/config/config.mk -PARALLEL_DIRS += \ - debugger \ - sourcemap \ - webconsole \ - $(NULL) - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/debugger/Makefile.in b/toolkit/devtools/debugger/Makefile.in index 3828f736b780..3cfca9d4d7d9 100644 --- a/toolkit/devtools/debugger/Makefile.in +++ b/toolkit/devtools/debugger/Makefile.in @@ -32,8 +32,6 @@ XPIDLSRCS = \ nsIJSInspector.idl \ $(NULL) -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/debugger/moz.build b/toolkit/devtools/debugger/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/devtools/debugger/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/devtools/debugger/tests/moz.build b/toolkit/devtools/debugger/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/devtools/debugger/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/devtools/moz.build b/toolkit/devtools/moz.build new file mode 100644 index 000000000000..bfd48c51e7f4 --- /dev/null +++ b/toolkit/devtools/moz.build @@ -0,0 +1,10 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +PARALLEL_DIRS += [ + 'debugger', + 'sourcemap', + 'webconsole', +] diff --git a/toolkit/devtools/sourcemap/Makefile.in b/toolkit/devtools/sourcemap/Makefile.in index b1987c00443f..8890154f78a5 100644 --- a/toolkit/devtools/sourcemap/Makefile.in +++ b/toolkit/devtools/sourcemap/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -# No tests yet -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/sourcemap/moz.build b/toolkit/devtools/sourcemap/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/devtools/sourcemap/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/devtools/sourcemap/tests/moz.build b/toolkit/devtools/sourcemap/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/devtools/sourcemap/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/devtools/webconsole/Makefile.in b/toolkit/devtools/webconsole/Makefile.in index 078d9a29fb32..d54ea2ef5ff8 100644 --- a/toolkit/devtools/webconsole/Makefile.in +++ b/toolkit/devtools/webconsole/Makefile.in @@ -9,10 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifneq (Android,$(OS_TARGET)) - TEST_DIRS += test -endif - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/devtools/webconsole/moz.build b/toolkit/devtools/webconsole/moz.build new file mode 100644 index 000000000000..a98b3ef2baa2 --- /dev/null +++ b/toolkit/devtools/webconsole/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['OS_TARGET'] != 'Android': + TEST_DIRS += ['test'] diff --git a/toolkit/devtools/webconsole/test/moz.build b/toolkit/devtools/webconsole/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/devtools/webconsole/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/forgetaboutsite/Makefile.in b/toolkit/forgetaboutsite/Makefile.in index 9af2cdebce96..fc9caaf70010 100644 --- a/toolkit/forgetaboutsite/Makefile.in +++ b/toolkit/forgetaboutsite/Makefile.in @@ -15,6 +15,4 @@ EXTRA_JS_MODULES := \ ForgetAboutSite.jsm \ $(NULL) -TEST_DIRS := test - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/forgetaboutsite/moz.build b/toolkit/forgetaboutsite/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/forgetaboutsite/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/forgetaboutsite/test/Makefile.in b/toolkit/forgetaboutsite/test/Makefile.in index 722130c01923..f78a5d133fce 100644 --- a/toolkit/forgetaboutsite/test/Makefile.in +++ b/toolkit/forgetaboutsite/test/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk MODULE := forgetaboutsite -DIRS := browser XPCSHELL_TESTS := unit include $(topsrcdir)/config/rules.mk diff --git a/toolkit/forgetaboutsite/test/browser/moz.build b/toolkit/forgetaboutsite/test/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/forgetaboutsite/test/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/forgetaboutsite/test/moz.build b/toolkit/forgetaboutsite/test/moz.build new file mode 100644 index 000000000000..09be12395ec7 --- /dev/null +++ b/toolkit/forgetaboutsite/test/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['browser'] diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in index 4d71a31f2e5a..2c54d37bb507 100644 --- a/toolkit/identity/Makefile.in +++ b/toolkit/identity/Makefile.in @@ -43,8 +43,4 @@ EXTRA_JS_MODULES = \ JS_MODULES_PATH = $(FINAL_TARGET)/modules/identity -ifdef ENABLE_TESTS - DIRS += tests -endif - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/identity/moz.build b/toolkit/identity/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/identity/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/identity/tests/Makefile.in b/toolkit/identity/tests/Makefile.in index 85daa60f7400..3fc38ca2f91e 100644 --- a/toolkit/identity/tests/Makefile.in +++ b/toolkit/identity/tests/Makefile.in @@ -13,6 +13,4 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_identity XPCSHELL_TESTS = unit -DIRS = chrome mochitest - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/identity/tests/chrome/moz.build b/toolkit/identity/tests/chrome/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/identity/tests/chrome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/identity/tests/mochitest/moz.build b/toolkit/identity/tests/mochitest/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/identity/tests/mochitest/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/identity/tests/moz.build b/toolkit/identity/tests/moz.build new file mode 100644 index 000000000000..3653c900188c --- /dev/null +++ b/toolkit/identity/tests/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['chrome', 'mochitest'] diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index c9cf15902a24..c8a39b92a1eb 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -17,12 +17,6 @@ LIBRARY_NAME = xul FORCE_SHARED_LIB = 1 MOZILLA_INTERNAL_API = 1 -ifdef MOZ_METRO -ifeq ($(OS_ARCH),WINNT) -DIRS += winvccorlib -endif -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) # This is going to be a framework named "XUL", not an ordinary library named # "libxul.dylib" diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build new file mode 100644 index 000000000000..f87ffde2cd50 --- /dev/null +++ b/toolkit/library/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['MOZ_METRO'] and CONFIG['OS_ARCH'] == 'WINNT': + DIRS += ['winvccorlib'] diff --git a/toolkit/library/winvccorlib/moz.build b/toolkit/library/winvccorlib/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/library/winvccorlib/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/locales/moz.build b/toolkit/locales/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/locales/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/modules/Makefile.in b/toolkit/modules/Makefile.in index 4f4341345702..ee6ebff299f4 100644 --- a/toolkit/modules/Makefile.in +++ b/toolkit/modules/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += tests - EXTRA_JS_MODULES := \ NewTabUtils.jsm \ Sqlite.jsm \ diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/modules/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/modules/tests/moz.build b/toolkit/modules/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/modules/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/moz.build b/toolkit/moz.build new file mode 100644 index 000000000000..0b9b62a475d9 --- /dev/null +++ b/toolkit/moz.build @@ -0,0 +1,43 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +PARALLEL_DIRS += [ + 'components', + 'content', + 'devtools', + 'forgetaboutsite', + 'identity', + 'locales', + 'modules', + 'mozapps/downloads', + 'mozapps/extensions', + 'mozapps/handling', + 'mozapps/preferences', + 'mozapps/plugins', + 'mozapps/shared', + 'obsolete', + 'profile', + 'themes', + 'webapps', +] + +DIRS += ['mozapps/update'] + +if CONFIG['MOZ_MAINTENANCE_SERVICE']: + DIRS += ['components/maintenanceservice'] + +DIRS += ['xre'] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'qt'): + PARALLEL_DIRS += ['system/unixproxy'] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + PARALLEL_DIRS += ['system/osxproxy'] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': + PARALLEL_DIRS += ['system/windowsproxy'] +elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + PARALLEL_DIRS += ['system/androidproxy'] + +if CONFIG['MOZ_CRASHREPORTER']: + PARALLEL_DIRS += ['crashreporter'] diff --git a/toolkit/mozapps/downloads/Makefile.in b/toolkit/mozapps/downloads/Makefile.in index 6115557efe65..f7bb04f596dd 100644 --- a/toolkit/mozapps/downloads/Makefile.in +++ b/toolkit/mozapps/downloads/Makefile.in @@ -27,6 +27,4 @@ EXTRA_JS_MODULES += \ $(NULL) endif -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/downloads/moz.build b/toolkit/mozapps/downloads/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/mozapps/downloads/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/mozapps/downloads/tests/Makefile.in b/toolkit/mozapps/downloads/tests/Makefile.in index 0e72823e12b1..b683377cd8bd 100644 --- a/toolkit/mozapps/downloads/tests/Makefile.in +++ b/toolkit/mozapps/downloads/tests/Makefile.in @@ -17,8 +17,6 @@ XPCSHELL_TESTS = \ unit \ $(NULL) -DIRS += chrome - include $(topsrcdir)/config/rules.mk libs:: diff --git a/toolkit/mozapps/downloads/tests/chrome/moz.build b/toolkit/mozapps/downloads/tests/chrome/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/downloads/tests/chrome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/downloads/tests/moz.build b/toolkit/mozapps/downloads/tests/moz.build new file mode 100644 index 000000000000..4e26b457df65 --- /dev/null +++ b/toolkit/mozapps/downloads/tests/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['chrome'] diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in index 5e08f6f007e1..526ca30182d1 100644 --- a/toolkit/mozapps/extensions/Makefile.in +++ b/toolkit/mozapps/extensions/Makefile.in @@ -61,8 +61,6 @@ EXTRA_JS_MODULES = \ SpellCheckDictionaryBootstrap.js \ $(NULL) -TEST_DIRS += test - EXTRA_DSO_LDOPTS = \ $(MOZ_JS_LIBS) \ $(MOZ_UNICHARUTIL_LIBS) \ diff --git a/toolkit/mozapps/extensions/moz.build b/toolkit/mozapps/extensions/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/mozapps/extensions/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/mozapps/extensions/test/Makefile.in b/toolkit/mozapps/extensions/test/Makefile.in index c928b2fdfc8c..39b284ee347a 100644 --- a/toolkit/mozapps/extensions/test/Makefile.in +++ b/toolkit/mozapps/extensions/test/Makefile.in @@ -16,12 +16,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_extensionmanager -DIRS += \ - xpinstall \ - browser \ - mochitest \ - $(NULL) - XPCSHELL_TESTS = \ xpcshell \ xpcshell-unpack \ diff --git a/toolkit/mozapps/extensions/test/browser/moz.build b/toolkit/mozapps/extensions/test/browser/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/extensions/test/browser/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/extensions/test/mochitest/moz.build b/toolkit/mozapps/extensions/test/mochitest/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/extensions/test/mochitest/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/extensions/test/moz.build b/toolkit/mozapps/extensions/test/moz.build new file mode 100644 index 000000000000..b12886374080 --- /dev/null +++ b/toolkit/mozapps/extensions/test/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['MOZ_BUILD_APP'] != 'mobile': + DIRS += ['xpinstall', 'browser', 'mochitest'] diff --git a/toolkit/mozapps/extensions/test/xpinstall/moz.build b/toolkit/mozapps/extensions/test/xpinstall/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/extensions/test/xpinstall/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/handling/moz.build b/toolkit/mozapps/handling/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/handling/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/plugins/Makefile.in b/toolkit/mozapps/plugins/Makefile.in index 9012f1e16671..4bfb0d720092 100644 --- a/toolkit/mozapps/plugins/Makefile.in +++ b/toolkit/mozapps/plugins/Makefile.in @@ -12,6 +12,4 @@ include $(DEPTH)/config/autoconf.mk EXTRA_COMPONENTS = pluginGlue.manifest -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/plugins/moz.build b/toolkit/mozapps/plugins/moz.build new file mode 100644 index 000000000000..d0193307adba --- /dev/null +++ b/toolkit/mozapps/plugins/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['tests'] diff --git a/toolkit/mozapps/plugins/tests/moz.build b/toolkit/mozapps/plugins/tests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/plugins/tests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/preferences/moz.build b/toolkit/mozapps/preferences/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/preferences/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/shared/Makefile.in b/toolkit/mozapps/shared/Makefile.in index cef5d2eac55c..b4e3726575d4 100644 --- a/toolkit/mozapps/shared/Makefile.in +++ b/toolkit/mozapps/shared/Makefile.in @@ -20,8 +20,6 @@ EXTRA_JS_MODULES = \ FileUtils.jsm \ $(NULL) -TEST_DIRS += test/chrome - ifdef ENABLE_TESTS XPCSHELL_TESTS = test/unit endif diff --git a/toolkit/mozapps/shared/moz.build b/toolkit/mozapps/shared/moz.build new file mode 100644 index 000000000000..8ec0edd26eb6 --- /dev/null +++ b/toolkit/mozapps/shared/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test/chrome'] diff --git a/toolkit/mozapps/shared/test/chrome/moz.build b/toolkit/mozapps/shared/test/chrome/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/shared/test/chrome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/update/Makefile.in b/toolkit/mozapps/update/Makefile.in index 7740656a8f57..21f205938c54 100644 --- a/toolkit/mozapps/update/Makefile.in +++ b/toolkit/mozapps/update/Makefile.in @@ -19,10 +19,6 @@ EXTRA_COMPONENTS = \ $(NULL) ifdef MOZ_UPDATER -ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -DIRS += common -DIRS += updater -endif XPIDLSRCS += nsIUpdateService.idl @@ -35,26 +31,6 @@ EXTRA_COMPONENTS += \ nsUpdateServiceStub.js \ $(NULL) -else - -# If only the maintenance service is installed and not -# the updater, then the maintenance service may still be -# used for other things. We need to build update/common -# which the maintenance service uses. -ifdef MOZ_MAINTENANCE_SERVICE -ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -DIRS += common -endif -endif -endif - -TEST_DIRS += test_timermanager -# Update tests require the updater binary -ifdef MOZ_UPDATER -TEST_DIRS += test -ifdef MOZ_MAINTENANCE_SERVICE -TEST_DIRS += test_svc -endif endif include $(topsrcdir)/config/rules.mk diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/update/common/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/update/moz.build b/toolkit/mozapps/update/moz.build new file mode 100644 index 000000000000..a74888d6c584 --- /dev/null +++ b/toolkit/mozapps/update/moz.build @@ -0,0 +1,23 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': + if CONFIG['MOZ_UPDATER']: + DIRS += ['common', 'updater'] + elif CONFIG['MOZ_MAINTENANCE_SERVICE']: + # If only the maintenance service is installed and not + # the updater, then the maintenance service may still be + # used for other things. We need to build update/common + # which the maintenance service uses. + DIRS += ['common'] + +TEST_DIRS += ['test_timermanager'] + +# Update tests require the updater binary +if CONFIG['MOZ_UPDATER']: + TEST_DIRS += ['test'] + + if CONFIG['MOZ_MAINTENANCE_SERVICE']: + TEST_DIRS += ['test_svc'] diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in index 7bb52cc876fc..4997412aeb22 100644 --- a/toolkit/mozapps/update/test/Makefile.in +++ b/toolkit/mozapps/update/test/Makefile.in @@ -30,10 +30,6 @@ DEFINES += -DMOZ_MAINTENANCE_SERVICE=$(MOZ_MAINTENANCE_SERVICE) endif ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -DIRS = \ - chrome \ - $(NULL) - CPPSRCS = \ TestAUSReadStrings.cpp \ TestAUSHelper.cpp \ diff --git a/toolkit/mozapps/update/test/chrome/moz.build b/toolkit/mozapps/update/test/chrome/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/update/test/chrome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/update/test/moz.build b/toolkit/mozapps/update/test/moz.build new file mode 100644 index 000000000000..d14baeb3969e --- /dev/null +++ b/toolkit/mozapps/update/test/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': + DIRS += ['chrome'] diff --git a/toolkit/mozapps/update/test_svc/moz.build b/toolkit/mozapps/update/test_svc/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/update/test_svc/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/update/test_timermanager/moz.build b/toolkit/mozapps/update/test_timermanager/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/update/test_timermanager/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/mozapps/update/updater/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/obsolete/moz.build b/toolkit/obsolete/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/obsolete/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in index bb4f6178c328..0e741a4b6d62 100644 --- a/toolkit/profile/Makefile.in +++ b/toolkit/profile/Makefile.in @@ -36,8 +36,6 @@ DEFINES += -DIMPL_XREAPI GARBAGE += nsProfileLock.cpp -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk export:: $(topsrcdir)/profile/dirserviceprovider/src/nsProfileLock.cpp diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/profile/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/profile/test/moz.build b/toolkit/profile/test/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/profile/test/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/system/androidproxy/moz.build b/toolkit/system/androidproxy/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/system/androidproxy/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/system/dbus/moz.build b/toolkit/system/dbus/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/system/dbus/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/system/gnome/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/system/osxproxy/moz.build b/toolkit/system/osxproxy/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/system/osxproxy/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/system/unixproxy/moz.build b/toolkit/system/unixproxy/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/system/unixproxy/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/system/windowsproxy/moz.build b/toolkit/system/windowsproxy/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/system/windowsproxy/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/Makefile.in b/toolkit/themes/Makefile.in index 018e6f813295..51341c30aea1 100644 --- a/toolkit/themes/Makefile.in +++ b/toolkit/themes/Makefile.in @@ -9,33 +9,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -# Theme Selection -# -# MacOS X osx (toolkit/themes/osx) -# Windows windows (toolkit/themes/windows) -# GNOME/Linux windows (toolkit/themes/windows) + -# linux overrides (toolkit/themes/linux) -# OS/2 windows (toolkit/themes/windows) + -# os2 overrides (toolkit/themes/os2) -# faststripe windows + faststripe (no native theme components) - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -DIRS = osx -else - -DIRS = windows - -ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) -DIRS += linux -endif -ifneq (,$(filter os2,$(MOZ_WIDGET_TOOLKIT))) -DIRS += os2/global -endif -ifdef MOZ_THEME_FASTSTRIPE -DIRS += faststripe/global -endif - -endif - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/themes/faststripe/global/moz.build b/toolkit/themes/faststripe/global/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/faststripe/global/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/linux/Makefile.in b/toolkit/themes/linux/Makefile.in index 02289c730f5c..e5c6e187e363 100644 --- a/toolkit/themes/linux/Makefile.in +++ b/toolkit/themes/linux/Makefile.in @@ -9,10 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = global mozapps - -ifdef MOZ_HELP_VIEWER -DIRS += help -endif - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/themes/linux/global/moz.build b/toolkit/themes/linux/global/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/linux/global/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/linux/help/moz.build b/toolkit/themes/linux/help/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/linux/help/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/linux/moz.build b/toolkit/themes/linux/moz.build new file mode 100644 index 000000000000..bb7a5866f4a7 --- /dev/null +++ b/toolkit/themes/linux/moz.build @@ -0,0 +1,9 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['global', 'mozapps'] + +if CONFIG['MOZ_HELP_VIEWER']: + DIRS += ['help'] diff --git a/toolkit/themes/linux/mozapps/moz.build b/toolkit/themes/linux/mozapps/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/linux/mozapps/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/moz.build b/toolkit/themes/moz.build new file mode 100644 index 000000000000..ab72beaaabd6 --- /dev/null +++ b/toolkit/themes/moz.build @@ -0,0 +1,28 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Theme Selection +# +# MacOS X osx (toolkit/themes/osx) +# Windows windows (toolkit/themes/windows) +# GNOME/Linux windows (toolkit/themes/windows) + +# linux overrides (toolkit/themes/linux) +# OS/2 windows (toolkit/themes/windows) + +# os2 overrides (toolkit/themes/os2) +# faststripe windows + faststripe (no native theme components) + +toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] + +if toolkit == 'cocoa': + DIRS += ['osx'] +else: + DIRS += ['windows'] + + if toolkit in ('gtk2', 'qt'): + DIRS += ['linux'] + elif toolkit == 'os2': + DIRS += ['os2/global'] + elif CONFIG['MOZ_THEME_FASTSTRIPE']: + DIRS += ['faststripe/global'] diff --git a/toolkit/themes/os2/global/moz.build b/toolkit/themes/os2/global/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/os2/global/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/osx/Makefile.in b/toolkit/themes/osx/Makefile.in index 6f5ac3cd64bf..e5c6e187e363 100644 --- a/toolkit/themes/osx/Makefile.in +++ b/toolkit/themes/osx/Makefile.in @@ -9,12 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = global mozapps - -ifdef MOZ_HELP_VIEWER -DIRS += help -endif - -TEST_DIRS += mochitests - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/themes/osx/global/moz.build b/toolkit/themes/osx/global/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/osx/global/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/osx/help/moz.build b/toolkit/themes/osx/help/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/osx/help/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/osx/mochitests/moz.build b/toolkit/themes/osx/mochitests/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/osx/mochitests/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/osx/moz.build b/toolkit/themes/osx/moz.build new file mode 100644 index 000000000000..9d8313049517 --- /dev/null +++ b/toolkit/themes/osx/moz.build @@ -0,0 +1,11 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['global', 'mozapps'] + +if CONFIG['MOZ_HELP_VIEWER']: + DIRS += ['help'] + +TEST_DIRS += ['mochitests'] diff --git a/toolkit/themes/osx/mozapps/moz.build b/toolkit/themes/osx/mozapps/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/osx/mozapps/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/windows/Makefile.in b/toolkit/themes/windows/Makefile.in index 02289c730f5c..e5c6e187e363 100644 --- a/toolkit/themes/windows/Makefile.in +++ b/toolkit/themes/windows/Makefile.in @@ -9,10 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = global mozapps - -ifdef MOZ_HELP_VIEWER -DIRS += help -endif - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/themes/windows/global/moz.build b/toolkit/themes/windows/global/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/windows/global/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/windows/help/moz.build b/toolkit/themes/windows/help/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/windows/help/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/themes/windows/moz.build b/toolkit/themes/windows/moz.build new file mode 100644 index 000000000000..bb7a5866f4a7 --- /dev/null +++ b/toolkit/themes/windows/moz.build @@ -0,0 +1,9 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +DIRS += ['global', 'mozapps'] + +if CONFIG['MOZ_HELP_VIEWER']: + DIRS += ['help'] diff --git a/toolkit/themes/windows/mozapps/moz.build b/toolkit/themes/windows/mozapps/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/themes/windows/mozapps/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild new file mode 100644 index 000000000000..997ef811cd30 --- /dev/null +++ b/toolkit/toolkit.mozbuild @@ -0,0 +1,251 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['LIBXUL_SDK']: + error('toolkit.mozbuild is not compatible with --enable-libxul-sdk=') + +if not CONFIG['MOZ_NATIVE_NSPR']: + add_tier_dir('nspr', 'nsprpub', static=True) + add_tier_dir('nspr', 'config/nspr') + +if not CONFIG['MOZ_NATIVE_SQLITE']: + add_tier_dir('nss', 'db/sqlite3/src') + +if CONFIG['MOZ_PSM'] and not CONFIG['MOZ_NATIVE_NSS']: + add_tier_dir('nss', 'security/build') + +include('/config/js/js.mozbuild') + +if CONFIG['NS_TRACE_MALLOC']: + add_tier_dir('platform', 'tools/trace-malloc/lib') + +if CONFIG['MOZ_DMD']: + add_tier_dir('platform', 'memory/replace/dmd') + +if CONFIG['MOZ_TREE_FREETYPE']: + add_tier_dir('platform', 'modules/freetype2', static=True) + +add_tier_dir('platform', 'xpcom') + +add_tier_dir('platform', [ + 'modules/libpref', + 'intl', + 'netwerk', +]) + +if CONFIG['MOZ_AUTH_EXTENSION']: + add_tier_dir('platform', 'extensions/auth') + +# External/3rd party libraries. + +if not CONFIG['MOZ_NATIVE_JPEG']: + add_tier_dir('platform', 'media/libjpeg') + +if CONFIG['MOZ_UPDATER']: + if not CONFIG['MOZ_NATIVE_BZ2']: + add_tier_dir('platform', 'modules/libbz2') + + add_tier_dir('platform', 'other-licenses/bsdiff') + +add_tier_dir('platform', 'gfx/qcms') + +# Gecko/Core components. + +add_tier_dir('platform', ['ipc', 'js/ipc']) + +add_tier_dir('platform', ['hal', 'js/xpconnect', 'intl/chardet']) + +if CONFIG['MOZ_ENABLE_GTK2'] and CONFIG['MOZ_X11']: + add_tier_dir('platform', 'widget/gtkxtbin') + +add_tier_dir('platform', ['modules/libjar', 'storage']) + +if CONFIG['MOZ_PERMISSIONS']: + add_tier_dir('platform', ['extensions/cookie', 'extensions/permissions']) + +add_tier_dir('platform', 'rdf') + +if CONFIG['MOZ_JSDEBUGGER']: + add_tier_dir('platform', 'js/jsd') + +if CONFIG['MOZ_VORBIS']: + add_tier_dir('platform', 'media/libvorbis') + +if CONFIG['MOZ_TREMOR']: + add_tier_dir('platform', 'media/libtremor') + +if CONFIG['MOZ_OPUS']: + add_tier_dir('platform', 'media/libopus') + +if CONFIG['MOZ_WEBM']: + add_tier_dir('platform', 'media/libnestegg') + +if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']: + add_tier_dir('platform', 'media/libvpx') + +if CONFIG['MOZ_OGG']: + add_tier_dir('platform', ['media/libogg', 'media/libtheora']) + +if CONFIG['MOZ_SYDNEYAUDIO']: + add_tier_dir('platform', 'media/libsydneyaudio') + +if CONFIG['MOZ_WEBRTC']: + add_tier_dir('platform', [ + 'media/webrtc', + 'media/mtransport/third_party', + 'media/mtransport/build', + 'media/mtransport/standalone', + ]) + +if CONFIG['MOZ_SPEEX_RESAMPLER']: + add_tier_dir('platform', 'media/libspeex_resampler') + +if CONFIG['MOZ_SOUNDTOUCH']: + add_tier_dir('platform', 'media/libsoundtouch') + +if CONFIG['MOZ_CUBEB']: + add_tier_dir('platform', 'media/libcubeb') + +if CONFIG['MOZ_OMX_PLUGIN']: + add_tier_dir('platform', [ + 'media/omx-plugin/lib/ics/libutils', + 'media/omx-plugin/lib/ics/libstagefright', + 'media/omx-plugin/lib/gb/libutils', + 'media/omx-plugin/lib/gb/libstagefright', + 'media/omx-plugin/lib/gb/libstagefright_color_conversion', + 'media/omx-plugin/lib/gb235/libstagefright', + 'media/omx-plugin/lib/froyo/libstagefright', + 'media/omx-plugin', + 'media/omx-plugin/gb', + 'media/omx-plugin/gb235', + 'media/omx-plugin/froyo', + 'media/omx-plugin/lib/hc/libstagefright', + 'media/omx-plugin/hc', + 'media/omx-plugin/sony', + ]) + +if not CONFIG['MOZ_NATIVE_PNG']: + add_tier_dir('platform', 'media/libpng') + +if CONFIG['ENABLE_TESTS']: + add_tier_dir('platform', 'testing/specialpowers') + +if CONFIG['MOZ_ENABLE_GTEST']: + add_tier_dir('platform', 'testing/gtest') + +add_tier_dir('platform', [ + 'uriloader', + 'caps', + 'parser', + 'gfx', + 'image', + 'dom', + 'view', + 'widget', + 'content', + 'editor', + 'layout', + 'docshell', + 'embedding', + 'xpfe/appshell' +]) + +# This needs to be built after the gfx/ directory +# to ensure all dependencies for skia (e.g. mozalloc, xpcom) +# have been built +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': + add_tier_dir('platform', 'other-licenses/skia-npapi') + +if CONFIG['MOZ_UNIVERSALCHARDET']: + add_tier_dir('platform', 'extensions/universalchardet') + +if CONFIG['ACCESSIBILITY']: + add_tier_dir('platform', 'accessible') + +# toolkit + +add_tier_dir('platform', 'profile') + +# This must precede xpfe. +if CONFIG['MOZ_JPROF']: + add_tier_dir('platform', 'tools/jprof') + +add_tier_dir('platform', 'tools/profiler') + +add_tier_dir('platform', 'xpfe/components') + +if CONFIG['MOZ_ENABLE_XREMOTE']: + add_tier_dir('platform', 'widget/xremoteclient') + +if CONFIG['MOZ_SPELLCHECK']: + add_tier_dir('platform', 'extensions/spellcheck') + +if CONFIG['MOZ_PSM']: + add_tier_dir('platform', 'security/manager') +else: + add_tier_dir('platform', [ + 'security/manager/boot/public', + 'security/manager/ssl/public', + ]) + +if CONFIG['MOZ_UPDATER']: + add_tier_dir('platform', 'modules/libmar') + +add_tier_dir('platform', 'toolkit') + +if CONFIG['MOZ_PREF_EXTENSIONS']: + add_tier_dir('platform', 'extensions/pref') + +add_tier_dir('platform', 'services') +add_tier_dir('platform', 'startupcache') +add_tier_dir('platform', 'js/ductwork/debugger') +add_tier_dir('platform', 'other-licenses/snappy') + +if CONFIG['MOZ_GIO_COMPONENT']: + add_tier_dir('platform', 'extensions/gio') + +# Applications can cheat and ask for code to be +# built before libxul so it can be linked into libxul. +add_tier_dir('platform', app_libxul_dirs) + +add_tier_dir('platform', 'toolkit/library') +add_tier_dir('platform', 'xpcom/stub') + +if CONFIG['MOZ_REPLACE_MALLOC']: + add_tier_dir('platform', 'memory/replace') + +if CONFIG['NS_TRACE_MALLOC']: + add_tier_dir('platform', 'tools/trace-malloc') + +if CONFIG['MOZ_ENABLE_GNOME_COMPONENT']: + add_tier_dir('platform', 'toolkit/system/gnome') + +# if libconic is present, it will do its own network monitoring +if not CONFIG['MOZ_ENABLE_LIBCONIC'] and CONFIG['MOZ_ENABLE_DBUS']: + add_tier_dir('platform', 'toolkit/system/dbus') + +add_tier_dir('platform', 'addon-sdk') + +if CONFIG['MOZ_MAPINFO']: + add_tier_dir('platform', 'tools/codesighs') + +if CONFIG['ENABLE_MARIONETTE']: + add_tier_dir('platform', 'testing/marionette') + +if CONFIG['ENABLE_TESTS']: + add_tier_dir('platform', [ + 'testing/mochitest', + 'testing/xpcshell', + 'testing/tools/screenshot', + 'testing/peptest', + 'testing/mozbase', + 'testing/modules', + ]) + + if CONFIG['MOZ_WEBRTC']: + add_tier_dir('platform', [ + 'media/webrtc/signaling/test', + 'media/mtransport/test', + ]) diff --git a/toolkit/webapps/moz.build b/toolkit/webapps/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/webapps/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index f370de588c6e..ef617fcfbd61 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -164,8 +164,6 @@ SHARED_LIBRARY_LIBS += \ endif endif -TEST_DIRS += test - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build new file mode 100644 index 000000000000..493f80dc6efc --- /dev/null +++ b/toolkit/xre/moz.build @@ -0,0 +1,6 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +TEST_DIRS += ['test'] diff --git a/toolkit/xre/test/Makefile.in b/toolkit/xre/test/Makefile.in index c9b15ade0196..6e9fbae2e99a 100644 --- a/toolkit/xre/test/Makefile.in +++ b/toolkit/xre/test/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_xulapp -ifeq ($(OS_ARCH),WINNT) -DIRS += win -endif - MOCHITEST_FILES = \ test_fpuhandler.html \ $(NULL) diff --git a/toolkit/xre/test/moz.build b/toolkit/xre/test/moz.build new file mode 100644 index 000000000000..e069a67a23d7 --- /dev/null +++ b/toolkit/xre/test/moz.build @@ -0,0 +1,7 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +if CONFIG['OS_ARCH'] == 'WINNT': + DIRS += ['win'] diff --git a/toolkit/xre/test/win/moz.build b/toolkit/xre/test/win/moz.build new file mode 100644 index 000000000000..58ce5e273390 --- /dev/null +++ b/toolkit/xre/test/win/moz.build @@ -0,0 +1,5 @@ +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +