diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:21:36 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:21:36 +0000 |
| commit | 5f45e2222ef7521a9debe652824d587aaff4ca66 (patch) | |
| tree | 133fbe3ef3eb0f7ce6b151db1ed86bfd9c4abb60 /application/basilisk | |
| parent | a42bed2e9a78715889240ff900e2391bef923285 (diff) | |
| parent | d7359c38b197c221c43def1e24cb48d4aee51bba (diff) | |
| download | UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar.gz UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar.lz UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.tar.xz UXP-5f45e2222ef7521a9debe652824d587aaff4ca66.zip | |
Merge branch 'master' into remove-unboxed
Diffstat (limited to 'application/basilisk')
| -rw-r--r-- | application/basilisk/installer/package-manifest.in | 4 | ||||
| -rw-r--r-- | application/basilisk/locales/Makefile.in | 2 | ||||
| -rw-r--r-- | application/basilisk/locales/l10n.ini | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in index 22655bc33..71f775904 100644 --- a/application/basilisk/installer/package-manifest.in +++ b/application/basilisk/installer/package-manifest.in @@ -477,8 +477,10 @@ @RESPATH@/browser/components/SelfSupportService.manifest @RESPATH@/browser/components/SelfSupportService.js #endif +#ifdef MOZ_SERVICES_SYNC @RESPATH@/components/SyncComponents.manifest @RESPATH@/components/Weave.js +#endif @RESPATH@/components/CaptivePortalDetectComponents.manifest @RESPATH@/components/captivedetect.js @RESPATH@/components/servicesComponents.manifest @@ -629,7 +631,9 @@ @RESPATH@/defaults/pref/channel-prefs.js ; Services (gre) prefs +#ifdef MOZ_SERVICES_SYNC @RESPATH@/defaults/pref/services-sync.js +#endif ; [Layout Engine Resources] ; Style Sheets, Graphics and other Resources used by the layout engine. diff --git a/application/basilisk/locales/Makefile.in b/application/basilisk/locales/Makefile.in index b8aee0f14..527922b11 100644 --- a/application/basilisk/locales/Makefile.in +++ b/application/basilisk/locales/Makefile.in @@ -97,7 +97,9 @@ DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc libs-%: $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C $(DEPTH)/toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' +ifdef MOZ_SERVICES_SYNC @$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$* +endif @$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* # @$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$* diff --git a/application/basilisk/locales/l10n.ini b/application/basilisk/locales/l10n.ini index f1d22c259..78bafe8ca 100644 --- a/application/basilisk/locales/l10n.ini +++ b/application/basilisk/locales/l10n.ini @@ -16,7 +16,9 @@ dirs = browser # non-central apps might want to use %(topsrcdir)s here, or other vars # RFE: that needs to be supported by compare-locales, too, though toolkit = toolkit/locales/l10n.ini +#ifdef MOZ_SERVICES_SYNC services_sync = services/sync/locales/l10n.ini +#endif [extras] dirs = extensions/spellcheck |