From d25014f24c33c8686c228acaa545d5e320a7ad34 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Thu, 28 Aug 2014 13:30:22 +0000
Subject: [PATCH] You can now use 'make pkg' to build OS X Installer packages
 for GF

The script bin/build-binary-dist.sh has been updated to build either a plain
.tar.gz package or OS X Installer package (.pkg).

Note that bin/build-binary-dist.sh is designed to build and include the
C run-time system in the binary package.  If the C run-time system fails to
build, no binary package will be created.
---
 Makefile                 |  8 ++++++++
 bin/build-binary-dist.sh | 27 ++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index ad5c23e01..bb7c3fde3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,3 +33,11 @@ html::
 # (Tested on Ubuntu 14.04. You need to install dpkg-dev & debhelper.)
 deb:
 	dpkg-buildpackage -b
+
+# Make an OS X Installer package
+pkg:
+	PREFIX=/usr FMT=pkg bash bin/build-binary-dist.sh
+
+# Make a binary tar distribution
+bintar:
+	bash bin/build-binary-dist.sh
diff --git a/bin/build-binary-dist.sh b/bin/build-binary-dist.sh
index 6e9bcd0bf..9139efbf7 100644
--- a/bin/build-binary-dist.sh
+++ b/bin/build-binary-dist.sh
@@ -1,8 +1,10 @@
 #! /bin/bash
 
-### This script builds a binary distribution tarball of GF from the source
+### This script builds a binary distribution of GF from the source
 ### package that this script is a part of. It assumes that you have installed
 ### the Haskell Platform, version 2013.2.0.0 or 2012.4.0.0.
+### Two binary package formats are supported: plain tar files (.tar.gz) and
+### OS X Installer packages (.pkg).
 
 os=$(uname)     # Operating system name (e.g. Darwin or Linux)
 hw=$(uname -m)  # Hardware name (e.g. i686 or x86_64)
@@ -10,9 +12,10 @@ hw=$(uname -m)  # Hardware name (e.g. i686 or x86_64)
 # GF version number:
 ver=$(grep -i ^version: gf.cabal | sed -e 's/version://' -e 's/ //g')
 
-destdir=/tmp/gf-binary-dist-$$     # assemble binary dist here
-prefix=/usr/local                  # where to install
-targz=gf-$ver-bin-$hw-$os.tar.gz   # the final tar file
+name=gf-$ver
+destdir=dist/$name                 # assemble binary dist here
+prefix=${PREFIX:-/usr/local}       # where to install
+fmt=${FMT:-tar.gz}                 # binary package format (tar.gz or pkg)
 
 extralib="$destdir$prefix/lib"
 extrainclude="$destdir$prefix/include"
@@ -44,9 +47,19 @@ cabal install --only-dependencies
 cabal configure --prefix=$prefix -fserver -fc-runtime $extra
 DYLD_LIBRARY_PATH="$extralib" LD_LIBRARY_PATH="$extralib" cabal build
 cabal copy --destdir=$destdir
-libdir=`echo $destdir/$prefix/lib/gf-*/*/`
+libdir=$(dirname $(find $destdir -name PGF.hi))
 cabal register --gen-pkg-config=$libdir/gf-$ver.conf
 
-tar -C $destdir/$prefix -zcf $targz .
-echo "Created $targz, consider renaming it to something more user friendly"
+case $fmt in
+    tar.gz)
+	targz=$name-bin-$hw-$os.tar.gz     # the final tar file
+	tar -C $destdir/$prefix -zcf dist/$targz .
+	echo "Created $targz, consider renaming it to something more user friendly"
+	;;
+    pkg)
+	pkg=$name.pkg
+	pkgbuild --identifier org.grammaticalframework.gf.pkg --version 3.6 --root $destdir/usr --install-location /usr dist/$pkg
+	echo "Created $pkg"
+esac
+
 rm -r $destdir