Merge branch 'rel_3.0.3' of github.com:SCons/scons into rel_3.0.3

SCons · Jan 8, 2019 · b0f6adf · b0f6adf
2 parents 92fa238 + adb5864
commit b0f6adf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
@@ -42,6 +42,7 @@
     'python-epydoc',
     'rpm',
     'tar',
+    'lynx'
 
     # additional packages that Bill Deegan's web page suggests
     #'docbook-to-man',
@@ -70,11 +71,12 @@
     '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
@@ -50,7 +50,7 @@
 
     test.write('SConstruct', """\
 env = Environment()
-env.EnsureSConsVersion(3,0)
+env.EnsureSConsVersion(4,0)
 Exit(0)
 """)