misc updates to man/users guide copyright formatting. Minor updates to update-release-info to use 'Released: <date here>' instead of range of years.

7 files changed, 42 insertions, 57 deletions

diff --git a/SCons/__init__.py b/SCons/__init__.py
index cd521d1..760cafb 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
 __version__="4.1.1a"
 __copyright__="Copyright (c) 2001 - 2021 The SCons Foundation"
 __developer__="bdbaddog"
-__date__="2021-05-30 21:33:41"
+__date__="2021-07-18 21:02:30"
 __buildsys__="ProDog2020"
-__revision__="b4c7a0966c36d37d0c2ea125dd98bff0061e28f2"
-__build__="b4c7a0966c36d37d0c2ea125dd98bff0061e28f2"
+__revision__="8a3645ede63154aca94bcfb273c65760cb057a17"
+__build__="8a3645ede63154aca94bcfb273c65760cb057a17"
 # make sure compatibility is always in place
 import SCons.compat # noqa
\ No newline at end of file
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index bd608e5..5e2e326 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -33,8 +33,9 @@ In 'post' mode, files are prepared for the next release cycle:
   - A new section to accumulate changes is added to src/CHANGES.txt and
     src/Announce.txt.
 """
+# MIT License
 #
-# __COPYRIGHT__
+# 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
@@ -53,14 +54,14 @@ In 'post' mode, files are prepared for the next release cycle:
 # 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.
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
 
+
+import argparse
 import os
+import re
 import sys
 import time
-import re
-import argparse
 
 DEBUG = os.environ.get('DEBUG', 0)
 
@@ -257,15 +258,15 @@ def main(args, rel_info):
         rel_info.version_string = new_version
 
         # Update ReleaseConfig
-
         t = UpdateFile('ReleaseConfig')
-        if DEBUG: t.file = '/tmp/ReleaseConfig'
+        if DEBUG:
+            t.file = '/tmp/ReleaseConfig'
         t.replace_assign('version_tuple', str(new_tuple))
 
         # Update src/CHANGES.txt
-
         t = UpdateFile('CHANGES.txt')
-        if DEBUG: t.file = '/tmp/CHANGES.txt'
+        if DEBUG:
+            t.file = '/tmp/CHANGES.txt'
         t.sub('(\nRELEASE .*)', r"""\nRELEASE  VERSION/DATE TO BE FILLED IN LATER\n
       From John Doe:\n
         - Whatever John Doe did.\n\n\1""")
@@ -273,7 +274,8 @@ def main(args, rel_info):
         # Update src/RELEASE.txt
         t = UpdateFile('RELEASE.txt',
                        os.path.join('template', 'RELEASE.txt'))
-        if DEBUG: t.file = '/tmp/RELEASE.txt'
+        if DEBUG:
+            t.file = '/tmp/RELEASE.txt'
         t.replace_version()
 
         # Update README
@@ -287,9 +289,9 @@ def main(args, rel_info):
                       count=0)
 
         # Update testing/framework/TestSCons.py
-
         t = UpdateFile(os.path.join('testing', 'framework', 'TestSCons.py'))
-        if DEBUG: t.file = '/tmp/TestSCons.py'
+        if DEBUG:
+            t.file = '/tmp/TestSCons.py'
         t.replace_assign('copyright_years', repr(rel_info.copyright_years))
         t.replace_assign('default_version', repr(rel_info.version_string))
         # ??? t.replace_assign('SConsVersion', repr(version_string))
@@ -297,26 +299,18 @@ def main(args, rel_info):
         t.replace_assign('python_version_deprecated', str(rel_info.deprecated_version))
 
         # Update Script/Main.py
-
         t = UpdateFile(os.path.join('SCons', 'Script', 'Main.py'))
-        if DEBUG: t.file = '/tmp/Main.py'
+        if DEBUG:
+            t.file = '/tmp/Main.py'
         t.replace_assign('unsupported_python_version', str(rel_info.unsupported_version))
         t.replace_assign('deprecated_python_version', str(rel_info.deprecated_version))
 
-        # Update doc/user/main.{in,xml}
-
+        # Update doc/user/main.xml
         docyears = '2004 - %d' % rel_info.release_date[0]
-        if os.path.exists(os.path.join('doc', 'user', 'main.in')):
-            # this is no longer used as of Dec 2013
-            t = UpdateFile(os.path.join('doc', 'user', 'main.in'))
-        if DEBUG: t.file = '/tmp/main.in'
-        ## TODO debug these
-        # t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
-        # t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
-
         t = UpdateFile(os.path.join('doc', 'user', 'main.xml'))
-        if DEBUG: t.file = '/tmp/main.xml'
-        t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
+        if DEBUG:
+            t.file = '/tmp/main.xml'
+        t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>Released: ' + rel_info.new_date + '</pubdate>')
         t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
 
         # Write out the last update
diff --git a/doc/SConscript b/doc/SConscript
index cebb9bd..ba96935 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -2,8 +2,9 @@
 # SConscript file for building SCons documentation.
 #
 
+# MIT License
 #
-# __COPYRIGHT__
+# 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
@@ -22,7 +23,7 @@
 # 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.
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
 
 import os.path
 import re
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index f129790..d03608d 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -47,22 +47,22 @@
     <title>SCons &buildversion;</title>
     <subtitle>MAN page</subtitle>
 
-    <author>
-      <firstname>SCons</firstname>
-      <surname>Development Team</surname>
-    </author>
+<!--    <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>2004 - 2021</pubdate>
+    <pubdate>Released &builddate;</pubdate>
     <copyright>
       <year>2004 - 2021</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 
-    <releaseinfo>version &buildversion;</releaseinfo>
+    <releaseinfo>Version &buildversion;</releaseinfo>
 
     <mediaobject role="cover"><imageobject><imagedata fileref="cover.jpg" format="JPG"/></imageobject></mediaobject>
 
diff --git a/doc/user/copyright.xml b/doc/user/copyright.xml
index c16989a..e40dfd2 100644
--- a/doc/user/copyright.xml
+++ b/doc/user/copyright.xml
@@ -33,11 +33,9 @@
 
     -->
 
-    <blockquote>
-        <para>
-            SCons User's Guide Copyright (c) 2004-2020 The SCons Foundation
-        </para>
-    </blockquote>
-
+    <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 1869a91..5572bfb 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -50,23 +50,13 @@
     <title>SCons &buildversion;</title>
     <subtitle>User Guide</subtitle>
 
-    <author>
-      <firstname>SCons</firstname>
-      <surname>Development Team</surname>
-    </author>
-
     <corpauthor>The SCons Development Team</corpauthor>
 
-    <pubdate>2004 - 2021</pubdate>
-
-    <copyright>
-      <year>2004 - 2021</year>
-      <holder>The SCons Foundation</holder>
-    </copyright>
+    <pubdate>Released &builddate;</pubdate>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright.xml"/>
 
-    <releaseinfo>version &buildversion;</releaseinfo>
+    <releaseinfo>Version &buildversion;</releaseinfo>
 
     <mediaobject role="cover"><imageobject><imagedata fileref="cover.jpg" format="JPG"/></imageobject></mediaobject>
   </bookinfo>
diff --git a/scripts/scons.py b/scripts/scons.py
index 9af9897..86a6bf6 100755
--- a/scripts/scons.py
+++ b/scripts/scons.py
@@ -2,7 +2,9 @@
 #
 # SCons - a Software Constructor
 #
-# __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
@@ -21,7 +23,7 @@
 # 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.
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"