Bug 1203032 - Move services/sync/Makefile.in definitions to moz.build. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 09 Sep 2015 17:13:57 +0900
changeset 296209 f2d15b3f34ba558d9428cdfc29a65359c6be87ee
parent 296208 9bc38465a23b9806131730f208afedc669287a73
child 296210 1af4761b27bb25c4c71e28547f6e23f09a7ac6ac
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1203032
milestone43.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
Bug 1203032 - Move services/sync/Makefile.in definitions to moz.build. r=gps
services/sync/Makefile.in
services/sync/moz.build
deleted file mode 100644
--- a/services/sync/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Definitions used by constants.js.
-weave_version := 1.45.0
-weave_id      := {340c2bbc-ce74-4362-90b5-7c26312808ef}
-
-# Preprocess files.
-SYNC_PP := modules/constants.js
-SYNC_PP_FLAGS := \
- -Dweave_version=$(weave_version) \
- -Dweave_id='$(weave_id)'
-SYNC_PP_PATH = $(FINAL_TARGET)/modules/services-sync
-PP_TARGETS += SYNC_PP
-
--- a/services/sync/moz.build
+++ b/services/sync/moz.build
@@ -36,16 +36,24 @@ EXTRA_JS_MODULES['services-sync'] += [
     'modules/resource.js',
     'modules/rest.js',
     'modules/service.js',
     'modules/status.js',
     'modules/userapi.js',
     'modules/util.js',
 ]
 
+EXTRA_PP_JS_MODULES['services-sync'] += [
+    'modules/constants.js',
+]
+
+# Definitions used by constants.js
+DEFINES['weave_version'] = '1.45.0'
+DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}'
+
 EXTRA_JS_MODULES['services-sync'].engines += [
     'modules/engines/addons.js',
     'modules/engines/bookmarks.js',
     'modules/engines/clients.js',
     'modules/engines/forms.js',
     'modules/engines/history.js',
     'modules/engines/passwords.js',
     'modules/engines/prefs.js',