Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 410637: Mac UB XULRunner SDK packages have empty bin directory.

Browse Source 
r=bsmedberg, a=beltzner


git-svn-id: svn://10.0.0.236/trunk@249975 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dtownsend%oxymoronical.com 2008-04-10 14:50:48 +00:00
parent 7dab8db09d
commit 2d648e2842
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mozilla/build/macosx/universal/flight.mk
View File

@ -57,7 +57,11 @@ else
DBGTAG = DBGTAG =
endif endif
ifdef LIBXUL_SDK # {
APP_CONTENTS = Contents/Frameworks/XUL.framework
else # } {
APP_CONTENTS = Contents/MacOS APP_CONTENTS = Contents/MacOS
endif # } LIBXUL_SDK
ifeq ($(MOZ_BUILD_APP),camino) # { ifeq ($(MOZ_BUILD_APP),camino) # {
INSTALLER_DIR = camino/installer INSTALLER_DIR = camino/installer
@ -67,14 +71,13 @@ BUILDCONFIG_JAR = Contents/MacOS/chrome/embed.jar
else # } { else # } {
MOZ_PKG_APPNAME = $(MOZ_APP_NAME) MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
APPNAME = $(MOZ_APP_DISPLAYNAME)$(DBGTAG).app APPNAME = $(MOZ_APP_DISPLAYNAME)$(DBGTAG).app
BUILDCONFIG_JAR = Contents/MacOS/chrome/toolkit.jar
INSTALLER_DIR = $(MOZ_BUILD_APP)/installer INSTALLER_DIR = $(MOZ_BUILD_APP)/installer
ifeq ($(MOZ_BUILD_APP),xulrunner) # { ifeq ($(MOZ_BUILD_APP),xulrunner) # {
INSTALLER_DIR = xulrunner/installer/mac INSTALLER_DIR = xulrunner/installer/mac
BUILDCONFIG_JAR = Versions/Current/chrome/toolkit.jar
APPNAME = XUL.framework APPNAME = XUL.framework
APP_CONTENTS = Versions/Current APP_CONTENTS = Versions/Current
endif # } xulrunner endif # } xulrunner
BUILDCONFIG_JAR = $(APP_CONTENTS)/chrome/toolkit.jar
endif # } !camino endif # } !camino
postflight_all: postflight_all:

6
mozilla/toolkit/mozapps/installer/packager.mk
View File

@ -177,6 +177,7 @@ UNMAKE_PACKAGE = \
# The plst and blkx resources are skipped because they belong to each # The plst and blkx resources are skipped because they belong to each
# individual dmg and are created by hdiutil. # individual dmg and are created by hdiutil.
SDK_SUFFIX = .tar.bz2 SDK_SUFFIX = .tar.bz2
SDK = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK) MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
endif endif
@ -445,12 +446,15 @@ ifdef INSTALL_SDK # Here comes the hard part
endif # INSTALL_SDK endif # INSTALL_SDK
make-sdk: make-sdk:
$(MAKE) stage-package STAGE_SDK=1 MOZ_PKG_APPNAME=sdk-stage $(MAKE) stage-package UNIVERSAL_BINARY= STAGE_SDK=1 MOZ_PKG_APPNAME=sdk-stage
@echo "Packaging SDK..." @echo "Packaging SDK..."
$(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk $(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin
(cd $(DIST)/sdk-stage && tar $(TAR_CREATE_FLAGS) - .) | \ (cd $(DIST)/sdk-stage && tar $(TAR_CREATE_FLAGS) - .) | \
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -) (cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -)
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin
(cd $(DIST)/host/bin && tar $(TAR_CREATE_FLAGS) - .) | \
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin && tar -xf -)
$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk
(cd $(DIST)/sdk && tar $(TAR_CREATE_FLAGS) - .) | \ (cd $(DIST)/sdk && tar $(TAR_CREATE_FLAGS) - .) | \
(cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -) (cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -)

2
mozilla/xulrunner/installer/Makefile.in
View File

@ -129,5 +129,3 @@ install:: $(pkg_config_files)
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files) GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files)
libs:: make-sdk