summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2001-10-03 10:46:28 (GMT)
committerSteven Knight <knight@baldmt.com>2001-10-03 10:46:28 (GMT)
commit79f443cec41fdbf9fad32323664007d0a1f1e50b (patch)
tree6b18dacea817294c652fb3707197b5ea559bdc7f
parentc38b764a8c7e91d48c79a4918fd55d5305a3fffc (diff)
downloadSCons-79f443cec41fdbf9fad32323664007d0a1f1e50b.zip
SCons-79f443cec41fdbf9fad32323664007d0a1f1e50b.tar.gz
SCons-79f443cec41fdbf9fad32323664007d0a1f1e50b.tar.bz2
Make the documentation build with more version of the tools
-rw-r--r--doc/Conscript33
-rw-r--r--doc/design/main.sgml6
-rw-r--r--doc/user/main.sgml6
3 files changed, 23 insertions, 22 deletions
diff --git a/doc/Conscript b/doc/Conscript
index d8386d6..71ee327 100644
--- a/doc/Conscript
+++ b/doc/Conscript
@@ -28,9 +28,9 @@ print FILE <<_EOF_;
<!--
THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
-->
-<!ENTITY build_date "${\$env->{DATE}}">
-<!ENTITY build_version "${\$env->{VERSION}}">
-<!ENTITY build_revision "${\$env->{REVISION}}">
+<!ENTITY builddate "${\$env->{DATE}}">
+<!ENTITY buildversion "${\$env->{VERSION}}">
+<!ENTITY buildrevision "${\$env->{REVISION}}">
_EOF_
close(FILE);
@@ -103,23 +103,24 @@ foreach $doc (keys %doc_dirs) {
$env->QuickScan(\&scansgml, $main);
$env->Command($html, $main,
- [qq(rm -f %>:d/*.html),
- qq(jw -b html -o %>:d %<),
- ]);
+ qq(rm -f %>:d/*.html
+ jw -b html -o %>:d %<
+ mv -v %>:d/index.html %> || true
+ ));
$env->Command($ps, $main,
- [qq(rm -f %>:d/$out),
- qq(jw -b ps -o %>:d %<),
- qq(mv %>:d/main.ps %>),
- qq(rm -f %>:d/$out),
- ]);
+ qq(rm -f %>:d/$out
+ jw -b ps -o %>:d %<
+ mv %>:d/main.ps %>
+ rm -f %>:d/$out
+ ));
$env->Command($pdf, $main,
- [qq(rm -f %>:d/$out),
- qq(jw -b pdf -o %>:d %<),
- qq(mv %>:d/main.pdf %>),
- qq(rm -f %>:d/$out),
- ]);
+ qq(rm -f %>:d/$out
+ jw -b pdf -o %>:d %<
+ mv %>:d/main.pdf %>
+ rm -f %>:d/$out
+ ));
if ($doc_dirs{$doc}->{'text'} && $lynx) {
$env->Command($text, $html, qq(lynx -dump %<:a > %>));
diff --git a/doc/design/main.sgml b/doc/design/main.sgml
index 745d473..62b865b 100644
--- a/doc/design/main.sgml
+++ b/doc/design/main.sgml
@@ -27,14 +27,14 @@
<book>
<bookinfo>
- <title>SCons Design version &build_version;</title>
+ <title>SCons Design version &buildversion;</title>
<author>
<firstname>Steven</firstname>
<surname>Knight</surname>
</author>
- <edition>Revision &build_revision; (&build_date;)</edition>
+ <edition>Revision &buildrevision; (&builddate;)</edition>
<pubdate>2001</pubdate>
@@ -47,7 +47,7 @@
&copyright;
</legalnotice>
- <releaseinfo>version &build_version;</releaseinfo>
+ <releaseinfo>version &buildversion;</releaseinfo>
</bookinfo>
diff --git a/doc/user/main.sgml b/doc/user/main.sgml
index eb7ab39..b64dbaa 100644
--- a/doc/user/main.sgml
+++ b/doc/user/main.sgml
@@ -36,14 +36,14 @@
<book>
<bookinfo>
- <title>SCons User Guide &build_version;</title>
+ <title>SCons User Guide &buildversion;</title>
<author>
<firstname>Steven</firstname>
<surname>Knight</surname>
</author>
- <edition>Revision &build_revision; (&build_date;)</edition>
+ <edition>Revision &buildrevision; (&builddate;)</edition>
<pubdate>2001</pubdate>
@@ -56,7 +56,7 @@
&copyright;
</legalnotice>
- <releaseinfo>version &build_version;</releaseinfo>
+ <releaseinfo>version &buildversion;</releaseinfo>
</bookinfo>