From: Andreas Fuchs Date: Mon, 28 Jun 2004 11:38:42 +0000 (+0000) Subject: 0.8.12.5: X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=2fb9b079b4199880ace01f6866902bd193180719;p=sbcl.git 0.8.12.5: Extract the version number from version.lisp-expr for the manual * doc/manual/extract-values.sh does that for us and fills them into values.template. --- diff --git a/doc/manual/Makefile b/doc/manual/Makefile index d342931..bbb8fa3 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -7,6 +7,7 @@ PSFILE=sbcl.ps PDFFILE=sbcl.pdf DVIFILE=sbcl.dvi INFOFILE=sbcl.info +VARSFILE=variables.template HTMLDIR=$(basename $(ROOTFILE)) # Place where generated documentation ends up. The value of # DOCSTRINGDIR has to end with a slash or you lose (it's passed to @@ -38,12 +39,14 @@ all: ps pdf info html dist: html pdf +variables: ${VARSFILE} + ./extract-values.sh < ${VARSFILE} >variables.texinfo # html documentation; output in $(HTMLDIR) .PHONY: html html: html-stamp -html-stamp: $(DOCFILES) docstrings +html-stamp: variables $(DOCFILES) docstrings @rm -rf $(HTMLDIR) $(MAKEINFO) -I $(DOCSTRINGDIR) --html $(ROOTFILE) touch html-stamp @@ -55,21 +58,21 @@ ps: $(PSFILE) $(PSFILE): $(DVIFILE) dvips -o $@ $< -$(DVIFILE): $(DOCFILES) docstrings +$(DVIFILE): variables $(DOCFILES) docstrings texi2dvi -I $(DOCSTRINGDIR) $(ROOTFILE) # PDF documentation .PHONY: pdf pdf: $(PDFFILE) -$(PDFFILE): $(DOCFILES) docstrings +$(PDFFILE): variables $(DOCFILES) docstrings texi2pdf -I $(DOCSTRINGDIR) $(ROOTFILE) # info docfiles .PHONY: info info: $(INFOFILE) -$(INFOFILE): $(DOCFILES) docstrings +$(INFOFILE): variables $(DOCFILES) docstrings $(MAKEINFO) -I $(DOCSTRINGDIR) $(ROOTFILE) # contrib-modules.texinfo includes contrib-doc-list.texi-temp diff --git a/doc/manual/extract-values.sh b/doc/manual/extract-values.sh new file mode 100755 index 0000000..7632af1 --- /dev/null +++ b/doc/manual/extract-values.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# extracts values from the system for inclusion in the texinfo source. + +VERSION=`eval echo $(grep '^"' ../../version.lisp-expr)` +MONTH=`date "+%Y-%m"` + +sed -e "s/@VERSION@/$VERSION/" \ + -e "s/@MONTH@/$MONTH/" diff --git a/doc/manual/sbcl.texinfo b/doc/manual/sbcl.texinfo index 8a765ee..f2146e5 100644 --- a/doc/manual/sbcl.texinfo +++ b/doc/manual/sbcl.texinfo @@ -5,10 +5,9 @@ @c %**end of header +@include variables.texinfo @set EDITION 0.1 -@set VERSION 0.8.9 -@set UPDATED 2 April 2004 -@set UPDATE-MONTH April 2004 +@settitle SBCL @value{VERSION} User Manual @c for install-info @dircategory Software development diff --git a/doc/manual/variables.template b/doc/manual/variables.template new file mode 100644 index 0000000..2cff8ef8 --- /dev/null +++ b/doc/manual/variables.template @@ -0,0 +1,2 @@ +@set VERSION @VERSION@ +@set UPDATE-MONTH @MONTH@ diff --git a/version.lisp-expr b/version.lisp-expr index 8c7b134..f110d97 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.12.4" +"0.8.12.5"