X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2FMacOS%2FMakefile;h=5287292fc010a3cf0926dbad10d376d620879a36;hp=9f71141915a6140280cb7223d1c3c98dc1feb2da;hb=63c2dd1dfa6e8ab87e5c2ebf47d43edfb9805c68;hpb=c72f2cb1f7eb299f9289b7a33233174d470cfa0f

diff --git a/distrib/MacOS/Makefile b/distrib/MacOS/Makefile
index 9f71141..5287292 100644
--- a/distrib/MacOS/Makefile
+++ b/distrib/MacOS/Makefile
@@ -7,7 +7,11 @@
 #	framework-pkg  [MacOS only]
 #		Builds /Library/Frameworks/GHC.framework wrapped into a Mac
 #		installer package; must be executed in a ./configure'd tree
-#		(--prefix doesn't matter as it will be overridden)
+#		(--prefix doesn't matter as it will be overridden); other
+#		./configure arguments are passed through, unless overwritten
+#		with XCODE_EXTRA_CONFIGURE_ARGS.  A deployment target can
+#		be specified by setting the corresponding ./configure
+#		argument or by setting MACOSX_DEPLOYMENT_TARGET.
 #
 #	framework-binary-dist  [MacOS only]
 #		Builds GHC.framework encapsulating a binary distribution
@@ -31,13 +35,61 @@ CURRENT_PROJECT_VERSION = $(ProjectVersionInt).$(ProjectPatchLevel)
 # version number.
 SHORT_VERSION_STRING = $(ProjectVersion)
 
+# Name of the installer package
+PACKAGE_NAME = GHC-$(ProjectVersion)-$(TargetArch_CPP).pkg
+
+# Determine arguments that should be passed to ./configure from within Xcode
+#
+# By default, we pass whatever was used when the present tree was configured.
+# The user can override this by setting XCODE_EXTRA_CONFIGURE_ARGS.  If
+# MACOSX_DEPLOYMENT_TARGET is set, the target is added to whatever arguments
+# are passed.
+export XCODE_EXTRA_CONFIGURE_ARGS
+ifeq "$(XCODE_EXTRA_CONFIGURE_ARGS)" ""
+XCODE_EXTRA_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS))
+endif
+ifneq "$(MACOSX_DEPLOYMENT_TARGET)" ""
+XCODE_EXTRA_CONFIGURE_ARGS += --with-macosx-deployment-target=$(MACOSX_DEPLOYMENT_TARGET)
+endif
+
+# Determine whether we need to pass a "-target" option to packagemaker
+#
+# If a deployment target has been set, we use the same target for packagemaker.
+ifneq "$(MACOSX_DEPLOYMENT_TARGET)" ""
+PACKAGEMAKER_TARGET = -target $(MACOSX_DEPLOYMENT_TARGET)
+endif
+
+# Xcode's installation build product location (this is where the GHC.framework
+# is assembled)
+DSTROOT=/tmp/GHC.dst
+
+# Tools directory for a system volume install
+TOOLS_SYSTEM=$(DSTROOT)/Library/Frameworks/GHC.framework/Tools
+
+PACKAGEMAKER=/Developer/usr/bin/packagemaker
+
+# Build and package GHC.framework for /Library/Frameworks
+#
+# * Be careful to clean out Xcode's build product location first, as Xcode
+#   sets permissions such that a second install on top of an existing one
+#   fails
+# * Make there are no contents component descriptions in the .pmdoc.  These are
+#   created by the PackageMaker GUI and have per default the wrong ownership
+#   and permissions for all files (as well as prevent correct setting of those
+#   for files that are not in the content list).
 framework-pkg:
-	xcodebuild -target GHC-systemwide install\
+	-chmod -fR u+w $(DSTROOT)
+	-$(RM) -rf $(DSTROOT)
+	mkdir -p $(TOOLS_SYSTEM)
+	cp installer-scripts/Uninstaller $(TOOLS_SYSTEM)
+	xcodebuild -target GHC-systemwide clean build install\
 		   CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
 	    	   SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
 	 	   FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
 		   CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)
-	@echo "FIXME: call the packager"; exit 1
+	-$(RM) -f GHC-system.pmdoc/*-contents.xml
+	$(PACKAGEMAKER) -v --doc GHC-system.pmdoc\
+			$(PACKAGEMAKER_TARGET) -o $(TOP)/$(PACKAGE_NAME)
 
 # Instead of making 'binary-dist' a Makefile dependency, we let xcodebuild call
 # 'make binary-dist'.  This has the advantage that xcode knows the framework
@@ -46,9 +98,13 @@ framework-pkg:
 # tree yet another time.
 #
 framework-binary-dist:
-	xcodebuild -target GHC-relocatable build\
+	xcodebuild -target GHC-relocatable clean build\
 		   CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
 	    	   SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
 	 	   FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
 		   CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION)
 	@echo "FIXME: call the packager"; exit 1
+	# FIXME: The approach with the binary-dist in the package has the
+	# problem that the BOM is wrong and the installer relocation feature
+	# isn't sufficient as the layout in the binary-dist and the installed
+	# tree is different