git.iko.soy/typeable/pandoc
on master help sign in
Extract version number from src/Main.hs in cabalize and Makefile.
1fdafb5fiddlosopher
Makefile+2−2
compare with master
unifiedsplit
@@ -17,7 +17,7 @@ CONFIGURE := configure
17# Cabal constants
17# Cabal constants
18#-------------------------------------------------------------------------------
18#-------------------------------------------------------------------------------
19NAME := $(shell sed -ne 's/^[Nn]ame:[[:space:]]*//p' $(CABAL).in)
19NAME := $(shell sed -ne 's/^[Nn]ame:[[:space:]]*//p' $(CABAL).in)
20−VERSION := $(shell sed -ne 's/^[Vv]ersion:[[:space:]]*//p' $(CABAL).in)
20+VERSION := $(shell sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' $(SRCDIR)/Main.hs)
21EXECS := $(shell sed -ne 's/^[Ee]xecutable:[[:space:]]*//p' $(CABAL).in)
21EXECS := $(shell sed -ne 's/^[Ee]xecutable:[[:space:]]*//p' $(CABAL).in)
22# First entry in Cabal's executable stanza is the main executable.
22# First entry in Cabal's executable stanza is the main executable.
23MAIN := $(firstword $(EXECS))
23MAIN := $(firstword $(EXECS))
@@ -110,7 +110,7 @@ cleanup_files+=$(WRAPPERS)
110 @$(generate-shell-script)
110 @$(generate-shell-script)
111
111
112cleanup_files+=$(CABAL)
112cleanup_files+=$(CABAL)
113−$(CABAL): cabalize $(CABAL).in
113+$(CABAL): cabalize $(CABAL).in $(SRCDIR)/Main.hs
114 ./cabalize <$(CABAL).in >$(CABAL)
114 ./cabalize <$(CABAL).in >$(CABAL)
115
115
116.PHONY: configure
116.PHONY: configure
Pandoc.cabal.in+1−1
@@ -1,5 +1,5 @@
1Name: Pandoc
1Name: Pandoc
2−Version: 0.3
2+Version: @VERSION@
3License: GPL
3License: GPL
4License-File: LICENSE
4License-File: LICENSE
5Author: John MacFarlane <jgm@berkeley.edu>
5Author: John MacFarlane <jgm@berkeley.edu>
cabalize+4−1
@@ -29,6 +29,8 @@ case "$ghc_version" in
29esac
29esac
30BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g')
30BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g')
31
31
32+PANDOC_VERSION=$(sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' src/Main.hs)
33+
32# Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3.
34# Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3.
33HS_SOURCE_DIRS='Hs-Source-Dirs'
35HS_SOURCE_DIRS='Hs-Source-Dirs'
34cabal_version=$(ghc-pkg -l | sed -ne 's/.*[Cc]abal-\([^,]*\).*/\1/p')
36cabal_version=$(ghc-pkg -l | sed -ne 's/.*[Cc]abal-\([^,]*\).*/\1/p')
@@ -38,4 +40,5 @@ fi
38
40
39sed -e "s#@HCFLAGS@#$HCFLAGS#g" \
41sed -e "s#@HCFLAGS@#$HCFLAGS#g" \
40 -e "s#@BUILD_DEPENDS@#$BUILD_DEPENDS#g" \
42 -e "s#@BUILD_DEPENDS@#$BUILD_DEPENDS#g" \
41− -e "s#@HS_SOURCE_DIRS@#$HS_SOURCE_DIRS#g"
43+ -e "s#@HS_SOURCE_DIRS@#$HS_SOURCE_DIRS#g" \
44+ -e "s#@VERSION@#$PANDOC_VERSION#g"