Permalink
Browse files

Bug 784841 - Part 18ε: Convert /services; f=Ms2ger rs=ted

  • Loading branch information...
indygreg committed Feb 25, 2013
1 parent 917a25d commit 19f0db465726f63e22e70dba6ddf625972f3b171
View
@@ -9,25 +9,4 @@ 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
@@ -36,8 +36,6 @@ EXTRA_COMPONENTS := \
servicesComponents.manifest \
$(NULL)
-TEST_DIRS += tests
-
PREF_JS_EXPORTS = $(srcdir)/services-common.js
MODULES_FILES := $(modules)
@@ -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']
@@ -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/.
+
@@ -24,8 +24,4 @@ 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
@@ -29,6 +29,4 @@ CPPSRCS := \
nsSyncJPAKE.cpp \
$(NULL)
-TEST_DIRS += tests
-
include $(topsrcdir)/config/rules.mk
@@ -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']
@@ -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/.
+
@@ -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']
@@ -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/.
+
@@ -9,8 +9,6 @@ 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
@@ -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']
@@ -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/.
+
@@ -19,8 +19,6 @@ testing_modules := \
utils.jsm \
$(NULL)
-TEST_DIRS += tests
-
healthreport_depends = \
HealthReport.jsm \
../common/async.js \
@@ -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']
@@ -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/.
+
@@ -25,8 +25,6 @@ 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
@@ -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']
@@ -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/.
+
View
@@ -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']
@@ -66,9 +66,6 @@ sync_testing_modules := \
utils.js \
$(NULL)
-DIRS += locales
-TEST_DIRS += tests
-
EXTRA_COMPONENTS := \
SyncComponents.manifest \
Weave.js \
@@ -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/.
+
View
@@ -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']
@@ -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/.
+

0 comments on commit 19f0db4

Please sign in to comment.