diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-12 15:41:55 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2006-12-12 15:41:55 +0000 |
| commit | 1fdafb520475ee0265fddabcfef9d27279faa342 (patch) | |
| tree | 564066c24cc6c7fea21344117b40572eb7478dc5 | |
| parent | 2d653dc1daee0ac95a2bb3e5b1a0be99351251ac (diff) | |
| download | pandoc-1fdafb520475ee0265fddabcfef9d27279faa342.tar.gz | |
Extract version number from src/Main.hs in cabalize and Makefile.
The authoritative version number is now in src/Main.hs, with no
duplication. (This seems a better solution than building Main.hs
from a template.)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@182 788f1e2b-df1e-0410-8736-df70ead52e1b
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Pandoc.cabal.in | 2 | ||||
| -rwxr-xr-x | cabalize | 5 |
3 files changed, 7 insertions, 4 deletions
@@ -17,7 +17,7 @@ CONFIGURE := configure # Cabal constants #------------------------------------------------------------------------------- NAME := $(shell sed -ne 's/^[Nn]ame:[[:space:]]*//p' $(CABAL).in) -VERSION := $(shell sed -ne 's/^[Vv]ersion:[[:space:]]*//p' $(CABAL).in) +VERSION := $(shell sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' $(SRCDIR)/Main.hs) EXECS := $(shell sed -ne 's/^[Ee]xecutable:[[:space:]]*//p' $(CABAL).in) # First entry in Cabal's executable stanza is the main executable. MAIN := $(firstword $(EXECS)) @@ -110,7 +110,7 @@ cleanup_files+=$(WRAPPERS) @$(generate-shell-script) cleanup_files+=$(CABAL) -$(CABAL): cabalize $(CABAL).in +$(CABAL): cabalize $(CABAL).in $(SRCDIR)/Main.hs ./cabalize <$(CABAL).in >$(CABAL) .PHONY: configure diff --git a/Pandoc.cabal.in b/Pandoc.cabal.in index 9711c8671..cbe60f7c1 100644 --- a/Pandoc.cabal.in +++ b/Pandoc.cabal.in @@ -1,5 +1,5 @@ Name: Pandoc -Version: 0.3 +Version: @VERSION@ License: GPL License-File: LICENSE Author: John MacFarlane <jgm@berkeley.edu> @@ -29,6 +29,8 @@ case "$ghc_version" in esac BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g') +PANDOC_VERSION=$(sed -ne 's/^version[[:space:]]*=[[:space:]]*"\([^"]*\)"/\1/p' src/Main.hs) + # Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3. HS_SOURCE_DIRS='Hs-Source-Dirs' cabal_version=$(ghc-pkg -l | sed -ne 's/.*[Cc]abal-\([^,]*\).*/\1/p') @@ -38,4 +40,5 @@ fi sed -e "s#@HCFLAGS@#$HCFLAGS#g" \ -e "s#@BUILD_DEPENDS@#$BUILD_DEPENDS#g" \ - -e "s#@HS_SOURCE_DIRS@#$HS_SOURCE_DIRS#g" + -e "s#@HS_SOURCE_DIRS@#$HS_SOURCE_DIRS#g" \ + -e "s#@VERSION@#$PANDOC_VERSION#g" |