mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1054476 - move INSTALL_TARGETS in services/ Makefiles to EXTRA_{PP_,}JS_MODULES; r=gps
This commit is contained in:
parent
297c5135ce
commit
3a53eb687e
@ -2,32 +2,8 @@
|
|||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||||
# You can obtain one at http://mozilla.org/MPL/2.0/.
|
# You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
modules := \
|
|
||||||
hawkclient.js \
|
|
||||||
hawkrequest.js \
|
|
||||||
storageservice.js \
|
|
||||||
stringbundle.js \
|
|
||||||
tokenserverclient.js \
|
|
||||||
utils.js \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
pp_modules := \
|
|
||||||
async.js \
|
|
||||||
bagheeraclient.js \
|
|
||||||
observers.js \
|
|
||||||
rest.js \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
PREF_JS_EXPORTS := $(srcdir)/services-common.js
|
PREF_JS_EXPORTS := $(srcdir)/services-common.js
|
||||||
|
|
||||||
MODULES_FILES := $(modules)
|
|
||||||
MODULES_DEST = $(FINAL_TARGET)/modules/services-common
|
|
||||||
INSTALL_TARGETS += MODULES
|
|
||||||
|
|
||||||
PP_JS_MODULES := $(pp_modules)
|
|
||||||
PP_JS_MODULES_PATH = $(FINAL_TARGET)/modules/services-common
|
|
||||||
PP_TARGETS += PP_JS_MODULES
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
# What follows is a helper to launch a standalone storage server instance.
|
# What follows is a helper to launch a standalone storage server instance.
|
||||||
|
@ -10,6 +10,22 @@ EXTRA_COMPONENTS += [
|
|||||||
'servicesComponents.manifest',
|
'servicesComponents.manifest',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
EXTRA_JS_MODULES['services-common'] += [
|
||||||
|
'hawkclient.js',
|
||||||
|
'hawkrequest.js',
|
||||||
|
'storageservice.js',
|
||||||
|
'stringbundle.js',
|
||||||
|
'tokenserverclient.js',
|
||||||
|
'utils.js',
|
||||||
|
]
|
||||||
|
|
||||||
|
EXTRA_PP_JS_MODULES['services-common'] += [
|
||||||
|
'async.js',
|
||||||
|
'bagheeraclient.js',
|
||||||
|
'observers.js',
|
||||||
|
'rest.js',
|
||||||
|
]
|
||||||
|
|
||||||
TESTING_JS_MODULES.services.common += [
|
TESTING_JS_MODULES.services.common += [
|
||||||
'modules-testing/bagheeraserver.js',
|
'modules-testing/bagheeraserver.js',
|
||||||
'modules-testing/logging.js',
|
'modules-testing/logging.js',
|
||||||
|
@ -1,12 +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/.
|
|
||||||
|
|
||||||
modules := \
|
|
||||||
utils.js \
|
|
||||||
WeaveCrypto.js \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules))
|
|
||||||
CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto
|
|
||||||
INSTALL_TARGETS += CRYPTO_MODULE
|
|
@ -7,6 +7,11 @@
|
|||||||
DIRS += ['component']
|
DIRS += ['component']
|
||||||
TEST_DIRS += ['tests']
|
TEST_DIRS += ['tests']
|
||||||
|
|
||||||
|
EXTRA_JS_MODULES['services-crypto'] += [
|
||||||
|
'modules/utils.js',
|
||||||
|
'modules/WeaveCrypto.js',
|
||||||
|
]
|
||||||
|
|
||||||
EXTRA_COMPONENTS += [
|
EXTRA_COMPONENTS += [
|
||||||
'cryptoComponents.manifest',
|
'cryptoComponents.manifest',
|
||||||
]
|
]
|
||||||
|
@ -1,11 +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/.
|
|
||||||
|
|
||||||
MODULES := policy.jsm sessions.jsm
|
|
||||||
MODULES_PATH = $(FINAL_TARGET)/modules/services/datareporting
|
|
||||||
PP_TARGETS += MODULES
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
|
||||||
|
|
||||||
$(FINAL_TARGET)/components/DataReportingService.js: policy.jsm sessions.jsm ../common/observers.js
|
|
@ -14,6 +14,11 @@ EXTRA_PP_COMPONENTS += [
|
|||||||
'DataReportingService.js',
|
'DataReportingService.js',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
EXTRA_PP_JS_MODULES.services.datareporting += [
|
||||||
|
'policy.jsm',
|
||||||
|
'sessions.jsm',
|
||||||
|
]
|
||||||
|
|
||||||
TESTING_JS_MODULES.services.datareporting += [
|
TESTING_JS_MODULES.services.datareporting += [
|
||||||
'modules-testing/mocks.jsm',
|
'modules-testing/mocks.jsm',
|
||||||
]
|
]
|
||||||
|
@ -1,19 +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/.
|
|
||||||
|
|
||||||
modules := \
|
|
||||||
healthreporter.jsm \
|
|
||||||
profile.jsm \
|
|
||||||
providers.jsm \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
MAIN_JS_MODULE := HealthReport.jsm
|
|
||||||
MAIN_JS_MODULE_PATH = $(FINAL_TARGET)/modules
|
|
||||||
MAIN_JS_MODULE_FLAGS := $(extra_pp_flags)
|
|
||||||
PP_TARGETS += MAIN_JS_MODULE
|
|
||||||
|
|
||||||
MODULES := $(modules)
|
|
||||||
MODULES_PATH = $(FINAL_TARGET)/modules/services/healthreport
|
|
||||||
MODULES_FLAGS := $(extra_pp_flags)
|
|
||||||
PP_TARGETS += MODULES
|
|
@ -12,6 +12,16 @@ EXTRA_PP_COMPONENTS += [
|
|||||||
'HealthReportComponents.manifest',
|
'HealthReportComponents.manifest',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
EXTRA_PP_JS_MODULES += [
|
||||||
|
'HealthReport.jsm',
|
||||||
|
]
|
||||||
|
|
||||||
|
EXTRA_PP_JS_MODULES.services.healthreport += [
|
||||||
|
'healthreporter.jsm',
|
||||||
|
'profile.jsm',
|
||||||
|
'providers.jsm',
|
||||||
|
]
|
||||||
|
|
||||||
TESTING_JS_MODULES.services.healthreport += [
|
TESTING_JS_MODULES.services.healthreport += [
|
||||||
'modules-testing/utils.jsm',
|
'modules-testing/utils.jsm',
|
||||||
]
|
]
|
||||||
|
@ -1,14 +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/.
|
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
|
||||||
|
|
||||||
# Add extra prerequisites until bug 837792 is addressed.
|
|
||||||
$(FINAL_TARGET)/modules/Metrics.jsm: Metrics.jsm providermanager.jsm dataprovider.jsm storage.jsm
|
|
@ -6,6 +6,12 @@
|
|||||||
|
|
||||||
TEST_DIRS += ['tests']
|
TEST_DIRS += ['tests']
|
||||||
|
|
||||||
|
# We install Metrics.jsm into the "main" JSM repository and the rest in
|
||||||
|
# services. External consumers should only go through Metrics.jsm.
|
||||||
|
EXTRA_PP_JS_MODULES += [
|
||||||
|
'Metrics.jsm',
|
||||||
|
]
|
||||||
|
|
||||||
EXTRA_PP_JS_MODULES.services.metrics += [
|
EXTRA_PP_JS_MODULES.services.metrics += [
|
||||||
'dataprovider.jsm',
|
'dataprovider.jsm',
|
||||||
'providermanager.jsm',
|
'providermanager.jsm',
|
||||||
|
@ -14,58 +14,4 @@ SYNC_PP_FLAGS := \
|
|||||||
SYNC_PP_PATH = $(FINAL_TARGET)/modules/services-sync
|
SYNC_PP_PATH = $(FINAL_TARGET)/modules/services-sync
|
||||||
PP_TARGETS += SYNC_PP
|
PP_TARGETS += SYNC_PP
|
||||||
|
|
||||||
# The set of core JavaScript modules for Sync. These are copied as-is.
|
|
||||||
sync_modules := \
|
|
||||||
addonsreconciler.js \
|
|
||||||
addonutils.js \
|
|
||||||
browserid_identity.js \
|
|
||||||
engines.js \
|
|
||||||
healthreport.jsm \
|
|
||||||
identity.js \
|
|
||||||
jpakeclient.js \
|
|
||||||
keys.js \
|
|
||||||
main.js \
|
|
||||||
notifications.js \
|
|
||||||
policies.js \
|
|
||||||
record.js \
|
|
||||||
resource.js \
|
|
||||||
rest.js \
|
|
||||||
service.js \
|
|
||||||
status.js \
|
|
||||||
userapi.js \
|
|
||||||
util.js \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
# The set of JavaScript modules provide engines for Sync. These are
|
|
||||||
# copied as-is.
|
|
||||||
sync_engine_modules := \
|
|
||||||
addons.js \
|
|
||||||
bookmarks.js \
|
|
||||||
clients.js \
|
|
||||||
forms.js \
|
|
||||||
history.js \
|
|
||||||
passwords.js \
|
|
||||||
prefs.js \
|
|
||||||
tabs.js \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
sync_stage_modules := \
|
|
||||||
cluster.js \
|
|
||||||
declined.js \
|
|
||||||
enginesync.js \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
PREF_JS_EXPORTS := $(srcdir)/services-sync.js
|
PREF_JS_EXPORTS := $(srcdir)/services-sync.js
|
||||||
|
|
||||||
# Install JS module files.
|
|
||||||
SYNC_MAIN_FILES := $(addprefix modules/,$(sync_modules))
|
|
||||||
SYNC_MAIN_DEST = $(FINAL_TARGET)/modules/services-sync
|
|
||||||
INSTALL_TARGETS += SYNC_MAIN
|
|
||||||
|
|
||||||
SYNC_ENGINES_FILES := $(addprefix modules/engines/,$(sync_engine_modules))
|
|
||||||
SYNC_ENGINES_DEST = $(FINAL_TARGET)/modules/services-sync/engines
|
|
||||||
INSTALL_TARGETS += SYNC_ENGINES
|
|
||||||
|
|
||||||
SYNC_STAGES_FILES := $(addprefix modules/stages/,$(sync_stage_modules))
|
|
||||||
SYNC_STAGES_DEST = $(FINAL_TARGET)/modules/services-sync/stages
|
|
||||||
INSTALL_TARGETS += SYNC_STAGES
|
|
||||||
|
@ -15,6 +15,44 @@ EXTRA_PP_COMPONENTS += [
|
|||||||
'SyncComponents.manifest',
|
'SyncComponents.manifest',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
EXTRA_JS_MODULES['services-sync'] += [
|
||||||
|
'modules/addonsreconciler.js',
|
||||||
|
'modules/addonutils.js',
|
||||||
|
'modules/browserid_identity.js',
|
||||||
|
'modules/engines.js',
|
||||||
|
'modules/healthreport.jsm',
|
||||||
|
'modules/identity.js',
|
||||||
|
'modules/jpakeclient.js',
|
||||||
|
'modules/keys.js',
|
||||||
|
'modules/main.js',
|
||||||
|
'modules/notifications.js',
|
||||||
|
'modules/policies.js',
|
||||||
|
'modules/record.js',
|
||||||
|
'modules/resource.js',
|
||||||
|
'modules/rest.js',
|
||||||
|
'modules/service.js',
|
||||||
|
'modules/status.js',
|
||||||
|
'modules/userapi.js',
|
||||||
|
'modules/util.js',
|
||||||
|
]
|
||||||
|
|
||||||
|
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',
|
||||||
|
'modules/engines/tabs.js',
|
||||||
|
]
|
||||||
|
|
||||||
|
EXTRA_JS_MODULES['services-sync'].stages += [
|
||||||
|
'modules/stages/cluster.js',
|
||||||
|
'modules/stages/declined.js',
|
||||||
|
'modules/stages/enginesync.js',
|
||||||
|
]
|
||||||
|
|
||||||
TESTING_JS_MODULES.services.sync += [
|
TESTING_JS_MODULES.services.sync += [
|
||||||
'modules-testing/fakeservices.js',
|
'modules-testing/fakeservices.js',
|
||||||
'modules-testing/fxa_utils.js',
|
'modules-testing/fxa_utils.js',
|
||||||
|
Loading…
Reference in New Issue
Block a user