From: Phil Pennock <pdp@exim.org>
Date: Thu, 3 Oct 2013 20:13:52 +0000 (-0400)
Subject: Finish the xfpt fix.
X-Git-Tag: exim-4_82_RC3~13
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=99474a17d13e1aab63584b67abd83973aa9dbabd;p=exim.git

Finish the xfpt fix.

The readers of the version expect no surrounding whitespace; putting the
content in-place requires macro expansion, which requires that .literal
mode be `layout` or `off`, but either of those will escape the XML angle
brackets.  The easiest fix is to generate the XML as part of the macro
definition.

Moved local_params rules out of Makefile and into GenLocalParams
---

diff --git a/doc/doc-docbook/GenLocalParams b/doc/doc-docbook/GenLocalParams
new file mode 100755
index 000000000..140890880
--- /dev/null
+++ b/doc/doc-docbook/GenLocalParams
@@ -0,0 +1,23 @@
+#!/bin/sh -eu
+
+output="${1:-local_params}"
+: ${EXIM_VER:?Need the EXIM_VER environment variable}
+
+nicedate="$(date +"%d %b %Y")"
+
+exec > "$output"
+cat <<EOTEMPLATE
+.macro version
+${EXIM_VER}
+.endmacro
+.macro fulldate
+${nicedate}
+.endmacro
+.macro year
+$(date +%Y)
+.endmacro
+.macro versiondatexml
+<revnumber>${EXIM_VER}</revnumber>
+<date>${nicedate}</date>
+.endmacro
+EOTEMPLATE
diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index 07eb322fa..14bea8e6b 100644
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -25,16 +25,7 @@ exim.8:       spec.xml x2man
 
 .PHONY: local_params
 local_params:
-	echo .macro version > $@
-	echo $(EXIM_VER)	>> $@
-	echo .endmacro		>> $@
-	echo .macro fulldate	>> $@
-	date "+%d %b %Y"	>> $@
-	echo .endmacro		>> $@
-	echo .macro year	>> $@
-	date "+%Y"		>> $@
-	echo .endmacro		>> $@
-
+	./GenLocalParams $@
 
 ############################### FILTER #################################
 
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 7ab482c3c..9ec45a4eb 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -179,12 +179,7 @@
 <author><firstname>Exim</firstname><surname>Maintainers</surname></author>
 <authorinitials>EM</authorinitials>
 <revhistory><revision>
-  <revnumber>
-.version
-  </revnumber>
-  <date>
-.fulldate
-  </date>
+.versiondatexml
   <authorinitials>EM</authorinitials>
 </revision></revhistory>
 <copyright><year>