Merge remote-tracking branch 'origin/rel_3.0.3' into rel_3.0.3

9 files changed, 15 insertions, 13 deletions

diff --git a/ReleaseConfig b/ReleaseConfig
index 7ff608763..b5954df57 100755
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -51,7 +51,7 @@ deprecated_python_version = (2, 7, 0)
 #month_year = 'December 2012'
 
 # If copyright years is not given, the release year is used as the end.
-copyright_years = '2001 - 2018'
+copyright_years = '2001 - 2019'
 
 # Local Variables:
 # tab-width:4
diff --git a/SConstruct b/SConstruct
index 22caa1d5d..a7eca2621 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@
 
 from __future__ import print_function
 
-copyright_years = '2001 - 2018'
+copyright_years = '2001 - 2019'
 
 # This gets inserted into the man pages to reflect the month of release.
 month_year = 'January 2019'
diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index 4fa589992..4b1160f22 100644
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -42,6 +42,7 @@ BUILDING_PACKAGES = [
     'python-epydoc',
     'rpm',
     'tar',
+    'lynx'
     
     # additional packages that Bill Deegan's web page suggests
     #'docbook-to-man',
@@ -70,11 +71,12 @@ TESTING_PACKAGES = [
     'bison',
     'cssc',
     'cvs',
-    'hg',
     'flex',
     'g++',
     'gcc',
-    'gcj',
+    # not on ubuntu 18.04
+    #    'gcj',
+    #    'hg',
     'ghostscript',
     'm4',
     'openssh-client',
diff --git a/debian/changelog b/debian/changelog
index e906075f7..7ef3a140c 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ scons (3.0.3) unstable; urgency=low
 
   * Maintenance Release
 
- -- William Deegan <bill@baddogconsulting.com>  Sat, 02 Jan 2018 19:44:18 -0700
+ -- William Deegan <bill@baddogconsulting.com>  Sat, 07 Jan 2018 19:44:18 -0700
 
 scons (3.0.2) unstable; urgency=low
 
diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 667ab4b0d..c821b48e6 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen 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">% <userinput>scons -Q</userinput>
-cc -o f1.o -c f1.c
-cc -o f4.o -c f4.c
-cc -o f2.o -c f2.c
 cc -o f3.o -c f3.c
+cc -o f4.o -c f4.c
+cc -o f1.o -c f1.c
 cc -o f5.o -c f5.c
+cc -o f2.o -c f2.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index 08c6f0479..a62142239 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -79,7 +79,7 @@ scons: Reading SConscript files ...
   'SHCXX': '$CXX',
   'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}',
   'SHCXXFLAGS': ['$CXXFLAGS'],
-  'SHELL': 'command',
+  'SHELL': None,
   'SHLIBPREFIX': '',
   'SHLIBSUFFIX': '.dll',
   'SHOBJPREFIX': '$OBJPREFIX',
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index ed8f6d90d..a60ed809b 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -3,5 +3,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/git/as_scons/src/script/scons.py", line 204, in &lt;module&gt;
+File "/home/bdbaddog/scons/git/as_scons/src/script/scons.py", line 204, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index 436f14e09..5ed8c2fc7 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -3298,7 +3298,7 @@ The command line used to call the Java archive tool.
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when the Java archive tool
 is called
-If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
+If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed.
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -3308,7 +3308,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET")
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 The string displayed when the Java archive tool
 is called
-If this is not set, then <envar xmlns="http://www.scons.org/dbxsd/v1.0">$JARCOM</envar> (the command line) is displayed.
+If this is not set, then <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-JARCOM"><envar>$JARCOM</envar></link> (the command line) is displayed.
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
diff --git a/test/EnsureSConsVersion.py b/test/EnsureSConsVersion.py
index b31abfea9..66543a379 100644
--- a/test/EnsureSConsVersion.py
+++ b/test/EnsureSConsVersion.py
@@ -50,7 +50,7 @@ Exit(0)
 
     test.write('SConstruct', """\
 env = Environment()
-env.EnsureSConsVersion(3,0)
+env.EnsureSConsVersion(4,0)
 Exit(0)
 """)