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