diff options
author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-19 22:52:25 -0400 |
---|---|---|
committer | Gaming4JC <g4jc@hyperbola.info> | 2019-06-19 22:52:25 -0400 |
commit | 78b151e57706abce07d34f9f982a05584d844fc4 (patch) | |
tree | 42791281e778d394c4feec1dc804c00f347d706f | |
parent | 7ffc5aae13c2ad7ecda5d8877125d7a6d3c4a1e2 (diff) | |
download | basilisk-78b151e57706abce07d34f9f982a05584d844fc4.tar.gz |
[Basilisk] Fix packaging when sync is not built
Packaging will fail due to missing ifdefs when --disable-sync is passed in .mozconfig. This fixes that issue by including the missing ifdefs.
-rw-r--r-- | basilisk/installer/package-manifest.in | 4 | ||||
-rw-r--r-- | basilisk/locales/Makefile.in | 2 | ||||
-rw-r--r-- | basilisk/locales/l10n.ini | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/basilisk/installer/package-manifest.in b/basilisk/installer/package-manifest.in index 22655bc..71f7759 100644 --- a/basilisk/installer/package-manifest.in +++ b/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/basilisk/locales/Makefile.in b/basilisk/locales/Makefile.in index b8aee0f..527922b 100644 --- a/basilisk/locales/Makefile.in +++ b/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/basilisk/locales/l10n.ini b/basilisk/locales/l10n.ini index f1d22c2..78bafe8 100644 --- a/basilisk/locales/l10n.ini +++ b/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 |