deb pkg generation improvements.
Allow setting DEBPKGVER.
Bump to stack lts-4.0.
Make output verbose.
commit646ef17e557de57c7a8c80ad0bff04b32eb9113e
authorJohn MacFarlane <jgm@berkeley.edu>
dateThu 7 Jan 2016, 11:24 (11 years ago)
parent669153e
deb/Makefile+2−1
@@ -1,11 +1,12 @@
11TREE?=HEAD
2+DEBPKGVER?=1
23VAGRANTBOX?=debian/wheezy64
34
45.PHONY: package clean
56
67package:
78 VAGRANTBOX=$(VAGRANTBOX) vagrant up
8− vagrant ssh -c 'rm -rf pandoc && git clone https://github.com/jgm/pandoc && cd pandoc && git checkout -b work $(TREE) && git submodule update --init && ./make_deb.sh && cp *.deb /vagrant_data/'
9+ vagrant ssh -c 'DEBPKGVER=$(DEBPKGVER) rm -rf pandoc && git clone https://github.com/jgm/pandoc && cd pandoc && git checkout -b work $(TREE) && git submodule update --init && sh -v ./deb/make_deb.sh && cp *.deb /vagrant_data/'
910 vagrant halt
1011
1112clean:
make_deb.sh → deb/make_deb.shrenamed+1−1
@@ -9,7 +9,7 @@ esac
99
1010LOCAL=$HOME/.local
1111VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
12−DEBPKGVER=1
12+DEBPKGVER=${DEBPKGVER:-1}
1313DEBVER=$VERSION-$DEBPKGVER
1414BASE=pandoc-$DEBVER-$ARCHITECTURE
1515DIST=`pwd`/$BASE
deb/stack.yaml+2−2
@@ -16,5 +16,5 @@ packages:
1616- 'https://hackage.haskell.org/package/pandoc-citeproc-0.9/pandoc-citeproc-0.9.tar.gz'
1717extra-deps:
1818- 'cmark-0.5.0'
19−- 'pandoc-types-1.16'
20−resolver: lts-3.20
19+- 'pandoc-types-1.16.0.1'
20+resolver: lts-4.0
stack.hsb2hs.yaml+1−1
@@ -1,4 +1,4 @@
11packages:
22- 'https://hackage.haskell.org/package/preprocessor-tools-1.0.1/preprocessor-tools-1.0.1.tar.gz'
33- 'https://hackage.haskell.org/package/hsb2hs-0.3.1/hsb2hs-0.3.1.tar.gz'
4−resolver: lts-3.20
4+resolver: lts-4.0