diff options
author | John MacFarlane <jgm@berkeley.edu> | 2015-10-24 21:12:43 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2015-10-24 21:12:43 -0700 |
commit | aafccdb0bdf992d18d779df97dc2deca245dc6a7 (patch) | |
tree | 797fd919ae1a553dca031c0f7d9a76c79ba7a6c4 /make_osx_package.sh | |
parent | 68ca646e65264ab225f775529201099d1c5ead7d (diff) |
Changes for deb and osx package generators.
- Use stack for make_deb.sh.
- Use osx/stack.yaml or deb/stack.yaml.
- deb/stack.yaml doesn't want the same ghc-options.
Diffstat (limited to 'make_osx_package.sh')
-rwxr-xr-x | make_osx_package.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh index 2512e81e0..3683f1a6e 100755 --- a/make_osx_package.sh +++ b/make_osx_package.sh @@ -15,13 +15,16 @@ PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker # echo Removing old files... rm -rf $DIST mkdir -p $RESOURCES +stack setup +which hsb2hs | stack install --stack-yaml=stack.hsb2hs.yaml echo Building pandoc... -stack install --stack-yaml=stack.pkg.yaml +stack clean +stack install --stack-yaml=osx/stack.yaml echo Getting man pages... make man/pandoc.1 -PANDOC_CITEPROC_PATH=`cabal unpack -d $DIST pandoc-citeproc | awk '{print $3;}'` +PANDOC_CITEPROC_PATH=`stack unpack -d $DIST pandoc-citeproc | awk '{print $3;}'` mkdir -p $DEST/bin mkdir -p $DEST/share/man/man1 |