Bug 509888: Packaging does not include xulrunner in the fennec package, r=blassey

This commit is contained in:
Mark Finkle 2009-08-13 13:45:53 -04:00
parent a3a549b55a
commit ce4196c7f3
2 changed files with 4 additions and 1 deletions

View File

@ -55,6 +55,7 @@ installer:
@$(MAKE) -C mobile/installer installer
package:
@rm -rf dist/fennec*
ifeq ($(OS_TARGET),WINCE)
@$(MAKE) -C mobile/installer installer
else

View File

@ -73,6 +73,7 @@ _BINPATH = /$(_APPNAME)/Contents/Resources
endif
PACKAGE_XULRUNNER = package-xulrunner
UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
@ -81,8 +82,9 @@ DEBDESTDIR=debian/$(MOZ_APP_NAME)
package-xulrunner:
ifndef SYSTEM_LIBXUL
@echo "Packaging xulrunner..."
@rm -rf $(LIBXUL_DIST)/xulrunner*
@$(MAKE) -C $(LIBXUL_DIST)/.. package || echo "Perhaps you're trying to package a prebuilt SDK. See 'https://wiki.mozilla.org/Mobile/Build/Fennec#Build' for more information."
@cd $(DIST)/$(MOZ_PKG_DIR); cat $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX) | $(UNMAKE_PACKAGE)
@cd $(DIST)/$(MOZ_PKG_DIR); $(UNMAKE_PACKAGE)
else
@echo "Using system xulrunner..."
endif