git.iko.soy/typeable/pandoc
on master help sign in
osx build: use --local-bin-path.
commitb4ea4826601f6970f086eb5d2adea9c8aa20ab55 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 4 Jun 2016, 08:04 (10 years ago) parent6f9f790
2 files changed+10−9
make_osx_package.sh+4−4 osx/stack.yaml+6−5
make_osx_package.sh+4−4
@@ -27,7 +27,7 @@ which hsb2hs || stack install --stack-yaml=stack.hsb2hs.yaml
2727
2828echo Building pandoc...
2929stack clean
30−stack install --stack-yaml=osx/stack.yaml
30+stack install --stack-yaml=osx/stack.yaml --local-bin-path osx pandoc pandoc-citeproc
3131
3232echo Getting man pages...
3333make man/pandoc.1
@@ -41,7 +41,7 @@ PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}
4141mkdir -p $DEST/bin
4242mkdir -p $DEST/share/man/man1
4343for f in pandoc pandoc-citeproc; do
44− cp $LOCALBIN/$f $DEST/bin/;
44+ cp osx/$f $DEST/bin/;
4545done
4646cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
4747cp man/pandoc.1 $DEST/share/man/man1/
@@ -49,7 +49,7 @@ cp man/pandoc.1 $DEST/share/man/man1/
4949chown -R $ME:staff $DIST
5050
5151echo Copying license...
52−$LOCALBIN/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
52+osx/pandoc --data data -t html5 -s COPYING -o $RESOURCES/license.html
5353
5454echo Signing pandoc executable...
5555
@@ -70,4 +70,4 @@ productbuild --distribution osx/distribution.xml --resources $DIST/Resources --p
7070spctl --assess --type install $BASE-osx.pkg
7171
7272# cleanup
73−rm -r $DIST
73+rm -r $DIST osx/pandoc osx/pandoc-citeproc
osx/stack.yaml+6−5
@@ -18,9 +18,10 @@ ghc-options:
1818 highlighting-kate: '-pgmP cpphs -optP--cpp'
1919packages:
2020- '..'
21−- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9.1.1/pandoc-citeproc-0.9.1.1.tar.gz'
2221extra-deps:
23−- 'aeson-0.11.1.1'
24−- 'texmath-0.8.5'
25−- 'highlighting-kate-0.6.2'
26−resolver: lts-5.8
22+- 'pandoc-citeproc-0.9.1.1'
23+- 'hsb2hs-0.3.1'
24+- 'data-default-0.6.0'
25+- 'data-default-instances-base-0.1.0'
26+- 'preprocessor-tools-1.0.1'
27+resolver: lts-6.1