wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 827303 - Firefox core and crypto services components assume services/sync is built. Move registrations out of services/sync. r=gps

Browse Source 
--HG--
rename : services/sync/SyncComponents.manifest => services/common/servicesComponents.manifest
rename : services/sync/SyncComponents.manifest => services/crypto/cryptoComponents.manifest
This commit is contained in:
Mark Banner 2013-01-10 22:02:38 +00:00
parent 38a01c5f30
commit 97bf467204
9 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/installer/package-manifest.in
View File

@ -484,6 +484,8 @@
@BINPATH@/components/WeaveCrypto.manifest
@BINPATH@/components/WeaveCrypto.js
#endif
@BINPATH@/components/servicesComponents.manifest
@BINPATH@/components/cryptoComponents.manifest
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/components/HealthReportComponents.manifest
@BINPATH@/components/HealthReportService.js

2
browser/installer/package-manifest.in
View File

@ -477,6 +477,8 @@
@BINPATH@/components/SyncComponents.manifest
@BINPATH@/components/Weave.js
#endif
@BINPATH@/components/servicesComponents.manifest
@BINPATH@/components/cryptoComponents.manifest
@BINPATH@/components/TelemetryPing.js
@BINPATH@/components/TelemetryPing.manifest
@BINPATH@/components/messageWakeupService.js

2
mobile/xul/installer/package-manifest.in
View File

@ -434,6 +434,8 @@
@BINPATH@/components/WeaveCrypto.manifest
@BINPATH@/components/WeaveCrypto.js
#endif
@BINPATH@/components/servicesComponents.manifest
@BINPATH@/components/cryptoComponents.manifest
#ifdef MOZ_SERVICES_HEALTHREPORT
@BINPATH@/components/HealthReportComponents.manifest
@BINPATH@/components/HealthReportService.js

4
services/common/Makefile.in
View File

@ -30,6 +30,10 @@ testing_modules := \
utils.js \
$(NULL)
EXTRA_COMPONENTS := \
servicesComponents.manifest \
$(NULL)
TEST_DIRS += tests
PREF_JS_EXPORTS = $(srcdir)/services-common.js

2
services/common/servicesComponents.manifest Normal file
View File

@ -0,0 +1,2 @@
# Register resource aliases
resource services-common resource://gre/modules/services-common/

4
services/crypto/Makefile.in
View File

@ -16,6 +16,10 @@ modules := \
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

1
services/crypto/cryptoComponents.manifest Normal file
View File

@ -0,0 +1 @@
resource services-crypto resource://gre/modules/services-crypto/

4
services/crypto/modules/WeaveCrypto.js
View File

@ -57,7 +57,11 @@ WeaveCrypto.prototype = {
this.prefBranch = Services.prefs.getBranch("services.sync.log.");
this.prefBranch.addObserver("cryptoDebug", this.observer, false);
this.observer._self = this;
try {
this.debug = this.prefBranch.getBoolPref("cryptoDebug");
} catch (x) {
this.debug = false;
}
this.initNSS();
this.initAlgorithmSettings(); // Depends on NSS.

2
services/sync/SyncComponents.manifest
View File

@ -23,5 +23,3 @@ contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4
# Register resource aliases
# (Note, for tests these are also set up in addResourceAlias)
resource services-sync resource://gre/modules/services-sync/
resource services-common resource://gre/modules/services-common/
resource services-crypto resource://gre/modules/services-crypto/