@@ -1,6 +1,7 @@
11#!/bin/sh -e
22
33DIST=`pwd`/osx_package
4+TMP=`pwd`/cabaltmp
45VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
56RESOURCES=$DIST/Resources
67ROOT=$DIST/pandoc
@@ -10,24 +11,29 @@ ICU=/usr/local/Cellar/icu4c/51.1
1011ME=jgm
1112CODESIGNID="Developer ID Application: John Macfarlane"
1213PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
14+EXES="pandoc pandoc-citeproc biblio2yaml"
1315
1416echo Removing old files...
1517rm -rf $DIST
1618mkdir -p $RESOURCES
1719
18−# echo Updating database
19−# cabal update
20+echo Updating database
21+cabal update
2022
2123echo Building pandoc...
22−cabal-dev install hsb2hs
23−
24−cabal-dev install --reinstall -v1 --prefix $ROOT/tmp --flags="embed_data_files unicode_collation" --extra-lib-dirs=$ICU/lib --extra-include-dirs=$ICU/include pandoc-citeproc
25−cabal-dev install -v1 --prefix $ROOT/tmp --flags="embed_data_files"
26−
27−mkdir -p $ROOT/usr/local/share
28−cp -r $ROOT/tmp/bin $ROOT/usr/local/
29−cp -r $ROOT/tmp/share/man $ROOT/usr/local/share/
30−rm -rf $ROOT/tmp
24+cabal sandbox init
25+cabal install -v1 --prefix $TMP --flags="embed_data_files unicode_collation" --extra-lib-dirs=$ICU/lib --extra-include-dirs=$ICU/include pandoc-citeproc
26+cabal install -v1 --prefix $TMP --flags="embed_data_files"
27+
28+mkdir -p $ROOT/usr/local/bin
29+mkdir -p $ROOT/usr/local/share/man/man1
30+mkdir -p $ROOT/usr/local/share/man/man5
31+for f in $EXES; do
32+ cp $TMP/bin/$f $ROOT/usr/local/bin/;
33+ cp $TMP/share/man/man1/$f.1 $ROOT/usr/local/share/man/man1/
34+done
35+cp $TMP/share/man/man5/pandoc_markdown.5 $ROOT/usr/local/share/man/man5/
36+# rm -rf $TMP
3137
3238chown -R $ME:staff $DIST
3339# gzip $ROOT/usr/local/share/man/man?/*.*
@@ -35,7 +41,7 @@ chown -R $ME:staff $DIST
3541chmod +r $ROOT/usr/local/share/man/man?/*.*
3642
3743echo Copying license...
38−dist/build/pandoc/pandoc --data data -t rtf -s COPYING -o $RESOURCES/License.rtf
44+$TMP/bin/pandoc --data data -t rtf -s COPYING -o $RESOURCES/License.rtf
3945
4046echo Signing pandoc executable...
4147