From 8f9112102de3b3c118b11d30842a9847b3340688 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Mon, 25 Feb 2013 12:47:18 -0800 Subject: [PATCH] Bug 784841 - Part 18d: Convert /browser; r=gavin f=Ms2ger --- browser/Makefile.in | 23 --------------- browser/app.mozbuild | 21 ++++++++++++++ browser/app/Makefile.in | 1 - browser/app/moz.build | 6 ++++ browser/app/profile/extensions/Makefile.in | 5 ---- browser/app/profile/extensions/moz.build | 6 ++++ .../moz.build | 5 ++++ browser/base/Makefile.in | 2 -- browser/base/content/test/Makefile.in | 5 ---- browser/base/content/test/moz.build | 7 +++++ browser/base/content/test/newtab/moz.build | 5 ++++ browser/base/content/test/social/moz.build | 5 ++++ browser/base/moz.build | 6 ++++ browser/branding/aurora/Makefile.in | 5 ---- browser/branding/aurora/content/moz.build | 5 ++++ browser/branding/aurora/locales/moz.build | 5 ++++ browser/branding/aurora/moz.build | 7 +++++ browser/branding/nightly/Makefile.in | 5 ---- browser/branding/nightly/content/moz.build | 5 ++++ browser/branding/nightly/locales/moz.build | 5 ++++ browser/branding/nightly/moz.build | 6 ++++ browser/branding/official/Makefile.in | 5 ---- browser/branding/official/content/moz.build | 5 ++++ browser/branding/official/locales/moz.build | 5 ++++ browser/branding/official/moz.build | 7 +++++ browser/branding/unofficial/Makefile.in | 5 ---- browser/branding/unofficial/content/moz.build | 5 ++++ browser/branding/unofficial/locales/moz.build | 5 ++++ browser/branding/unofficial/moz.build | 7 +++++ browser/build.mk | 20 ------------- browser/components/Makefile.in | 25 ----------------- browser/components/about/moz.build | 5 ++++ browser/components/build/moz.build | 5 ++++ browser/components/certerror/Makefile.in | 2 -- browser/components/certerror/moz.build | 6 ++++ browser/components/certerror/test/moz.build | 5 ++++ browser/components/dirprovider/Makefile.in | 2 -- browser/components/dirprovider/moz.build | 6 ++++ .../components/dirprovider/tests/moz.build | 5 ++++ browser/components/downloads/Makefile.in | 4 --- browser/components/downloads/moz.build | 7 +++++ browser/components/downloads/src/moz.build | 5 ++++ browser/components/downloads/test/Makefile.in | 2 -- .../downloads/test/browser/moz.build | 5 ++++ browser/components/downloads/test/moz.build | 6 ++++ browser/components/feeds/Makefile.in | 4 --- browser/components/feeds/moz.build | 7 +++++ browser/components/feeds/public/moz.build | 5 ++++ browser/components/feeds/src/moz.build | 5 ++++ browser/components/feeds/test/Makefile.in | 4 --- .../components/feeds/test/chrome/moz.build | 5 ++++ browser/components/feeds/test/moz.build | 6 ++++ browser/components/migration/Makefile.in | 4 --- browser/components/migration/moz.build | 7 +++++ browser/components/migration/public/moz.build | 5 ++++ browser/components/migration/src/moz.build | 5 ++++ browser/components/migration/tests/moz.build | 5 ++++ browser/components/moz.build | 27 ++++++++++++++++++ browser/components/places/Makefile.in | 4 --- browser/components/places/moz.build | 7 +++++ browser/components/places/src/moz.build | 5 ++++ browser/components/places/tests/Makefile.in | 2 -- .../components/places/tests/browser/moz.build | 5 ++++ .../components/places/tests/chrome/moz.build | 5 ++++ browser/components/places/tests/moz.build | 6 ++++ browser/components/preferences/Makefile.in | 6 ---- .../preferences/in-content/Makefile.in | 2 -- .../preferences/in-content/moz.build | 6 ++++ .../preferences/in-content/tests/moz.build | 5 ++++ browser/components/preferences/moz.build | 7 +++++ .../components/preferences/tests/moz.build | 5 ++++ .../components/privatebrowsing/Makefile.in | 4 --- browser/components/privatebrowsing/moz.build | 7 +++++ .../components/privatebrowsing/src/moz.build | 5 ++++ .../privatebrowsing/test/Makefile.in | 3 -- .../privatebrowsing/test/browser/Makefile.in | 2 -- .../test/browser/global/moz.build | 5 ++++ .../privatebrowsing/test/browser/moz.build | 17 +++++++++++ .../test/browser/obsolete/moz.build | 5 ++++ .../test/browser/perwindow/moz.build | 5 ++++ .../components/privatebrowsing/test/moz.build | 7 +++++ browser/components/safebrowsing/Makefile.in | 2 -- .../safebrowsing/content/test/moz.build | 5 ++++ browser/components/safebrowsing/moz.build | 7 +++++ browser/components/search/Makefile.in | 2 -- browser/components/search/moz.build | 6 ++++ browser/components/search/test/moz.build | 5 ++++ browser/components/sessionstore/Makefile.in | 4 --- browser/components/sessionstore/moz.build | 7 +++++ browser/components/sessionstore/src/moz.build | 5 ++++ .../components/sessionstore/test/moz.build | 5 ++++ browser/components/shell/Makefile.in | 4 --- browser/components/shell/moz.build | 7 +++++ browser/components/shell/public/moz.build | 5 ++++ browser/components/shell/src/moz.build | 5 ++++ browser/components/shell/test/moz.build | 5 ++++ browser/components/sidebar/moz.build | 5 ++++ browser/components/tabview/Makefile.in | 2 -- browser/components/tabview/moz.build | 6 ++++ browser/components/tabview/test/moz.build | 5 ++++ browser/components/test/moz.build | 5 ++++ browser/devtools/Makefile.in | 19 ------------- browser/devtools/commandline/Makefile.in | 2 -- browser/devtools/commandline/moz.build | 6 ++++ browser/devtools/commandline/test/moz.build | 5 ++++ browser/devtools/debugger/Makefile.in | 2 -- browser/devtools/debugger/moz.build | 6 ++++ browser/devtools/debugger/test/moz.build | 5 ++++ browser/devtools/framework/Makefile.in | 3 -- browser/devtools/framework/moz.build | 6 ++++ browser/devtools/framework/test/moz.build | 5 ++++ browser/devtools/inspector/Makefile.in | 3 -- browser/devtools/inspector/moz.build | 6 ++++ browser/devtools/inspector/test/moz.build | 5 ++++ browser/devtools/layoutview/Makefile.in | 3 -- browser/devtools/layoutview/moz.build | 7 +++++ browser/devtools/layoutview/test/moz.build | 5 ++++ browser/devtools/markupview/Makefile.in | 2 -- browser/devtools/markupview/moz.build | 6 ++++ browser/devtools/markupview/test/moz.build | 5 ++++ browser/devtools/moz.build | 22 +++++++++++++++ browser/devtools/profiler/Makefile.in | 2 -- browser/devtools/profiler/moz.build | 6 ++++ browser/devtools/profiler/test/moz.build | 5 ++++ browser/devtools/responsivedesign/Makefile.in | 8 +++--- browser/devtools/responsivedesign/moz.build | 7 +++++ .../devtools/responsivedesign/test/moz.build | 5 ++++ browser/devtools/scratchpad/Makefile.in | 2 -- browser/devtools/scratchpad/moz.build | 6 ++++ browser/devtools/scratchpad/test/moz.build | 5 ++++ browser/devtools/shared/Makefile.in | 2 -- browser/devtools/shared/moz.build | 6 ++++ browser/devtools/shared/test/moz.build | 5 ++++ browser/devtools/sourceeditor/Makefile.in | 2 -- browser/devtools/sourceeditor/moz.build | 6 ++++ browser/devtools/sourceeditor/test/moz.build | 5 ++++ browser/devtools/styleeditor/Makefile.in | 2 -- browser/devtools/styleeditor/moz.build | 6 ++++ browser/devtools/styleeditor/test/moz.build | 5 ++++ browser/devtools/styleinspector/Makefile.in | 2 -- browser/devtools/styleinspector/moz.build | 6 ++++ .../devtools/styleinspector/test/moz.build | 5 ++++ browser/devtools/tilt/Makefile.in | 2 -- browser/devtools/tilt/moz.build | 7 +++++ browser/devtools/tilt/test/moz.build | 5 ++++ browser/devtools/webconsole/Makefile.in | 3 -- browser/devtools/webconsole/moz.build | 7 +++++ browser/devtools/webconsole/test/moz.build | 5 ++++ browser/extensions/Makefile.in | 2 -- browser/extensions/moz.build | 7 +++++ browser/extensions/pdfjs/test/moz.build | 5 ++++ browser/fuel/Makefile.in | 5 ---- browser/fuel/moz.build | 7 +++++ browser/fuel/public/moz.build | 5 ++++ browser/fuel/src/moz.build | 5 ++++ browser/fuel/test/moz.build | 5 ++++ browser/installer/Makefile.in | 2 ++ browser/installer/moz.build | 5 ++++ browser/installer/windows/moz.build | 5 ++++ browser/locales/moz.build | 5 ++++ browser/metro/Makefile.in | 15 ---------- browser/metro/base/moz.build | 5 ++++ browser/metro/base/tests/moz.build | 5 ++++ browser/metro/components/moz.build | 5 ++++ browser/metro/locales/Makefile.in | 3 -- browser/metro/locales/import/moz.build | 5 ++++ browser/metro/locales/moz.build | 8 ++++++ browser/metro/modules/moz.build | 5 ++++ browser/metro/moz.build | 19 +++++++++++++ browser/metro/profile/moz.build | 5 ++++ browser/metro/shell/Makefile.in | 6 ---- .../shell/commandexecutehandler/moz.build | 5 ++++ browser/metro/shell/linktool/moz.build | 5 ++++ browser/metro/shell/moz.build | 12 ++++++++ browser/metro/shell/testing/moz.build | 5 ++++ browser/metro/theme/moz.build | 5 ++++ browser/modules/Makefile.in | 2 -- browser/modules/moz.build | 7 +++++ browser/modules/test/Makefile.in | 4 --- browser/modules/test/chrome/moz.build | 5 ++++ browser/modules/test/moz.build | 6 ++++ browser/moz.build | 28 +++++++++++++++++++ browser/themes/Makefile.in | 9 ------ browser/themes/linux/Makefile.in | 2 -- browser/themes/linux/communicator/moz.build | 5 ++++ browser/themes/linux/moz.build | 7 +++++ browser/themes/moz.build | 14 ++++++++++ browser/themes/osx/Makefile.in | 2 -- browser/themes/osx/communicator/moz.build | 5 ++++ browser/themes/osx/moz.build | 7 +++++ browser/themes/windows/Makefile.in | 2 -- browser/themes/windows/communicator/moz.build | 5 ++++ browser/themes/windows/moz.build | 7 +++++ 193 files changed, 876 insertions(+), 267 deletions(-) create mode 100644 browser/app.mozbuild create mode 100644 browser/app/moz.build create mode 100644 browser/app/profile/extensions/moz.build create mode 100644 browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build create mode 100644 browser/base/content/test/moz.build create mode 100644 browser/base/content/test/newtab/moz.build create mode 100644 browser/base/content/test/social/moz.build create mode 100644 browser/base/moz.build create mode 100644 browser/branding/aurora/content/moz.build create mode 100644 browser/branding/aurora/locales/moz.build create mode 100644 browser/branding/aurora/moz.build create mode 100644 browser/branding/nightly/content/moz.build create mode 100644 browser/branding/nightly/locales/moz.build create mode 100644 browser/branding/nightly/moz.build create mode 100644 browser/branding/official/content/moz.build create mode 100644 browser/branding/official/locales/moz.build create mode 100644 browser/branding/official/moz.build create mode 100644 browser/branding/unofficial/content/moz.build create mode 100644 browser/branding/unofficial/locales/moz.build create mode 100644 browser/branding/unofficial/moz.build create mode 100644 browser/components/about/moz.build create mode 100644 browser/components/build/moz.build create mode 100644 browser/components/certerror/moz.build create mode 100644 browser/components/certerror/test/moz.build create mode 100644 browser/components/dirprovider/moz.build create mode 100644 browser/components/dirprovider/tests/moz.build create mode 100644 browser/components/downloads/moz.build create mode 100644 browser/components/downloads/src/moz.build create mode 100644 browser/components/downloads/test/browser/moz.build create mode 100644 browser/components/downloads/test/moz.build create mode 100644 browser/components/feeds/moz.build create mode 100644 browser/components/feeds/public/moz.build create mode 100644 browser/components/feeds/src/moz.build create mode 100644 browser/components/feeds/test/chrome/moz.build create mode 100644 browser/components/feeds/test/moz.build create mode 100644 browser/components/migration/moz.build create mode 100644 browser/components/migration/public/moz.build create mode 100644 browser/components/migration/src/moz.build create mode 100644 browser/components/migration/tests/moz.build create mode 100644 browser/components/moz.build create mode 100644 browser/components/places/moz.build create mode 100644 browser/components/places/src/moz.build create mode 100644 browser/components/places/tests/browser/moz.build create mode 100644 browser/components/places/tests/chrome/moz.build create mode 100644 browser/components/places/tests/moz.build create mode 100644 browser/components/preferences/in-content/moz.build create mode 100644 browser/components/preferences/in-content/tests/moz.build create mode 100644 browser/components/preferences/moz.build create mode 100644 browser/components/preferences/tests/moz.build create mode 100644 browser/components/privatebrowsing/moz.build create mode 100644 browser/components/privatebrowsing/src/moz.build create mode 100644 browser/components/privatebrowsing/test/browser/global/moz.build create mode 100644 browser/components/privatebrowsing/test/browser/moz.build create mode 100644 browser/components/privatebrowsing/test/browser/obsolete/moz.build create mode 100644 browser/components/privatebrowsing/test/browser/perwindow/moz.build create mode 100644 browser/components/privatebrowsing/test/moz.build create mode 100644 browser/components/safebrowsing/content/test/moz.build create mode 100644 browser/components/safebrowsing/moz.build create mode 100644 browser/components/search/moz.build create mode 100644 browser/components/search/test/moz.build create mode 100644 browser/components/sessionstore/moz.build create mode 100644 browser/components/sessionstore/src/moz.build create mode 100644 browser/components/sessionstore/test/moz.build create mode 100644 browser/components/shell/moz.build create mode 100644 browser/components/shell/public/moz.build create mode 100644 browser/components/shell/src/moz.build create mode 100644 browser/components/shell/test/moz.build create mode 100644 browser/components/sidebar/moz.build create mode 100644 browser/components/tabview/moz.build create mode 100644 browser/components/tabview/test/moz.build create mode 100644 browser/components/test/moz.build create mode 100644 browser/devtools/commandline/moz.build create mode 100644 browser/devtools/commandline/test/moz.build create mode 100644 browser/devtools/debugger/moz.build create mode 100644 browser/devtools/debugger/test/moz.build create mode 100644 browser/devtools/framework/moz.build create mode 100644 browser/devtools/framework/test/moz.build create mode 100644 browser/devtools/inspector/moz.build create mode 100644 browser/devtools/inspector/test/moz.build create mode 100644 browser/devtools/layoutview/moz.build create mode 100644 browser/devtools/layoutview/test/moz.build create mode 100644 browser/devtools/markupview/moz.build create mode 100644 browser/devtools/markupview/test/moz.build create mode 100644 browser/devtools/moz.build create mode 100644 browser/devtools/profiler/moz.build create mode 100644 browser/devtools/profiler/test/moz.build create mode 100644 browser/devtools/responsivedesign/moz.build create mode 100644 browser/devtools/responsivedesign/test/moz.build create mode 100644 browser/devtools/scratchpad/moz.build create mode 100644 browser/devtools/scratchpad/test/moz.build create mode 100644 browser/devtools/shared/moz.build create mode 100644 browser/devtools/shared/test/moz.build create mode 100644 browser/devtools/sourceeditor/moz.build create mode 100644 browser/devtools/sourceeditor/test/moz.build create mode 100644 browser/devtools/styleeditor/moz.build create mode 100644 browser/devtools/styleeditor/test/moz.build create mode 100644 browser/devtools/styleinspector/moz.build create mode 100644 browser/devtools/styleinspector/test/moz.build create mode 100644 browser/devtools/tilt/moz.build create mode 100644 browser/devtools/tilt/test/moz.build create mode 100644 browser/devtools/webconsole/moz.build create mode 100644 browser/devtools/webconsole/test/moz.build create mode 100644 browser/extensions/moz.build create mode 100644 browser/extensions/pdfjs/test/moz.build create mode 100644 browser/fuel/moz.build create mode 100644 browser/fuel/public/moz.build create mode 100644 browser/fuel/src/moz.build create mode 100644 browser/fuel/test/moz.build create mode 100644 browser/installer/moz.build create mode 100644 browser/installer/windows/moz.build create mode 100644 browser/locales/moz.build create mode 100644 browser/metro/base/moz.build create mode 100644 browser/metro/base/tests/moz.build create mode 100644 browser/metro/components/moz.build create mode 100644 browser/metro/locales/import/moz.build create mode 100644 browser/metro/locales/moz.build create mode 100644 browser/metro/modules/moz.build create mode 100644 browser/metro/moz.build create mode 100644 browser/metro/profile/moz.build create mode 100644 browser/metro/shell/commandexecutehandler/moz.build create mode 100644 browser/metro/shell/linktool/moz.build create mode 100644 browser/metro/shell/moz.build create mode 100644 browser/metro/shell/testing/moz.build create mode 100644 browser/metro/theme/moz.build create mode 100644 browser/modules/moz.build create mode 100644 browser/modules/test/chrome/moz.build create mode 100644 browser/modules/test/moz.build create mode 100644 browser/moz.build create mode 100644 browser/themes/linux/communicator/moz.build create mode 100644 browser/themes/linux/moz.build create mode 100644 browser/themes/moz.build create mode 100644 browser/themes/osx/communicator/moz.build create mode 100644 browser/themes/osx/moz.build create mode 100644 browser/themes/windows/communicator/moz.build create mode 100644 browser/themes/windows/moz.build diff --git a/browser/Makefile.in b/browser/Makefile.in index 112571cfe83..0eab0c7a084 100644 --- a/browser/Makefile.in +++ b/browser/Makefile.in @@ -9,29 +9,6 @@ VPATH = @srcdir@ include $(topsrcdir)/config/config.mk -PARALLEL_DIRS = \ - base \ - components \ - fuel \ - locales \ - modules \ - themes \ - extensions \ - $(NULL) - -DIRS = \ - devtools \ - app \ - $(NULL) - -ifdef MOZ_METRO -DIRS += metro -endif - -ifdef MAKENSISU -DIRS += installer/windows -endif - include $(topsrcdir)/config/rules.mk ifdef MAKENSISU diff --git a/browser/app.mozbuild b/browser/app.mozbuild new file mode 100644 index 00000000000..beb7f78a304 --- /dev/null +++ b/browser/app.mozbuild @@ -0,0 +1,21 @@ +# 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 not CONFIG['LIBXUL_SDK']: + app_libxul_dirs = [] + include('/toolkit/toolkit.mozbuild') + +if CONFIG['MOZ_EXTENSIONS']: + add_tier_dir('app', 'extensions') + +add_tier_dir('app', [CONFIG['MOZ_BRANDING_DIRECTORY']]) + +if CONFIG['MOZ_WEBAPP_RUNTIME']: + add_tier_dir('app', 'webapprt') + +# Never add tier dirs after browser because they apparently won't get +# packaged properly on Mac. +add_tier_dir('app', 'browser') + diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 237e0bce6d0..bba59abe217 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = profile/extensions dist_dest = $(DIST)/$(MOZ_MACBUNDLE_NAME) ifdef ENABLE_MARIONETTE diff --git a/browser/app/moz.build b/browser/app/moz.build new file mode 100644 index 00000000000..99100abe2c6 --- /dev/null +++ b/browser/app/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 += ['profile/extensions'] diff --git a/browser/app/profile/extensions/Makefile.in b/browser/app/profile/extensions/Makefile.in index 2a8dc818705..fcbef9815d3 100644 --- a/browser/app/profile/extensions/Makefile.in +++ b/browser/app/profile/extensions/Makefile.in @@ -11,11 +11,6 @@ VPATH = @srcdir@ DISTROEXT = $(call core_abspath,$(FINAL_TARGET))/distribution/extensions include $(DEPTH)/config/autoconf.mk - -DIRS = \ - {972ce4c6-7e08-4474-a285-3208198ce6fd} \ - $(NULL) - include $(topsrcdir)/config/config.mk ifneq (,$(filter beta,$(MOZ_UPDATE_CHANNEL))) diff --git a/browser/app/profile/extensions/moz.build b/browser/app/profile/extensions/moz.build new file mode 100644 index 00000000000..5f105ad0418 --- /dev/null +++ b/browser/app/profile/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/. + +DIRS += ['{972ce4c6-7e08-4474-a285-3208198ce6fd}'] diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/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/browser/base/Makefile.in b/browser/base/Makefile.in index fe129711f37..71d9254c1b9 100644 --- a/browser/base/Makefile.in +++ b/browser/base/Makefile.in @@ -16,8 +16,6 @@ abs_srcdir = $(call core_abspath,$(srcdir)) CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html -TEST_DIRS += content/test - include $(topsrcdir)/config/rules.mk PRE_RELEASE_SUFFIX := "" diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index 6d87d255400..f05319150ac 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -8,11 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ -DIRS += \ - newtab \ - social \ - $(NULL) - include $(DEPTH)/config/autoconf.mk MOCHITEST_FILES = \ diff --git a/browser/base/content/test/moz.build b/browser/base/content/test/moz.build new file mode 100644 index 00000000000..801eb0ae28e --- /dev/null +++ b/browser/base/content/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/. + +DIRS += ['newtab', 'social'] + diff --git a/browser/base/content/test/newtab/moz.build b/browser/base/content/test/newtab/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/base/content/test/newtab/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/browser/base/content/test/social/moz.build b/browser/base/content/test/social/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/base/content/test/social/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/browser/base/moz.build b/browser/base/moz.build new file mode 100644 index 00000000000..a42e6182efa --- /dev/null +++ b/browser/base/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 += ['content/test'] diff --git a/browser/branding/aurora/Makefile.in b/browser/branding/aurora/Makefile.in index e43a887fc6c..5f7c10bd1fd 100644 --- a/browser/branding/aurora/Makefile.in +++ b/browser/branding/aurora/Makefile.in @@ -10,11 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -DIRS = \ - content \ - locales \ - $(NULL) - PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js # On Windows only do this step for browser, skip for metro. diff --git a/browser/branding/aurora/content/moz.build b/browser/branding/aurora/content/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/aurora/content/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/browser/branding/aurora/locales/moz.build b/browser/branding/aurora/locales/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/aurora/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/browser/branding/aurora/moz.build b/browser/branding/aurora/moz.build new file mode 100644 index 00000000000..f179404cbd3 --- /dev/null +++ b/browser/branding/aurora/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 += ['content', 'locales'] + diff --git a/browser/branding/nightly/Makefile.in b/browser/branding/nightly/Makefile.in index e43a887fc6c..5f7c10bd1fd 100644 --- a/browser/branding/nightly/Makefile.in +++ b/browser/branding/nightly/Makefile.in @@ -10,11 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -DIRS = \ - content \ - locales \ - $(NULL) - PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js # On Windows only do this step for browser, skip for metro. diff --git a/browser/branding/nightly/content/moz.build b/browser/branding/nightly/content/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/nightly/content/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/browser/branding/nightly/locales/moz.build b/browser/branding/nightly/locales/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/nightly/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/browser/branding/nightly/moz.build b/browser/branding/nightly/moz.build new file mode 100644 index 00000000000..5eca2ae434a --- /dev/null +++ b/browser/branding/nightly/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 += ['content', 'locales'] diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in index e43a887fc6c..5f7c10bd1fd 100644 --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -10,11 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -DIRS = \ - content \ - locales \ - $(NULL) - PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js # On Windows only do this step for browser, skip for metro. diff --git a/browser/branding/official/content/moz.build b/browser/branding/official/content/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/official/content/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/browser/branding/official/locales/moz.build b/browser/branding/official/locales/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/official/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/browser/branding/official/moz.build b/browser/branding/official/moz.build new file mode 100644 index 00000000000..f179404cbd3 --- /dev/null +++ b/browser/branding/official/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 += ['content', 'locales'] + diff --git a/browser/branding/unofficial/Makefile.in b/browser/branding/unofficial/Makefile.in index e43a887fc6c..5f7c10bd1fd 100644 --- a/browser/branding/unofficial/Makefile.in +++ b/browser/branding/unofficial/Makefile.in @@ -10,11 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -DIRS = \ - content \ - locales \ - $(NULL) - PREF_JS_EXPORTS = $(srcdir)/pref/firefox-branding.js # On Windows only do this step for browser, skip for metro. diff --git a/browser/branding/unofficial/content/moz.build b/browser/branding/unofficial/content/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/unofficial/content/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/browser/branding/unofficial/locales/moz.build b/browser/branding/unofficial/locales/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/branding/unofficial/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/browser/branding/unofficial/moz.build b/browser/branding/unofficial/moz.build new file mode 100644 index 00000000000..f179404cbd3 --- /dev/null +++ b/browser/branding/unofficial/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 += ['content', 'locales'] + diff --git a/browser/build.mk b/browser/build.mk index 908f4b6a7e7..c72d6ac4739 100644 --- a/browser/build.mk +++ b/browser/build.mk @@ -2,26 +2,6 @@ # 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/. -ifndef LIBXUL_SDK -include $(topsrcdir)/toolkit/toolkit-tiers.mk -endif - -TIERS += app - -ifdef MOZ_EXTENSIONS -tier_app_dirs += extensions -endif - -tier_app_dirs += $(MOZ_BRANDING_DIRECTORY) - -ifdef MOZ_WEBAPP_RUNTIME -tier_app_dirs += webapprt -endif - -tier_app_dirs += browser -# Never add other tier_app_dirs after browser. They won't get packaged -# properly on mac. - ################################################ # Parallel build on Windows with GNU make check diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in index 2a148851028..0ccbba84845 100644 --- a/browser/components/Makefile.in +++ b/browser/components/Makefile.in @@ -28,31 +28,6 @@ EXTRA_PP_COMPONENTS = \ EXTRA_JS_MODULES = distribution.js -PARALLEL_DIRS = \ - about \ - certerror \ - dirprovider \ - downloads \ - feeds \ - places \ - preferences \ - privatebrowsing \ - search \ - sessionstore \ - shell \ - sidebar \ - tabview \ - migration \ - $(NULL) - -ifdef MOZ_SAFE_BROWSING -PARALLEL_DIRS += safebrowsing -endif - -TEST_DIRS += test - -DIRS += build - ifdef MOZILLA_OFFICIAL DEFINES += -DOFFICIAL_BUILD=1 endif diff --git a/browser/components/about/moz.build b/browser/components/about/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/about/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/browser/components/build/moz.build b/browser/components/build/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/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/browser/components/certerror/Makefile.in b/browser/components/certerror/Makefile.in index 5cf9d09f4cc..8127798f241 100644 --- a/browser/components/certerror/Makefile.in +++ b/browser/components/certerror/Makefile.in @@ -11,6 +11,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/certerror/moz.build b/browser/components/certerror/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/components/certerror/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/browser/components/certerror/test/moz.build b/browser/components/certerror/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/certerror/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/browser/components/dirprovider/Makefile.in b/browser/components/dirprovider/Makefile.in index c458f132be9..417d2578610 100644 --- a/browser/components/dirprovider/Makefile.in +++ b/browser/components/dirprovider/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = browserdir LIBRARY_NAME = browserdir_s -TEST_DIRS += tests - FORCE_STATIC_LIB = 1 USE_STATIC_LIBS = 1 diff --git a/browser/components/dirprovider/moz.build b/browser/components/dirprovider/moz.build new file mode 100644 index 00000000000..d0193307adb --- /dev/null +++ b/browser/components/dirprovider/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/browser/components/dirprovider/tests/moz.build b/browser/components/dirprovider/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/dirprovider/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/browser/components/downloads/Makefile.in b/browser/components/downloads/Makefile.in index 4ef23b3a78a..30f6282c192 100644 --- a/browser/components/downloads/Makefile.in +++ b/browser/components/downloads/Makefile.in @@ -9,8 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = src - -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/downloads/moz.build b/browser/components/downloads/moz.build new file mode 100644 index 00000000000..a66939e28a8 --- /dev/null +++ b/browser/components/downloads/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/browser/components/downloads/src/moz.build b/browser/components/downloads/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/downloads/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/browser/components/downloads/test/Makefile.in b/browser/components/downloads/test/Makefile.in index 808b09fd811..7002adf1e0f 100644 --- a/browser/components/downloads/test/Makefile.in +++ b/browser/components/downloads/test/Makefile.in @@ -12,6 +12,4 @@ include $(DEPTH)/config/autoconf.mk XPCSHELL_TESTS = unit -DIRS = browser - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/downloads/test/browser/moz.build b/browser/components/downloads/test/browser/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/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/browser/components/downloads/test/moz.build b/browser/components/downloads/test/moz.build new file mode 100644 index 00000000000..09be12395ec --- /dev/null +++ b/browser/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/. + +DIRS += ['browser'] diff --git a/browser/components/feeds/Makefile.in b/browser/components/feeds/Makefile.in index 85635f3f91b..ef40c1e3e80 100644 --- a/browser/components/feeds/Makefile.in +++ b/browser/components/feeds/Makefile.in @@ -9,8 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src - -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/feeds/moz.build b/browser/components/feeds/moz.build new file mode 100644 index 00000000000..bd475548c13 --- /dev/null +++ b/browser/components/feeds/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 += ['public', 'src'] +TEST_DIRS += ['test'] diff --git a/browser/components/feeds/public/moz.build b/browser/components/feeds/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/feeds/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/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/feeds/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/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in index 9fe66eaebe9..b3aa28e5ccc 100644 --- a/browser/components/feeds/test/Makefile.in +++ b/browser/components/feeds/test/Makefile.in @@ -13,10 +13,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_browser_feeds XPCSHELL_TESTS = unit -DIRS = \ - chrome \ - $(NULL) - MOCHITEST_FILES = bug408328-data.xml \ bug368464-data.xml \ test_bug494328.html \ diff --git a/browser/components/feeds/test/chrome/moz.build b/browser/components/feeds/test/chrome/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/feeds/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/browser/components/feeds/test/moz.build b/browser/components/feeds/test/moz.build new file mode 100644 index 00000000000..4e26b457df6 --- /dev/null +++ b/browser/components/feeds/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 += ['chrome'] diff --git a/browser/components/migration/Makefile.in b/browser/components/migration/Makefile.in index d80c17f0fa1..ef40c1e3e80 100644 --- a/browser/components/migration/Makefile.in +++ b/browser/components/migration/Makefile.in @@ -9,8 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src - -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/migration/moz.build b/browser/components/migration/moz.build new file mode 100644 index 00000000000..a5bb17a6d4e --- /dev/null +++ b/browser/components/migration/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 += ['public', 'src'] +TEST_DIRS += ['tests'] diff --git a/browser/components/migration/public/moz.build b/browser/components/migration/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/migration/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/browser/components/migration/src/moz.build b/browser/components/migration/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/migration/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/browser/components/migration/tests/moz.build b/browser/components/migration/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/migration/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/browser/components/moz.build b/browser/components/moz.build new file mode 100644 index 00000000000..ec5522a68e7 --- /dev/null +++ b/browser/components/moz.build @@ -0,0 +1,27 @@ +# 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 += [ + 'about', + 'certerror', + 'dirprovider', + 'downloads', + 'feeds', + 'places', + 'preferences', + 'privatebrowsing', + 'search', + 'sessionstore', + 'shell', + 'sidebar', + 'tabview', + 'migration', +] + +if CONFIG['MOZ_SAFE_BROWSING']: + PARALLEL_DIRS += ['safebrowsing'] + +TEST_DIRS += ['test'] +DIRS += ['build'] diff --git a/browser/components/places/Makefile.in b/browser/components/places/Makefile.in index 53bc82a1c7c..39b8053939c 100644 --- a/browser/components/places/Makefile.in +++ b/browser/components/places/Makefile.in @@ -10,10 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = src - -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk XPIDL_FLAGS += -I$(topsrcdir)/browser/components/ diff --git a/browser/components/places/moz.build b/browser/components/places/moz.build new file mode 100644 index 00000000000..4ae3fde684e --- /dev/null +++ b/browser/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/. + +DIRS += ['src'] +TEST_DIRS += ['tests'] diff --git a/browser/components/places/src/moz.build b/browser/components/places/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/places/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/browser/components/places/tests/Makefile.in b/browser/components/places/tests/Makefile.in index e2b8a09e914..457105264f1 100644 --- a/browser/components/places/tests/Makefile.in +++ b/browser/components/places/tests/Makefile.in @@ -15,6 +15,4 @@ MODULE = test_browser_places XPCSHELL_TESTS = unit -DIRS = browser chrome - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/places/tests/browser/moz.build b/browser/components/places/tests/browser/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/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/browser/components/places/tests/chrome/moz.build b/browser/components/places/tests/chrome/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/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/browser/components/places/tests/moz.build b/browser/components/places/tests/moz.build new file mode 100644 index 00000000000..7a020c68265 --- /dev/null +++ b/browser/components/places/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 += ['browser', 'chrome'] diff --git a/browser/components/preferences/Makefile.in b/browser/components/preferences/Makefile.in index 855b00888a4..0d93ee82ad9 100644 --- a/browser/components/preferences/Makefile.in +++ b/browser/components/preferences/Makefile.in @@ -10,12 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS = \ - in-content \ - $(NULL) - -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk DEFINES += \ diff --git a/browser/components/preferences/in-content/Makefile.in b/browser/components/preferences/in-content/Makefile.in index cfd054c434c..2ce196b1d30 100644 --- a/browser/components/preferences/in-content/Makefile.in +++ b/browser/components/preferences/in-content/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk DEFINES += \ diff --git a/browser/components/preferences/in-content/moz.build b/browser/components/preferences/in-content/moz.build new file mode 100644 index 00000000000..d0193307adb --- /dev/null +++ b/browser/components/preferences/in-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/browser/components/preferences/in-content/tests/moz.build b/browser/components/preferences/in-content/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/preferences/in-content/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/browser/components/preferences/moz.build b/browser/components/preferences/moz.build new file mode 100644 index 00000000000..3f1ebcb456f --- /dev/null +++ b/browser/components/preferences/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/. + +PARALLEL_DIRS += ['in-content'] +TEST_DIRS += ['tests'] diff --git a/browser/components/preferences/tests/moz.build b/browser/components/preferences/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/preferences/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/browser/components/privatebrowsing/Makefile.in b/browser/components/privatebrowsing/Makefile.in index 93889ee84b2..52a3d385918 100644 --- a/browser/components/privatebrowsing/Makefile.in +++ b/browser/components/privatebrowsing/Makefile.in @@ -11,8 +11,4 @@ include $(DEPTH)/config/autoconf.mk MODULE = privatebrowsing -DIRS = src - -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/privatebrowsing/moz.build b/browser/components/privatebrowsing/moz.build new file mode 100644 index 00000000000..a66939e28a8 --- /dev/null +++ b/browser/components/privatebrowsing/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/browser/components/privatebrowsing/src/moz.build b/browser/components/privatebrowsing/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/privatebrowsing/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/browser/components/privatebrowsing/test/Makefile.in b/browser/components/privatebrowsing/test/Makefile.in index e8869dfe06b..528a2801f26 100644 --- a/browser/components/privatebrowsing/test/Makefile.in +++ b/browser/components/privatebrowsing/test/Makefile.in @@ -12,7 +12,4 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_privatebrowsing -DIRS += browser \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in index c5c45626b4d..528a2801f26 100644 --- a/browser/components/privatebrowsing/test/browser/Makefile.in +++ b/browser/components/privatebrowsing/test/browser/Makefile.in @@ -12,6 +12,4 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_privatebrowsing -DIRS += perwindow - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/privatebrowsing/test/browser/global/moz.build b/browser/components/privatebrowsing/test/browser/global/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/privatebrowsing/test/browser/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/browser/components/privatebrowsing/test/browser/moz.build b/browser/components/privatebrowsing/test/browser/moz.build new file mode 100644 index 00000000000..8c0dd308013 --- /dev/null +++ b/browser/components/privatebrowsing/test/browser/moz.build @@ -0,0 +1,17 @@ +# 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/. + +# We have three category of browser-chrome tests: +# global: these tests focus on the global PB service implementation. +# perwindow: these tests focus on the per-window PB implementation. +# obsolete: these tests focus on the global mode, but the functionality +# that they are testing is specific to the global mode, and +# will never have a per-window counterpart. +# +# As a transition plan, we have divided the existing tests into the +# global and obsolete categories, and we'll then focus on rewriting the +# global tests to test the per-window mode. + +DIRS += ['perwindow'] diff --git a/browser/components/privatebrowsing/test/browser/obsolete/moz.build b/browser/components/privatebrowsing/test/browser/obsolete/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/privatebrowsing/test/browser/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/browser/components/privatebrowsing/test/browser/perwindow/moz.build b/browser/components/privatebrowsing/test/browser/perwindow/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/privatebrowsing/test/browser/perwindow/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/browser/components/privatebrowsing/test/moz.build b/browser/components/privatebrowsing/test/moz.build new file mode 100644 index 00000000000..2ef5a977646 --- /dev/null +++ b/browser/components/privatebrowsing/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/. + +DIRS += ['browser'] + diff --git a/browser/components/safebrowsing/Makefile.in b/browser/components/safebrowsing/Makefile.in index 0fa2f3eb564..2fd5baa7313 100644 --- a/browser/components/safebrowsing/Makefile.in +++ b/browser/components/safebrowsing/Makefile.in @@ -10,6 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += content/test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/safebrowsing/content/test/moz.build b/browser/components/safebrowsing/content/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/safebrowsing/content/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/browser/components/safebrowsing/moz.build b/browser/components/safebrowsing/moz.build new file mode 100644 index 00000000000..65ac15e5d87 --- /dev/null +++ b/browser/components/safebrowsing/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 += ['content/test'] + diff --git a/browser/components/search/Makefile.in b/browser/components/search/Makefile.in index a7947a7592f..e5c6e187e36 100644 --- a/browser/components/search/Makefile.in +++ b/browser/components/search/Makefile.in @@ -9,6 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/search/moz.build b/browser/components/search/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/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 += ['test'] diff --git a/browser/components/search/test/moz.build b/browser/components/search/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/search/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/browser/components/sessionstore/Makefile.in b/browser/components/sessionstore/Makefile.in index aafd3bffbd5..fcbfd9ba4d1 100644 --- a/browser/components/sessionstore/Makefile.in +++ b/browser/components/sessionstore/Makefile.in @@ -18,8 +18,4 @@ XPIDLSRCS = \ nsISessionStore.idl \ $(NULL) -DIRS = src - -TEST_DIRS = test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/sessionstore/moz.build b/browser/components/sessionstore/moz.build new file mode 100644 index 00000000000..a66939e28a8 --- /dev/null +++ b/browser/components/sessionstore/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/browser/components/sessionstore/src/moz.build b/browser/components/sessionstore/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/sessionstore/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/browser/components/sessionstore/test/moz.build b/browser/components/sessionstore/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/sessionstore/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/browser/components/shell/Makefile.in b/browser/components/shell/Makefile.in index 85635f3f91b..ef40c1e3e80 100644 --- a/browser/components/shell/Makefile.in +++ b/browser/components/shell/Makefile.in @@ -9,8 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src - -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build new file mode 100644 index 00000000000..bd475548c13 --- /dev/null +++ b/browser/components/shell/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 += ['public', 'src'] +TEST_DIRS += ['test'] diff --git a/browser/components/shell/public/moz.build b/browser/components/shell/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/shell/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/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/shell/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/browser/components/shell/test/moz.build b/browser/components/shell/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/shell/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/browser/components/sidebar/moz.build b/browser/components/sidebar/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/sidebar/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/browser/components/tabview/Makefile.in b/browser/components/tabview/Makefile.in index b3ae2ef4cc2..cb36dd6a67c 100644 --- a/browser/components/tabview/Makefile.in +++ b/browser/components/tabview/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/components/tabview/moz.build b/browser/components/tabview/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/components/tabview/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/browser/components/tabview/test/moz.build b/browser/components/tabview/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/tabview/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/browser/components/test/moz.build b/browser/components/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/components/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/browser/devtools/Makefile.in b/browser/devtools/Makefile.in index b06bc7f6cf0..30e5dd8bd0c 100644 --- a/browser/devtools/Makefile.in +++ b/browser/devtools/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,22 +11,4 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -DIRS = \ - inspector \ - markupview \ - webconsole \ - commandline \ - sourceeditor \ - styleeditor \ - styleinspector \ - tilt \ - scratchpad \ - debugger \ - layoutview \ - shared \ - responsivedesign \ - framework \ - profiler \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/commandline/Makefile.in b/browser/devtools/commandline/Makefile.in index df206dadd99..8890154f78a 100644 --- a/browser/devtools/commandline/Makefile.in +++ b/browser/devtools/commandline/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/commandline/moz.build b/browser/devtools/commandline/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/commandline/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/browser/devtools/commandline/test/moz.build b/browser/devtools/commandline/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/commandline/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/browser/devtools/debugger/Makefile.in b/browser/devtools/debugger/Makefile.in index 570ac82504d..42f17d7fecd 100644 --- a/browser/devtools/debugger/Makefile.in +++ b/browser/devtools/debugger/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/debugger/moz.build b/browser/devtools/debugger/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/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 += ['test'] diff --git a/browser/devtools/debugger/test/moz.build b/browser/devtools/debugger/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/debugger/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/browser/devtools/framework/Makefile.in b/browser/devtools/framework/Makefile.in index df206dadd99..fe75dad69a8 100644 --- a/browser/devtools/framework/Makefile.in +++ b/browser/devtools/framework/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/. @@ -10,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/framework/moz.build b/browser/devtools/framework/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/framework/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/browser/devtools/framework/test/moz.build b/browser/devtools/framework/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/framework/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/browser/devtools/inspector/Makefile.in b/browser/devtools/inspector/Makefile.in index 02dcc9f605a..85a21c63a04 100644 --- a/browser/devtools/inspector/Makefile.in +++ b/browser/devtools/inspector/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/. @@ -10,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/inspector/moz.build b/browser/devtools/inspector/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/inspector/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/browser/devtools/inspector/test/moz.build b/browser/devtools/inspector/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/inspector/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/browser/devtools/layoutview/Makefile.in b/browser/devtools/layoutview/Makefile.in index a8d0b209397..ef40c1e3e80 100644 --- a/browser/devtools/layoutview/Makefile.in +++ b/browser/devtools/layoutview/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/. @@ -10,6 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/layoutview/moz.build b/browser/devtools/layoutview/moz.build new file mode 100644 index 00000000000..fb0e881f427 --- /dev/null +++ b/browser/devtools/layoutview/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/browser/devtools/layoutview/test/moz.build b/browser/devtools/layoutview/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/layoutview/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/browser/devtools/markupview/Makefile.in b/browser/devtools/markupview/Makefile.in index f26f93ab925..c4046ffbf3d 100644 --- a/browser/devtools/markupview/Makefile.in +++ b/browser/devtools/markupview/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - libs:: $(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools diff --git a/browser/devtools/markupview/moz.build b/browser/devtools/markupview/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/markupview/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/browser/devtools/markupview/test/moz.build b/browser/devtools/markupview/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/markupview/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/browser/devtools/moz.build b/browser/devtools/moz.build new file mode 100644 index 00000000000..400f27c06ea --- /dev/null +++ b/browser/devtools/moz.build @@ -0,0 +1,22 @@ +# 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 += [ + 'inspector', + 'markupview', + 'webconsole', + 'commandline', + 'sourceeditor', + 'styleeditor', + 'styleinspector', + 'tilt', + 'scratchpad', + 'debugger', + 'layoutview', + 'shared', + 'responsivedesign', + 'framework', + 'profiler', +] diff --git a/browser/devtools/profiler/Makefile.in b/browser/devtools/profiler/Makefile.in index 570ac82504d..42f17d7fecd 100644 --- a/browser/devtools/profiler/Makefile.in +++ b/browser/devtools/profiler/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/profiler/moz.build b/browser/devtools/profiler/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/profiler/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/browser/devtools/profiler/test/moz.build b/browser/devtools/profiler/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/profiler/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/browser/devtools/responsivedesign/Makefile.in b/browser/devtools/responsivedesign/Makefile.in index 44def55d2c6..fe75dad69a8 100644 --- a/browser/devtools/responsivedesign/Makefile.in +++ b/browser/devtools/responsivedesign/Makefile.in @@ -1,3 +1,7 @@ +# 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/. + DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ @@ -5,10 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef ENABLE_TESTS - DIRS += test -endif - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/responsivedesign/moz.build b/browser/devtools/responsivedesign/moz.build new file mode 100644 index 00000000000..fb0e881f427 --- /dev/null +++ b/browser/devtools/responsivedesign/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/browser/devtools/responsivedesign/test/moz.build b/browser/devtools/responsivedesign/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/responsivedesign/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/browser/devtools/scratchpad/Makefile.in b/browser/devtools/scratchpad/Makefile.in index df206dadd99..8890154f78a 100644 --- a/browser/devtools/scratchpad/Makefile.in +++ b/browser/devtools/scratchpad/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/scratchpad/moz.build b/browser/devtools/scratchpad/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/scratchpad/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/browser/devtools/scratchpad/test/moz.build b/browser/devtools/scratchpad/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/scratchpad/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/browser/devtools/shared/Makefile.in b/browser/devtools/shared/Makefile.in index df206dadd99..8890154f78a 100644 --- a/browser/devtools/shared/Makefile.in +++ b/browser/devtools/shared/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/shared/moz.build b/browser/devtools/shared/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/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'] diff --git a/browser/devtools/shared/test/moz.build b/browser/devtools/shared/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/shared/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/browser/devtools/sourceeditor/Makefile.in b/browser/devtools/sourceeditor/Makefile.in index 9142aa34936..a0acbc8aad4 100644 --- a/browser/devtools/sourceeditor/Makefile.in +++ b/browser/devtools/sourceeditor/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - EXTRA_JS_MODULES = \ source-editor.jsm \ source-editor-orion.jsm \ diff --git a/browser/devtools/sourceeditor/moz.build b/browser/devtools/sourceeditor/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/sourceeditor/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/browser/devtools/sourceeditor/test/moz.build b/browser/devtools/sourceeditor/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/sourceeditor/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/browser/devtools/styleeditor/Makefile.in b/browser/devtools/styleeditor/Makefile.in index b5fdc2bfaea..fe75dad69a8 100644 --- a/browser/devtools/styleeditor/Makefile.in +++ b/browser/devtools/styleeditor/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/styleeditor/moz.build b/browser/devtools/styleeditor/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/styleeditor/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/browser/devtools/styleeditor/test/moz.build b/browser/devtools/styleeditor/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/styleeditor/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/browser/devtools/styleinspector/Makefile.in b/browser/devtools/styleinspector/Makefile.in index 4b3473e97fa..8890154f78a 100644 --- a/browser/devtools/styleinspector/Makefile.in +++ b/browser/devtools/styleinspector/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS = test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/styleinspector/moz.build b/browser/devtools/styleinspector/moz.build new file mode 100644 index 00000000000..493f80dc6ef --- /dev/null +++ b/browser/devtools/styleinspector/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/browser/devtools/styleinspector/test/moz.build b/browser/devtools/styleinspector/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/styleinspector/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/browser/devtools/tilt/Makefile.in b/browser/devtools/tilt/Makefile.in index 56f758211c1..fcedbc9f062 100644 --- a/browser/devtools/tilt/Makefile.in +++ b/browser/devtools/tilt/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk libs:: diff --git a/browser/devtools/tilt/moz.build b/browser/devtools/tilt/moz.build new file mode 100644 index 00000000000..fb0e881f427 --- /dev/null +++ b/browser/devtools/tilt/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/browser/devtools/tilt/test/moz.build b/browser/devtools/tilt/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/devtools/tilt/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/browser/devtools/webconsole/Makefile.in b/browser/devtools/webconsole/Makefile.in index 4e820ee8403..65557eb461e 100644 --- a/browser/devtools/webconsole/Makefile.in +++ b/browser/devtools/webconsole/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/. @@ -18,6 +17,4 @@ EXTRA_JS_MODULES = \ WebConsolePanel.jsm \ $(NULL) -TEST_DIRS = test - include $(topsrcdir)/config/rules.mk diff --git a/browser/devtools/webconsole/moz.build b/browser/devtools/webconsole/moz.build new file mode 100644 index 00000000000..fb0e881f427 --- /dev/null +++ b/browser/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/. + +TEST_DIRS += ['test'] + diff --git a/browser/devtools/webconsole/test/moz.build b/browser/devtools/webconsole/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/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/browser/extensions/Makefile.in b/browser/extensions/Makefile.in index af7c50316c2..ff96dc1b60d 100644 --- a/browser/extensions/Makefile.in +++ b/browser/extensions/Makefile.in @@ -11,8 +11,6 @@ CHROMEDIR = $(call core_abspath,$(FINAL_TARGET))/chrome include $(DEPTH)/config/autoconf.mk -TEST_DIRS += pdfjs/test - ifdef MOZ_METRO GENERATED_DIRS = $(DIST)/bin/metro/chrome endif diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build new file mode 100644 index 00000000000..bbd77e0b303 --- /dev/null +++ b/browser/extensions/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 += ['pdfjs/test'] + diff --git a/browser/extensions/pdfjs/test/moz.build b/browser/extensions/pdfjs/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/extensions/pdfjs/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/browser/fuel/Makefile.in b/browser/fuel/Makefile.in index 55fbb31cf6c..e5c6e187e36 100644 --- a/browser/fuel/Makefile.in +++ b/browser/fuel/Makefile.in @@ -9,9 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src - -TEST_DIRS += test - include $(topsrcdir)/config/rules.mk - diff --git a/browser/fuel/moz.build b/browser/fuel/moz.build new file mode 100644 index 00000000000..bd475548c13 --- /dev/null +++ b/browser/fuel/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 += ['public', 'src'] +TEST_DIRS += ['test'] diff --git a/browser/fuel/public/moz.build b/browser/fuel/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/fuel/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/browser/fuel/src/moz.build b/browser/fuel/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/fuel/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/browser/fuel/test/moz.build b/browser/fuel/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/fuel/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/browser/installer/Makefile.in b/browser/installer/Makefile.in index 162a99713aa..1411a8b454b 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -9,6 +9,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +STANDALONE_MAKEFILE := 1 + include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/browser/installer/moz.build b/browser/installer/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/installer/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/browser/installer/windows/moz.build b/browser/installer/windows/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/installer/windows/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/browser/locales/moz.build b/browser/locales/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/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/browser/metro/Makefile.in b/browser/metro/Makefile.in index cd6c34e7f68..0b7f7733dcb 100644 --- a/browser/metro/Makefile.in +++ b/browser/metro/Makefile.in @@ -10,21 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -DIRS = \ - base \ - components \ - modules \ - theme \ - profile \ - locales \ - $(NULL) - -ifeq ($(OS_ARCH),WINNT) -DIRS += shell -endif - -TEST_DIRS += base/tests - include $(topsrcdir)/config/rules.mk ######################################### diff --git a/browser/metro/base/moz.build b/browser/metro/base/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/base/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/browser/metro/base/tests/moz.build b/browser/metro/base/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/base/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/browser/metro/components/moz.build b/browser/metro/components/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/components/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/browser/metro/locales/Makefile.in b/browser/metro/locales/Makefile.in index 777c3af3a5f..07e7103c9c5 100644 --- a/browser/metro/locales/Makefile.in +++ b/browser/metro/locales/Makefile.in @@ -13,9 +13,6 @@ relativesrcdir = browser/metro/locales include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# process desktop related resources we reuse here: -DIRS = import - DEFINES += -DAB_CD=$(AB_CD) include $(topsrcdir)/config/rules.mk diff --git a/browser/metro/locales/import/moz.build b/browser/metro/locales/import/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/locales/import/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/browser/metro/locales/moz.build b/browser/metro/locales/moz.build new file mode 100644 index 00000000000..73820ed4ade --- /dev/null +++ b/browser/metro/locales/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/. + +# Process desktop related resource we reuse here. +DIRS += ['import'] + diff --git a/browser/metro/modules/moz.build b/browser/metro/modules/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/modules/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/browser/metro/moz.build b/browser/metro/moz.build new file mode 100644 index 00000000000..c607c0ae9f4 --- /dev/null +++ b/browser/metro/moz.build @@ -0,0 +1,19 @@ +# 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 += [ + 'base', + 'components', + 'modules', + 'theme', + 'profile', + 'locales', +] + +if CONFIG['OS_ARCH'] == 'WINNT': + DIRS += ['shell'] + +TEST_DIRS += ['base/tests'] + diff --git a/browser/metro/profile/moz.build b/browser/metro/profile/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/profile/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/browser/metro/shell/Makefile.in b/browser/metro/shell/Makefile.in index 83541fff4ac..e7866ae073f 100644 --- a/browser/metro/shell/Makefile.in +++ b/browser/metro/shell/Makefile.in @@ -11,12 +11,6 @@ MODULE = metro include $(DEPTH)/config/autoconf.mk -DIRS = commandexecutehandler linktool - -ifdef ENABLE_TESTS -DIRS += testing -endif - export:: $(NSINSTALL) $(srcdir)/resources.pri $(DIST)/bin $(RM) $(DIST)/bin/VisualElementsManifest.xml diff --git a/browser/metro/shell/commandexecutehandler/moz.build b/browser/metro/shell/commandexecutehandler/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/shell/commandexecutehandler/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/browser/metro/shell/linktool/moz.build b/browser/metro/shell/linktool/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/shell/linktool/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/browser/metro/shell/moz.build b/browser/metro/shell/moz.build new file mode 100644 index 00000000000..2dce8592ac9 --- /dev/null +++ b/browser/metro/shell/moz.build @@ -0,0 +1,12 @@ +# 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 += [ + 'commandexecutehandler', + 'linktool', +] + +TEST_DIRS += ['testing'] + diff --git a/browser/metro/shell/testing/moz.build b/browser/metro/shell/testing/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/shell/testing/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/browser/metro/theme/moz.build b/browser/metro/theme/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/metro/theme/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/browser/modules/Makefile.in b/browser/modules/Makefile.in index 2279b2657b6..ba3dbbab128 100644 --- a/browser/modules/Makefile.in +++ b/browser/modules/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -TEST_DIRS += test - EXTRA_JS_MODULES = \ AboutHomeUtils.jsm \ BrowserNewTabPreloader.jsm \ diff --git a/browser/modules/moz.build b/browser/modules/moz.build new file mode 100644 index 00000000000..fb0e881f427 --- /dev/null +++ b/browser/modules/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/browser/modules/test/Makefile.in b/browser/modules/test/Makefile.in index 2f92835350d..d2971b133c1 100644 --- a/browser/modules/test/Makefile.in +++ b/browser/modules/test/Makefile.in @@ -8,10 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ -DIRS = \ - chrome \ - $(NULL) - include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk diff --git a/browser/modules/test/chrome/moz.build b/browser/modules/test/chrome/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/modules/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/browser/modules/test/moz.build b/browser/modules/test/moz.build new file mode 100644 index 00000000000..4e26b457df6 --- /dev/null +++ b/browser/modules/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 += ['chrome'] diff --git a/browser/moz.build b/browser/moz.build new file mode 100644 index 00000000000..453bcb59d42 --- /dev/null +++ b/browser/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/. + +CONFIGURE_SUBST_FILES += ['installer/Makefile'] + +PARALLEL_DIRS += [ + 'base', + 'components', + 'fuel', + 'locales', + 'modules', + 'themes', + 'extensions', +] + +DIRS += [ + 'devtools', + 'app', +] + +if CONFIG['MOZ_METRO']: + DIRS += ['metro'] + +if CONFIG['MAKENSISU']: + DIRS += ['installer/windows'] + diff --git a/browser/themes/Makefile.in b/browser/themes/Makefile.in index deaffe6f7b3..ef40c1e3e80 100644 --- a/browser/themes/Makefile.in +++ b/browser/themes/Makefile.in @@ -9,13 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -DIRS = osx -else -DIRS = windows -endif -ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT))) -DIRS = linux -endif - include $(topsrcdir)/config/rules.mk diff --git a/browser/themes/linux/Makefile.in b/browser/themes/linux/Makefile.in index 780475108d6..353289fb226 100644 --- a/browser/themes/linux/Makefile.in +++ b/browser/themes/linux/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = communicator - ICON_FILES := icon.png ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} INSTALL_TARGETS += ICON diff --git a/browser/themes/linux/communicator/moz.build b/browser/themes/linux/communicator/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/themes/linux/communicator/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/browser/themes/linux/moz.build b/browser/themes/linux/moz.build new file mode 100644 index 00000000000..22a48f4bc3b --- /dev/null +++ b/browser/themes/linux/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 += ['communicator'] + diff --git a/browser/themes/moz.build b/browser/themes/moz.build new file mode 100644 index 00000000000..50c97b770f9 --- /dev/null +++ b/browser/themes/moz.build @@ -0,0 +1,14 @@ +# 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/. + +toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] + +if toolkit == 'cocoa': + DIRS += ['osx'] +elif toolkit in ('gtk2', 'qt'): + DIRS += ['linux'] +else: + DIRS += ['windows'] + diff --git a/browser/themes/osx/Makefile.in b/browser/themes/osx/Makefile.in index 780475108d6..353289fb226 100644 --- a/browser/themes/osx/Makefile.in +++ b/browser/themes/osx/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = communicator - ICON_FILES := icon.png ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} INSTALL_TARGETS += ICON diff --git a/browser/themes/osx/communicator/moz.build b/browser/themes/osx/communicator/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/themes/osx/communicator/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/browser/themes/osx/moz.build b/browser/themes/osx/moz.build new file mode 100644 index 00000000000..22a48f4bc3b --- /dev/null +++ b/browser/themes/osx/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 += ['communicator'] + diff --git a/browser/themes/windows/Makefile.in b/browser/themes/windows/Makefile.in index 780475108d6..353289fb226 100644 --- a/browser/themes/windows/Makefile.in +++ b/browser/themes/windows/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = communicator - ICON_FILES := icon.png ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} INSTALL_TARGETS += ICON diff --git a/browser/themes/windows/communicator/moz.build b/browser/themes/windows/communicator/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/browser/themes/windows/communicator/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/browser/themes/windows/moz.build b/browser/themes/windows/moz.build new file mode 100644 index 00000000000..22a48f4bc3b --- /dev/null +++ b/browser/themes/windows/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 += ['communicator'] +