Bug 476733 - WinCE Dynamic CAB INF File Production Needed - ugly patch to fix buildbot issues

When landing this patch, the command for producing a ZIP and CAB for fennec
changed from "make package" to "make installer"

Unfortunately, the buildbots know nothing of this change.

This ugly patch makes the "make package" command build the needed xulrunner and fennec ZIPs,
as well as the desired fennec CAB.  With this patch (attachment 641741) we produce the
XULrunner ZIP 3 times, the fennec ZIP 2 times, and the CAB 2 times.
This commit is contained in:
John Wolfe 2009-04-10 22:34:50 -04:00
parent cd2af4ebf9
commit 2628842b22
2 changed files with 5 additions and 1 deletions

View File

@ -55,7 +55,11 @@ installer:
@$(MAKE) -C mobile/installer installer
package:
ifeq ($(OS_TARGET),WINCE)
@$(MAKE) -C mobile/installer installer
else
@$(MAKE) -C mobile/installer
endif
install::
@echo "Mobile can't be installed directly."

View File

@ -120,7 +120,7 @@ UNPACKAGE = $(LIBXUL_DIST)/xulrunner*$(PKG_SUFFIX)
installer: stage-package package-xulrunner
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
cd $(DIST) && $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_NAME)" "$(PKG_PATH)$(PKG_BASENAME).CAB"
cd $(DIST) && $(PYTHON) $(topsrcdir)/build/package/wince/make_wince_cab.py "$(VSINSTALLDIR)/SmartDevices/SDK/SDKTools/cabwiz.exe" "$(MOZ_PKG_DIR)" "$(MOZ_APP_NAME)" "$(PKG_PATH)$(PKG_BASENAME).CAB" && $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR)
@echo Installer $(PKG_PATH)$(PKG_BASENAME).CAB created!
endif