From 0e20ef9c3a8737bb1bcdceba8ce9d766cd41d5bd Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 08:44:43 -0800 Subject: Updated docs for 3.0.3 Release --- doc/generated/examples/caching_ex-random_1.xml | 6 +++--- doc/generated/examples/troubleshoot_Dump_2.xml | 2 +- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- doc/generated/variables.gen | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index 667ab4b..c821b48 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q -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 diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml index 08c6f04..a621422 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 ed8f6d9..a60ed80 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 <module> +File "/home/bdbaddog/scons/git/as_scons/src/script/scons.py", line 204, in <module> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 436f14e..5ed8c2f 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. The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. @@ -3308,7 +3308,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET") The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. -- cgit v0.12 From 0fb914855c31d064070bc76278a95e67f60b8b67 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 08:45:52 -0800 Subject: Fix date for 3.0.3 in debian/changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e906075..7ef3a14 100755 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ scons (3.0.3) unstable; urgency=low * Maintenance Release - -- William Deegan Sat, 02 Jan 2018 19:44:18 -0700 + -- William Deegan Sat, 07 Jan 2018 19:44:18 -0700 scons (3.0.2) unstable; urgency=low -- cgit v0.12 From 1cc11c66b38e34df8609526e210cf68efee406e2 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 16:46:22 +0000 Subject: Updates for Ubuntu 18.04 LTS build machine --- bin/scons_dev_master.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py index 4fa5899..4b1160f 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', -- cgit v0.12 From adb58640b798f8953611238e2d084c780826e774 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 17:02:36 +0000 Subject: Update EnsureSConsVersion test expected fail version check from version 3 to version 4 --- test/EnsureSConsVersion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EnsureSConsVersion.py b/test/EnsureSConsVersion.py index b31abfe..66543a3 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) """) -- cgit v0.12 From 92fa2386ebcbcb1788c204a08f4e31130474dfc1 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 09:16:08 -0800 Subject: Update copyright date to 2019 --- ReleaseConfig | 2 +- SConstruct | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReleaseConfig b/ReleaseConfig index 7ff6087..b5954df 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 22caa1d..a7eca26 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' -- cgit v0.12