From 5bdead052fbb2cc44a7fb86b391d99344342b659 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Thu, 9 Aug 2007 19:53:08 +0000 Subject: [PATCH] Bug 391308 - Make the new-style SDK package, r=luser --- toolkit/mozapps/installer/packager.mk | 32 +++++++++++++++++++++++++ xulrunner/build.mk | 3 +++ xulrunner/installer/Makefile.in | 34 --------------------------- 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 6cd0223642d..1062ff422dd 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -72,6 +72,11 @@ endif # MOZ_PKG_FORMAT PACKAGE = $(PKG_BASENAME)$(PKG_SUFFIX) +# By default, the SDK uses the same packaging type as the main bundle, +# but on mac it is a .tar.bz2 +SDK_SUFFIX = $(PKG_SUFFIX) +SDK = $(PKG_BASENAME).sdk$(SDK_SUFFIX) + MAKE_PACKAGE = $(error What is a $(MOZ_PKG_FORMAT) package format?); CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ @@ -82,21 +87,25 @@ ifeq ($(MOZ_PKG_FORMAT),TAR) PKG_SUFFIX = .tar MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_APPNAME) > $(PACKAGE) UNMAKE_PACKAGE = $(UNPACK_TAR) < $(UNPACKAGE) +MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > $(SDK) endif ifeq ($(MOZ_PKG_FORMAT),TGZ) PKG_SUFFIX = .tar.gz MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_APPNAME) | gzip -vf9 > $(PACKAGE) UNMAKE_PACKAGE = gunzip -c $(UNPACKAGE) | $(UNPACK_TAR) +MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | gzip -vf9 > $(SDK) endif ifeq ($(MOZ_PKG_FORMAT),BZ2) PKG_SUFFIX = .tar.bz2 MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_APPNAME) | bzip2 -vf > $(PACKAGE) UNMAKE_PACKAGE = bunzip2 -c $(UNPACKAGE) | $(UNPACK_TAR) +MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK) endif ifeq ($(MOZ_PKG_FORMAT),ZIP) PKG_SUFFIX = .zip MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_APPNAME) UNMAKE_PACKAGE = $(UNZIP) $(UNPACKAGE) +MAKE_SDK = $(ZIP) -r9D $(SDK_BASENAME).sdk.zip $(MOZ_APP_NAME)-sdk endif ifeq ($(MOZ_PKG_FORMAT),DMG) ifndef _APPNAME @@ -165,6 +174,8 @@ UNMAKE_PACKAGE = \ $(NULL) # The plst and blkx resources are skipped because they belong to each # individual dmg and are created by hdiutil. +SDK_SUFFIX = .tar.bz2 +MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK) endif # dummy macro if we don't have PSM built @@ -420,3 +431,24 @@ ifdef INSTALL_SDK # Here comes the hard part ln -s $(idldir)/stable $(DESTDIR)$(sdkdir)/sdk/idl ln -s $(idldir)/unstable $(DESTDIR)$(sdkdir)/idl endif # INSTALL_SDK + +make-sdk:: stage-package + @echo "Packaging SDK..." + $(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk + $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin + (cd $(DIST)/$(MOZ_PKG_APPNAME) && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -) + $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk + (cd $(DIST)/sdk && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -) + $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/include + (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DIST)/$(MOZ_APP_NAME)-sdk/include && tar -xf -) + $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/idl + (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DIST)/$(MOZ_APP_NAME)-sdk/idl && tar -xf -) + $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/lib +# sdk/lib is the same as sdk/sdk/lib + (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DIST)/$(MOZ_APP_NAME)-sdk/lib && tar -xf -) + cd $(DIST) && $(MAKE_SDK) diff --git a/xulrunner/build.mk b/xulrunner/build.mk index e1b231daa64..4d09a5cbe95 100644 --- a/xulrunner/build.mk +++ b/xulrunner/build.mk @@ -84,3 +84,6 @@ package: install: @$(MAKE) -C xulrunner/installer install + +sdk: + @$(MAKE) -C xulrunner/installer make-sdk diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in index 9d874552483..df2bf647769 100644 --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in @@ -112,38 +112,4 @@ install:: $(pkg_config_files) @echo pkg_config_file: $(pkg_config_files) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig -# -# Package the SDK directory -# - -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -SDK_APPNAME = $(MOZ_APP_NAME) -else -SDK_APPNAME = $(MOZ_PKG_APPNAME) -endif -SDK_BASENAME = $(SDK_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM) -SDK = $(SDK_BASENAME).sdk$(PKG_SUFFIX) - -ifeq ($(MOZ_PKG_FORMAT),TAR) -MAKE_SDK = $(CREATE_FINAL_TAR) - gecko-sdk > $(SDK) -else -ifeq ($(MOZ_PKG_FORMAT),TGZ) -MAKE_SDK = $(CREATE_FINAL_TAR) - gecko-sdk | gzip -vf9 > $(SDK) -else -ifeq ($(MOZ_PKG_FORMAT),BZ2) -MAKE_SDK = $(CREATE_FINAL_TAR) - gecko-sdk | bzip2 -vf > $(SDK) -else -# default to zip -MAKE_SDK = $(ZIP) -r9D $(SDK_BASENAME).sdk.zip gecko-sdk -endif -endif -endif - -make-sdk: - @echo "Packaging SDK..." - @rm -rf $(DIST)/gecko-sdk - @mkdir $(DIST)/gecko-sdk - @cd $(DIST)/sdk && tar $(TAR_CREATE_FLAGS) - * | (cd ../gecko-sdk; tar -xf -) - cd $(DIST) && $(MAKE_SDK) - libs:: make-sdk