git.iko.soy/typeable/pandoc
on master help sign in
Updated make_osx_package.sh.
08b67f7John MacFarlane
make_osx_package.sh+18−12
compare with master
unifiedsplit
@@ -1,6 +1,7 @@
1#!/bin/sh -e
1#!/bin/sh -e
2
2
3DIST=`pwd`/osx_package
3DIST=`pwd`/osx_package
4+TMP=`pwd`/cabaltmp
4VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
5VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
5RESOURCES=$DIST/Resources
6RESOURCES=$DIST/Resources
6ROOT=$DIST/pandoc
7ROOT=$DIST/pandoc
@@ -10,24 +11,29 @@ ICU=/usr/local/Cellar/icu4c/51.1
10ME=jgm
11ME=jgm
11CODESIGNID="Developer ID Application: John Macfarlane"
12CODESIGNID="Developer ID Application: John Macfarlane"
12PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
13PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
14+EXES="pandoc pandoc-citeproc biblio2yaml"
13
15
14echo Removing old files...
16echo Removing old files...
15rm -rf $DIST
17rm -rf $DIST
16mkdir -p $RESOURCES
18mkdir -p $RESOURCES
17
19
18−# echo Updating database
20+echo Updating database
19−# cabal update
21+cabal update
20
22
21echo Building pandoc...
23echo Building pandoc...
22−cabal-dev install hsb2hs
24+cabal sandbox init
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 install -v1 --prefix $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+cabal install -v1 --prefix $TMP --flags="embed_data_files"
26−
27+
27−mkdir -p $ROOT/usr/local/share
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
28−cp -r $ROOT/tmp/bin $ROOT/usr/local/
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
29−cp -r $ROOT/tmp/share/man $ROOT/usr/local/share/
35+cp $TMP/share/man/man5/pandoc_markdown.5 $ROOT/usr/local/share/man/man5/
30−rm -rf $ROOT/tmp
36+# rm -rf $TMP
31
37
32chown -R $ME:staff $DIST
38chown -R $ME:staff $DIST
33# gzip $ROOT/usr/local/share/man/man?/*.*
39# gzip $ROOT/usr/local/share/man/man?/*.*
@@ -35,7 +41,7 @@ chown -R $ME:staff $DIST
35chmod +r $ROOT/usr/local/share/man/man?/*.*
41chmod +r $ROOT/usr/local/share/man/man?/*.*
36
42
37echo Copying license...
43echo 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
39
45
40echo Signing pandoc executable...
46echo Signing pandoc executable...
41
47