@@ -1,7 +1,7 @@
11#!/bin/bash -e
22
3+LOCALBIN=$HOME/.local/bin
34DIST=`pwd`/osx_package
4−SANDBOX=`pwd`/.cabal-sandbox
55VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
66RESOURCES=$DIST/Resources
77ROOT=$DIST/pandoc
@@ -11,38 +11,28 @@ SCRIPTS=$OSX/osx-resources
1111BASE=pandoc-$VERSION
1212ME=$(whoami)
1313PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
14−CPPHS=$SANDBOX/bin/cpphs
1514
1615# echo Removing old files...
1716rm -rf $DIST
1817mkdir -p $RESOURCES
1918
20−cabal sandbox init
21−echo Updating database
22−cabal update
23−
2419echo Building pandoc...
25−cabal clean
26−# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
27−cabal install cpphs hsb2hs
28−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
29−
30−# get pandoc-citeproc man page:
31−PANDOC_CITEPROC_PATH=`cabal unpack -d $DIST pandoc-citeproc | awk '{print $3;}'`
20+stack install --stack-yaml=stack.pkg.yaml
21+make man/pandoc.1
3222
3323mkdir -p $DEST/bin
3424mkdir -p $DEST/share/man/man1
3525mkdir -p $DEST/share/man/man5
3626for f in pandoc pandoc-citeproc; do
37− cp $SANDBOX/bin/$f $DEST/bin/;
27+ cp $LOCALBIN/$f $DEST/bin/;
3828done
39−cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
40−cp $SANDBOX/share/man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
29+cp ../pandoc-citeproc/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
30+cp man/pandoc.1 $DEST/share/man/man1/
4131
4232chown -R $ME:staff $DIST
4333
4434echo Copying license...
45−$SANDBOX/bin/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
35+$LOCALBIN/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
4636
4737echo Signing pandoc executable...
4838