author | Gregory Szorc <gps@mozilla.com> |
Mon, 25 Feb 2013 12:47:24 -0800 | |
changeset 123251 | c67860b9a9d3daf835838eb5a71577bd42fa308a |
parent 123250 | 0741061e86e7a524a4d1fd7c2fa0fbc2106126d3 |
child 123252 | 2e4ea5c2020e854110ae42dd18143eba1c390497 |
push id | 24376 |
push user | Ms2ger@gmail.com |
push date | Thu, 28 Feb 2013 17:05:14 +0000 |
treeherder | mozilla-central@c65d59d33aa8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 784841 |
milestone | 22.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/services/Makefile.in +++ b/services/Makefile.in @@ -4,30 +4,9 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS += \ - common \ - crypto \ - $(NULL) - -ifdef MOZ_SERVICES_HEALTHREPORT -PARALLEL_DIRS += healthreport -endif - -ifdef MOZ_DATA_REPORTING -PARALLEL_DIRS += datareporting -endif - -ifdef MOZ_SERVICES_METRICS -PARALLEL_DIRS += metrics -endif - -ifdef MOZ_SERVICES_SYNC -PARALLEL_DIRS += sync -endif - include $(topsrcdir)/config/rules.mk
--- a/services/common/Makefile.in +++ b/services/common/Makefile.in @@ -31,18 +31,16 @@ testing_modules := \ storageserver.js \ utils.js \ $(NULL) EXTRA_COMPONENTS := \ servicesComponents.manifest \ $(NULL) -TEST_DIRS += tests - PREF_JS_EXPORTS = $(srcdir)/services-common.js MODULES_FILES := $(modules) MODULES_DEST = $(FINAL_TARGET)/modules/services-common INSTALL_TARGETS += MODULES TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules)) TESTING_JS_MODULE_DIR := services-common
new file mode 100644 --- /dev/null +++ b/services/common/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']
new file mode 100644 --- /dev/null +++ b/services/common/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/. +
--- a/services/crypto/Makefile.in +++ b/services/crypto/Makefile.in @@ -19,13 +19,9 @@ MODULE = services-crypto EXTRA_COMPONENTS := \ cryptoComponents.manifest \ $(NULL) CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules)) CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto INSTALL_TARGETS += CRYPTO_MODULE -TEST_DIRS += tests - -DIRS += component - include $(topsrcdir)/config/rules.mk
--- a/services/crypto/component/Makefile.in +++ b/services/crypto/component/Makefile.in @@ -24,11 +24,9 @@ IS_COMPONENT := 1 MODULE_NAME := nsServicesCryptoModule LIBXUL_LIBRARY := 1 MOZILLA_INTERNAL_API := 1 CPPSRCS := \ nsSyncJPAKE.cpp \ $(NULL) -TEST_DIRS += tests - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/services/crypto/component/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']
new file mode 100644 --- /dev/null +++ b/services/crypto/component/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/. +
new file mode 100644 --- /dev/null +++ b/services/crypto/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 += ['component'] +TEST_DIRS += ['tests']
new file mode 100644 --- /dev/null +++ b/services/crypto/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/. +
--- a/services/datareporting/Makefile.in +++ b/services/datareporting/Makefile.in @@ -4,18 +4,16 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += tests - MODULES := policy.jsm sessions.jsm MODULES_PATH = $(FINAL_TARGET)/modules/services/datareporting PP_TARGETS += MODULES TESTING_JS_MODULES := $(addprefix modules-testing/,mocks.jsm) TESTING_JS_MODULE_DIR := services/datareporting EXTRA_COMPONENTS := \
new file mode 100644 --- /dev/null +++ b/services/datareporting/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']
new file mode 100644 --- /dev/null +++ b/services/datareporting/tests/moz.build @@ -0,0 +1,4 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +
--- a/services/healthreport/Makefile.in +++ b/services/healthreport/Makefile.in @@ -14,18 +14,16 @@ modules := \ profile.jsm \ providers.jsm \ $(NULL) testing_modules := \ utils.jsm \ $(NULL) -TEST_DIRS += tests - healthreport_depends = \ HealthReport.jsm \ ../common/async.js \ ../common/bagheeraclient.js \ ../metrics/Metrics.jsm \ ../metrics/collector.jsm \ ../metrics/dataprovider.jsm \ ../metrics/storage.jsm \
new file mode 100644 --- /dev/null +++ b/services/healthreport/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']
new file mode 100644 --- /dev/null +++ b/services/healthreport/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/. +
--- a/services/metrics/Makefile.in +++ b/services/metrics/Makefile.in @@ -20,18 +20,16 @@ testing_modules := \ $(NULL) # We install Metrics.jsm into the "main" JSM repository and the rest in # services. External consumers should only go through Metrics.jsm. MAIN_JS_MODULE := Metrics.jsm MAIN_JS_MODULE_PATH = $(FINAL_TARGET)/modules PP_TARGETS += MAIN_JS_MODULE -TEST_DIRS += tests - JS_MODULES := $(modules) JS_MODULES_PATH = $(FINAL_TARGET)/modules/services/metrics PP_TARGETS += JS_MODULES TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules)) TESTING_JS_MODULE_DIR := services/metrics include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/services/metrics/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']
new file mode 100644 --- /dev/null +++ b/services/metrics/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/. +
new file mode 100644 --- /dev/null +++ b/services/moz.build @@ -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/. + +PARALLEL_DIRS += [ + 'common', + 'crypto', +] + +if CONFIG['MOZ_SERVICES_HEALTHREPORT']: + PARALLEL_DIRS += ['healthreport'] + +if CONFIG['MOZ_DATA_REPORTING']: + PARALLEL_DIRS += ['datareporting'] + +if CONFIG['MOZ_SERVICES_METRICS']: + PARALLEL_DIRS += ['metrics'] + +if CONFIG['MOZ_SERVICES_SYNC']: + PARALLEL_DIRS += ['sync']
--- a/services/sync/Makefile.in +++ b/services/sync/Makefile.in @@ -61,19 +61,16 @@ sync_stage_modules := \ $(NULL) sync_testing_modules := \ fakeservices.js \ rotaryengine.js \ utils.js \ $(NULL) -DIRS += locales -TEST_DIRS += tests - EXTRA_COMPONENTS := \ SyncComponents.manifest \ Weave.js \ $(NULL) PREF_JS_EXPORTS := $(srcdir)/services-sync.js # Install JS module files.
new file mode 100644 --- /dev/null +++ b/services/sync/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/. +
new file mode 100644 --- /dev/null +++ b/services/sync/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 += ['locales'] +TEST_DIRS += ['tests']
new file mode 100644 --- /dev/null +++ b/services/sync/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/. +