aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-10-16 08:03:59 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-10-16 08:03:59 -0700
commiteac9cdcffbf750bef187c703b7581eae5326d6ef (patch)
tree108986a88ef42f8d217d1c13d43bc1139292f123
parent2357e61748eada76a41a72adaf5adcb815b4a574 (diff)
downloadpandoc-eac9cdcffbf750bef187c703b7581eae5326d6ef.tar.gz
Use stack for make_osx_package.sh.
Added stack.pkg.yaml for package creation.
-rwxr-xr-xmake_osx_package.sh24
-rw-r--r--stack.pkg.yaml19
2 files changed, 26 insertions, 17 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh
index e86ed18f2..9188f7513 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
+LOCALBIN=$HOME/.local/bin
DIST=`pwd`/osx_package
-SANDBOX=`pwd`/.cabal-sandbox
VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
RESOURCES=$DIST/Resources
ROOT=$DIST/pandoc
@@ -11,38 +11,28 @@ SCRIPTS=$OSX/osx-resources
BASE=pandoc-$VERSION
ME=$(whoami)
PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
-CPPHS=$SANDBOX/bin/cpphs
# echo Removing old files...
rm -rf $DIST
mkdir -p $RESOURCES
-cabal sandbox init
-echo Updating database
-cabal update
-
echo Building pandoc...
-cabal clean
-# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
-cabal install cpphs hsb2hs
-cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files make-pandoc-man-pages" --ghc-options "-pgmP$CPPHS -optP--cpp" . pandoc-citeproc
-
-# get pandoc-citeproc man page:
-PANDOC_CITEPROC_PATH=`cabal unpack -d $DIST pandoc-citeproc | awk '{print $3;}'`
+stack install --stack-yaml=stack.pkg.yaml
+make man/pandoc.1
mkdir -p $DEST/bin
mkdir -p $DEST/share/man/man1
mkdir -p $DEST/share/man/man5
for f in pandoc pandoc-citeproc; do
- cp $SANDBOX/bin/$f $DEST/bin/;
+ cp $LOCALBIN/$f $DEST/bin/;
done
-cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
-cp $SANDBOX/share/man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
+cp ../pandoc-citeproc/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
+cp man/pandoc.1 $DEST/share/man/man1/
chown -R $ME:staff $DIST
echo Copying license...
-$SANDBOX/bin/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
+$LOCALBIN/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
echo Signing pandoc executable...
diff --git a/stack.pkg.yaml b/stack.pkg.yaml
new file mode 100644
index 000000000..9fbe2783f
--- /dev/null
+++ b/stack.pkg.yaml
@@ -0,0 +1,19 @@
+flags:
+ pandoc:
+ trypandoc: false
+ https: true
+ embed_data_files: true
+ old-locale: false
+ network-uri: true
+ pandoc-citeproc:
+ bibutils: true
+ embed_data_files: true
+ unicode_collation: false
+ test_citeproc: false
+ debug: false
+ghc-options:
+ pandoc-citeproc: '-pgmP cpphs -optP--cpp'
+packages:
+- '.'
+- '../pandoc-citeproc'
+resolver: lts-3.9