From 2d648e2842f7bafc5da2415dfe654bf65bd932db Mon Sep 17 00:00:00 2001
From: "dtownsend%oxymoronical.com"
 <dtownsend%oxymoronical.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Apr 2008 14:50:48 +0000
Subject: [PATCH] Bug 410637: Mac UB XULRunner SDK packages have empty bin
 directory. r=bsmedberg, a=beltzner

git-svn-id: svn://10.0.0.236/trunk@249975 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/build/macosx/universal/flight.mk      | 7 +++++--
 mozilla/toolkit/mozapps/installer/packager.mk | 6 +++++-
 mozilla/xulrunner/installer/Makefile.in       | 2 --
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mozilla/build/macosx/universal/flight.mk b/mozilla/build/macosx/universal/flight.mk
index 4828aea5498..3090e5e2e98 100644
--- a/mozilla/build/macosx/universal/flight.mk
+++ b/mozilla/build/macosx/universal/flight.mk
@@ -57,7 +57,11 @@ else
 DBGTAG =
 endif
 
+ifdef LIBXUL_SDK # {
+APP_CONTENTS = Contents/Frameworks/XUL.framework
+else # } {
 APP_CONTENTS = Contents/MacOS
+endif # } LIBXUL_SDK
 
 ifeq ($(MOZ_BUILD_APP),camino) # {
 INSTALLER_DIR = camino/installer
@@ -67,14 +71,13 @@ BUILDCONFIG_JAR = Contents/MacOS/chrome/embed.jar
 else # } {
 MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
 APPNAME = $(MOZ_APP_DISPLAYNAME)$(DBGTAG).app
-BUILDCONFIG_JAR = Contents/MacOS/chrome/toolkit.jar
 INSTALLER_DIR = $(MOZ_BUILD_APP)/installer
 ifeq ($(MOZ_BUILD_APP),xulrunner) # {
 INSTALLER_DIR = xulrunner/installer/mac
-BUILDCONFIG_JAR = Versions/Current/chrome/toolkit.jar
 APPNAME = XUL.framework
 APP_CONTENTS = Versions/Current
 endif # } xulrunner
+BUILDCONFIG_JAR = $(APP_CONTENTS)/chrome/toolkit.jar
 endif # } !camino
 
 postflight_all:
diff --git a/mozilla/toolkit/mozapps/installer/packager.mk b/mozilla/toolkit/mozapps/installer/packager.mk
index d0dfff94ece..b05fd1d3850 100644
--- a/mozilla/toolkit/mozapps/installer/packager.mk
+++ b/mozilla/toolkit/mozapps/installer/packager.mk
@@ -177,6 +177,7 @@ UNMAKE_PACKAGE	= \
 # The plst and blkx resources are skipped because they belong to each
 # individual dmg and are created by hdiutil.
 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)
 endif
 
@@ -445,12 +446,15 @@ ifdef INSTALL_SDK # Here comes the hard part
 endif # INSTALL_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..."
 	$(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk
 	$(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin
 	(cd $(DIST)/sdk-stage && tar $(TAR_CREATE_FLAGS) - .) | \
 	  (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
 	(cd $(DIST)/sdk && tar $(TAR_CREATE_FLAGS) - .) | \
 	  (cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -)
diff --git a/mozilla/xulrunner/installer/Makefile.in b/mozilla/xulrunner/installer/Makefile.in
index bb8ff9d3996..50fd9d970cc 100644
--- a/mozilla/xulrunner/installer/Makefile.in
+++ b/mozilla/xulrunner/installer/Makefile.in
@@ -129,5 +129,3 @@ install:: $(pkg_config_files)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
 
 GARBAGE += $(MOZILLA_VERSION).system.conf $(pkg_config_files)
-
-libs:: make-sdk