git.iko.soy/typeable/pandoc
on master help sign in
Rename static-linux -> linux.
commit6756e23f945c7a9c685ac4e8b06eae052f52b574 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 19 Mar 2017, 15:35 (10 years ago) parente98b9f6
4 files changed+1−98
compare with master
unifiedsplit
Makefile+1−1 static-linux/Dockerfile−35 static-linux/Makefile−12 static-linux/make_deb.sh−50
Makefile+1−1
@@ -32,7 +32,7 @@ dist: man/pandoc.1
3232 stack setup && stack test && cd .. && rm -rf "pandoc-${version}"
3333
3434debpkg: man/pandoc.1
35− make -C static-linux
35+ make -C linux
3636
3737macospkg: man/pandoc.1
3838 ./macos/make_macos_package.sh
static-linux/Dockerfiledeleted−35
@@ -1,35 +0,0 @@
1−# USE ALPINE LINUX
2−FROM alpine:edge
3−RUN echo "https://s3-us-west-2.amazonaws.com/alpine-ghc/8.0" >> /etc/apk/repositories
4−ADD https://raw.githubusercontent.com/mitchty/alpine-ghc/master/mitch.tishmack%40gmail.com-55881c97.rsa.pub \
5− /etc/apk/keys/mitch.tishmack@gmail.com-55881c97.rsa.pub
6−RUN apk update
7−RUN apk add alpine-sdk git ca-certificates ghc cabal stack zlib-dev \
8− dpkg fakeroot sed gawk grep
9−RUN stack update
10−RUN stack config set system-ghc --global true
11−RUN mkdir -p /etc/stack
12−RUN echo "build: { split-objs: true }" > /etc/stack/config.yaml
13−RUN mkdir -p /usr/src/
14−WORKDIR /usr/src/
15−RUN git clone https://github.com/jgm/pandoc
16−WORKDIR /usr/src/pandoc
17−RUN stack install --local-bin-path /usr/bin hsb2hs
18−RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
19− --flag 'pandoc:embed_data_files' \
20− --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
21− pandoc pandoc-citeproc
22−COPY make_deb.sh .
23−CMD git pull && \
24− git checkout -b work $TREE && \
25− export VERSION=`grep '^Version:' pandoc.cabal | awk '{print $$2;}'` && \
26− stack install --stack-yaml stack.pkg.yaml \
27− --local-bin-path /artifacts --flag 'pandoc:embed_data_files' \
28− --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
29− pandoc pandoc-citeproc && \
30− bash make_deb.sh && \
31− cd /artifacts && \
32− mkdir pandoc-$VERSION && \
33− mv pandoc pandoc-citeproc pandoc-$VERSION/ && \
34− tar cvzf pandoc-$VERSION.tgz pandoc-$VERSION && \
35− rm -r pandoc-$VERSION
static-linux/Makefiledeleted−12
@@ -1,12 +0,0 @@
1−TREE?=HEAD
2−ARTIFACTS=`pwd`/artifacts
3−
4−build:
5− mkdir -p $(ARTIFACTS)
6− docker build -t alpine-pandoc .
7− docker run --env TREE=$(TREE) -v $(ARTIFACTS):/artifacts alpine-pandoc
8−
9−setup:
10− docker pull alpine:edge
11−
12−.PHONY: build setup
static-linux/make_deb.shdeleted−50
@@ -1,50 +0,0 @@
1−MACHINE=$(uname -m)
2−case "$MACHINE" in
3− x86_64) ARCHITECTURE=amd64;;
4− i686) ARCHITECTURE=i386;;
5− i386) ARCHITECTURE=i386;;
6−esac
7−
8−ARTIFACTS=/artifacts
9−
10−VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
11−DEBPKGVER=${DEBPKGVER:-1}
12−DEBVER=$VERSION-$DEBPKGVER
13−BASE=pandoc-$DEBVER-$ARCHITECTURE
14−DIST=`pwd`/$BASE
15−DEST=$DIST/usr
16−COPYRIGHT=$DEST/share/doc/pandoc/copyright
17−
18−PATH=$ARTIFACTS:$PATH
19−PANDOC_CITEPROC_VERSION=`pandoc-citeproc --version | awk '{print $2;}'`
20−
21−mkdir -p $DEST/bin
22−mkdir -p $DEST/share/man/man1
23−mkdir -p $DEST/share/doc/pandoc
24−
25−make man/pandoc.1
26−
27−mkdir -p $DEST/share/doc/pandoc-citeproc
28−find $DIST -type d | xargs chmod 755
29−cp $ARTIFACTS/pandoc $DEST/bin/
30−cp $ARTIFACTS/pandoc-citeproc $DEST/bin/
31−cp man/pandoc.1 $DEST/share/man/man1/pandoc.1
32−pandoc-citeproc --man > $DEST/share/man/man1/pandoc-citeproc.1
33−gzip -9 $DEST/share/man/man1/pandoc.1
34−gzip -9 $DEST/share/man/man1/pandoc-citeproc.1
35−
36−cp COPYRIGHT $COPYRIGHT
37−echo "" >> $COPYRIGHT
38−echo "pandoc-citeproc" >> $COPYRIGHT
39−pandoc-citeproc --license >> $COPYRIGHT
40−
41−INSTALLED_SIZE=$(du -k -s $DEST | awk '{print $1}')
42−mkdir $DIST/DEBIAN
43−perl -pe "s/VERSION/$DEBVER/" deb/control.in | \
44− perl -pe "s/ARCHITECTURE/$ARCHITECTURE/" | \
45− perl -pe "s/INSTALLED_SIZE/$INSTALLED_SIZE/" \
46− > $DIST/DEBIAN/control
47−
48−fakeroot dpkg-deb --build $DIST
49−rm -rf $DIST
50−cp $BASE.deb /artifacts/