diff options
Diffstat (limited to 'application/basilisk/installer')
| -rw-r--r-- | application/basilisk/installer/Makefile.in | 8 | ||||
| -rw-r--r-- | application/basilisk/installer/package-manifest.in | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/application/basilisk/installer/Makefile.in b/application/basilisk/installer/Makefile.in index 4de368db7..1ca3b8ee0 100644 --- a/application/basilisk/installer/Makefile.in +++ b/application/basilisk/installer/Makefile.in @@ -99,19 +99,19 @@ include $(topsrcdir)/toolkit/mozapps/installer/packager.mk ifeq (bundle, $(MOZ_FS_LAYOUT)) BINPATH = $(_BINPATH) -DEFINES += -DAPPNAME=$(_APPNAME) +DEFINES += -DAPPNAME='$(_APPNAME)' else # Every other platform just winds up in dist/bin BINPATH = bin endif -DEFINES += -DBINPATH=$(BINPATH) +DEFINES += -DBINPATH='$(BINPATH)' ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) RESPATH = $(_APPNAME)/Contents/Resources else RESPATH = $(BINPATH) endif -DEFINES += -DRESPATH=$(RESPATH) +DEFINES += -DRESPATH='$(RESPATH)' LPROJ_ROOT = $(firstword $(subst -, ,$(AB_CD))) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) @@ -164,7 +164,7 @@ FINDPATH=bin endif package-compare:: - cd $(DIST); find $(PKGCOMP_FIND_OPTS) $(FINDPATH) -type f | sort > bin-list.txt + cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt -diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in index 22655bc33..bffab0f6e 100644 --- a/application/basilisk/installer/package-manifest.in +++ b/application/basilisk/installer/package-manifest.in @@ -183,6 +183,7 @@ @RESPATH@/components/dom.xpt @RESPATH@/components/dom_apps.xpt @RESPATH@/components/dom_base.xpt +@RESPATH@/components/dom_bindings.xpt @RESPATH@/components/dom_system.xpt @RESPATH@/components/dom_canvas.xpt @RESPATH@/components/dom_core.xpt @@ -354,8 +355,6 @@ @RESPATH@/browser/components/nsSetDefaultBrowser.js @RESPATH@/browser/components/devtools-startup.manifest @RESPATH@/browser/components/devtools-startup.js -@RESPATH@/browser/components/webideCli.js -@RESPATH@/browser/components/webideComponents.manifest @RESPATH@/browser/components/browser-newtab.xpt @RESPATH@/browser/components/aboutNewTabService.js @RESPATH@/browser/components/NewTabComponents.manifest @@ -477,8 +476,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 @@ -593,11 +594,6 @@ @RESPATH@/browser/chrome/icons/default/default48.png #endif -; [Webide Files] -@RESPATH@/browser/chrome/webide@JAREXT@ -@RESPATH@/browser/chrome/webide.manifest -@RESPATH@/browser/@PREF_DIR@/webide-prefs.js - ; DevTools @RESPATH@/browser/chrome/devtools@JAREXT@ @RESPATH@/browser/chrome/devtools.manifest @@ -629,7 +625,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. |