diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-01-07 16:24:46 -0800 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2019-01-07 16:24:46 -0800 |
| commit | b0f6adff970a3f7cc60d3e246272a90426db82a8 (patch) | |
| tree | ec50d60ae1eeb0213b2b593153a8a2da48c240c1 | |
| parent | 92fa2386ebcbcb1788c204a08f4e31130474dfc1 (diff) | |
| parent | adb58640b798f8953611238e2d084c780826e774 (diff) | |
| download | scons-git-b0f6adff970a3f7cc60d3e246272a90426db82a8.tar.gz | |
Merge branch 'rel_3.0.3' of github.com:SCons/scons into rel_3.0.3
| -rw-r--r-- | bin/scons_dev_master.py | 6 | ||||
| -rw-r--r-- | test/EnsureSConsVersion.py | 2 |
2 files changed, 5 insertions, 3 deletions
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/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) """) |