git.iko.soy/typeable/pandoc
on master help sign in
Use stack for make_osx_package.sh.
eac9cdcJohn MacFarlane
make_osx_package.sh+7−17
compare with master
unifiedsplit
@@ -1,7 +1,7 @@
1#!/bin/bash -e
1#!/bin/bash -e
2
2
3+LOCALBIN=$HOME/.local/bin
3DIST=`pwd`/osx_package
4DIST=`pwd`/osx_package
4−SANDBOX=`pwd`/.cabal-sandbox
5VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
5VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
6RESOURCES=$DIST/Resources
6RESOURCES=$DIST/Resources
7ROOT=$DIST/pandoc
7ROOT=$DIST/pandoc
@@ -11,38 +11,28 @@ SCRIPTS=$OSX/osx-resources
11BASE=pandoc-$VERSION
11BASE=pandoc-$VERSION
12ME=$(whoami)
12ME=$(whoami)
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
14−CPPHS=$SANDBOX/bin/cpphs
15
14
16# echo Removing old files...
15# echo Removing old files...
17rm -rf $DIST
16rm -rf $DIST
18mkdir -p $RESOURCES
17mkdir -p $RESOURCES
19
18
20−cabal sandbox init
21−echo Updating database
22−cabal update
23−
24echo Building pandoc...
19echo Building pandoc...
25−cabal clean
20+stack install --stack-yaml=stack.pkg.yaml
26−# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
21+make man/pandoc.1
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;}'`
32
22
33mkdir -p $DEST/bin
23mkdir -p $DEST/bin
34mkdir -p $DEST/share/man/man1
24mkdir -p $DEST/share/man/man1
35mkdir -p $DEST/share/man/man5
25mkdir -p $DEST/share/man/man5
36for f in pandoc pandoc-citeproc; do
26for f in pandoc pandoc-citeproc; do
37− cp $SANDBOX/bin/$f $DEST/bin/;
27+ cp $LOCALBIN/$f $DEST/bin/;
38done
28done
39−cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
29+cp ../pandoc-citeproc/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
40−cp $SANDBOX/share/man/man1/pandoc.1 $DEST/share/man/man1/pandoc.1
30+cp man/pandoc.1 $DEST/share/man/man1/
41
31
42chown -R $ME:staff $DIST
32chown -R $ME:staff $DIST
43
33
44echo Copying license...
34echo 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
46
36
47echo Signing pandoc executable...
37echo Signing pandoc executable...
48
38
stack.pkg.yamlnew file+19
@@ -0,0 +1,19 @@
1+flags:
2+ pandoc:
3+ trypandoc: false
4+ https: true
5+ embed_data_files: true
6+ old-locale: false
7+ network-uri: true
8+ pandoc-citeproc:
9+ bibutils: true
10+ embed_data_files: true
11+ unicode_collation: false
12+ test_citeproc: false
13+ debug: false
14+ghc-options:
15+ pandoc-citeproc: '-pgmP cpphs -optP--cpp'
16+packages:
17+- '.'
18+- '../pandoc-citeproc'
19+resolver: lts-3.9