removed doc/user/copyright.xml the markup is moved ot doc/user/main.xml

7 files changed, 16 insertions, 56 deletions

diff --git a/SConstruct b/SConstruct
index 9ba5b9c..c2a47d4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -144,6 +144,7 @@ env = Environment(
     BUILD=command_line.build_id,
     BUILDDIR=command_line.build_dir,
     BUILDSYS=command_line.build_system,
+    COPYRIGHT_YEARS=copyright_years,
     COPYRIGHT=copyright,
     DATE=command_line.date,
     DEB_DATE=deb_date,
diff --git a/doc/SConscript b/doc/SConscript
index ba96935..82c696e 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -81,7 +81,7 @@ env = orig_env.Clone(SCONS_PY=File('#/scripts/scons.py').rfile())
 #
 # --- Helpers ---
 #
-def writeVersionXml(verfile, date, ver, rev):
+def writeVersionXml(verfile, date, ver, rev, copyright_years):
     """ Helper function: Write a version.xml file. """
     try:
         os.unlink(verfile)
@@ -99,7 +99,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY builddate "%s">
 <!ENTITY buildversion "%s">
 <!ENTITY buildrevision "%s">
-""" % (date, ver, rev))
+<!ENTITY copyright_years "%s">
+""" % (date, ver, rev, copyright_years))
 
 
 # The names of the target files for the MAN pages
@@ -156,9 +157,9 @@ else:
     # for this run.  Ignore it for dependency purposes so we don't
     # rebuild all the docs every time just because the date changes.
     #
-    date, ver, rev = env.Dictionary('DATE', 'VERSION', 'REVISION')
+    date, ver, rev, copyright_years = env.Dictionary('DATE', 'VERSION', 'REVISION', 'COPYRIGHT_YEARS')
     version_xml = File(os.path.join(build, "version.xml"))
-    writeVersionXml(str(version_xml), date, ver, rev)
+    writeVersionXml(str(version_xml), date, ver, rev, copyright_years)
 
     import shutil
     import SCons.Builder
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index d03608d..6b0eace 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -47,18 +47,13 @@
     <title>SCons &buildversion;</title>
     <subtitle>MAN page</subtitle>
 
-<!--    <author>-->
-<!--      <firstname>SCons</firstname>-->
-<!--      <surname>Development Team</surname>-->
-<!--    </author>-->
-
     <corpauthor>The SCons Development Team</corpauthor>
 
     <!-- adding pubdate seems superfluous when copyright year is the same
          and html rendering puts both of them at the top of the page -->
     <pubdate>Released &builddate;</pubdate>
-    <copyright>
-      <year>2004 - 2021</year>
+        <copyright>
+      <year>&copyright_years;</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
@@ -71,7 +66,6 @@
   <title>SCons &buildversion;</title>
   <subtitle>MAN page</subtitle>
 
-
 <refentry id='scons1'>
 <refmeta>
 <refentrytitle>SCONS</refentrytitle>
diff --git a/doc/user/MANIFEST b/doc/user/MANIFEST
index 5be5aff..a954b58 100644
--- a/doc/user/MANIFEST
+++ b/doc/user/MANIFEST
@@ -13,7 +13,6 @@ build-install.xml
 caching.xml
 command-line.xml
 cons.pl
-copyright.xml
 depends.xml
 environments.xml
 errors.xml
diff --git a/doc/user/copyright.xml b/doc/user/copyright.xml
deleted file mode 100644
index e40dfd2..0000000
--- a/doc/user/copyright.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE sconsdoc [
-        <!ENTITY % scons SYSTEM "../scons.mod">
-        %scons;
-        ]>
-
-<legalnotice xmlns="http://www.scons.org/dbxsd/v1.0"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
-
-    <!--
-
-      __COPYRIGHT__
-
-      Permission is hereby granted, free of charge, to any person obtaining
-      a copy of this software and associated documentation files (the
-      "Software"), to deal in the Software without restriction, including
-      without limitation the rights to use, copy, modify, merge, publish,
-      distribute, sublicense, and/or sell copies of the Software, and to
-      permit persons to whom the Software is furnished to do so, subject to
-      the following conditions:
-
-      The above copyright notice and this permission notice shall be included
-      in all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-      KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-      WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-      LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-      OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    -->
-
-    <copyright>
-        <year>2004 - 2021</year>
-        <holder>The SCons Foundation</holder>
-    </copyright>
-
-</legalnotice>
diff --git a/doc/user/main.xml b/doc/user/main.xml
index 5572bfb..029cb09 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <!--
 
-  __COPYRIGHT__
+  MIT License
+
+  Copyright The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -54,7 +56,10 @@
 
     <pubdate>Released &builddate;</pubdate>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright.xml"/>
+    <copyright>
+        <year>&copyright_years;</year>
+        <holder>The SCons Foundation</holder>
+    </copyright>
 
     <releaseinfo>Version &buildversion;</releaseinfo>
 
diff --git a/doc/version.xml b/doc/version.xml
index ac32bf1..da6b500 100644
--- a/doc/version.xml
+++ b/doc/version.xml
@@ -5,3 +5,4 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE.  DO NOT EDIT.
 <!ENTITY builddate "2020-07-04">
 <!ENTITY buildversion "4.0.0">
 <!ENTITY buildrevision "1">
+