Make the documentation build with more version of the tools

git-svn-id: http://scons.tigris.org/svn/scons/trunk@83 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/Conscript b/doc/Conscript
index d8386d6aa12e14877f92e1d1611ccf384f4f1dcd..71ee327e3e755da7dfcac98dc92179a3216264a2 100644 (file)
--- 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 745d4730a3ef7fc720b90a230b596f0a5b082fc4..62b865bc829a196925828eebc2f1ebba42cba143 100644 (file)
--- 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 eb7ab39e6ab66fe68eaa86521e45c0f7a7747a5d..b64dbaa3dcc686070ab272a3c46fb0da77cf067e 100644 (file)
--- 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>