New upstream version 3.0.5upstream/3.0.5

1 files changed, 14 insertions, 9 deletions

diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index 3d67cb5..4b1160f 100644
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -11,11 +11,12 @@ import sys
 from Command import CommandRunner, Usage
 
 INITIAL_PACKAGES = [
-    'mercurial',
+    'git',
 ]
 
 INSTALL_PACKAGES = [
     'wget',
+    'xz-utils',
 ]
 
 PYTHON_PACKAGES = [
@@ -41,6 +42,7 @@ BUILDING_PACKAGES = [
     'python-epydoc',
     'rpm',
     'tar',
+    'lynx'
     
     # additional packages that Bill Deegan's web page suggests
     #'docbook-to-man',
@@ -60,8 +62,7 @@ DOCUMENTATION_PACKAGES = [
     'gcc-doc',
     'pkg-config',
     'python-doc',
-    'sun-java5-doc',
-    'sun-java6-doc',
+    'openjdk-8-doc',
     'swig-doc',
     'texlive-doc',
 ]
@@ -73,18 +74,20 @@ TESTING_PACKAGES = [
     'flex',
     'g++',
     'gcc',
-    'gcj',
+    # not on ubuntu 18.04
+    #    'gcj',
+    #    'hg',
     'ghostscript',
-#    'libgcj7-dev',
     'm4',
     'openssh-client',
     'openssh-server',
     'python-profiler',
     'python-all-dev',
+    'python3-all-dev',
+    'pypy-dev',
     'rcs',
     'rpm',
-#    'sun-java5-jdk',
-    'sun-java6-jdk',
+    'openjdk-8-jdk',
     'swig',
     'texlive-base-bin',
     'texlive-extra-utils',
@@ -131,7 +134,7 @@ Usage:  scons_dev_master.py [-hnqy] [--password PASSWORD] [--username USER]
         buildbot                Install packages for running BuildBot
 """
 
-    scons_url = 'https://bdbaddog@bitbucket.org/scons/scons'
+    scons_url = 'https://github.com/SCons/scons.git'
     sudo = 'sudo'
     password = '""'
     username = 'guest'
@@ -180,13 +183,15 @@ Usage:  scons_dev_master.py [-hnqy] [--password PASSWORD] [--username USER]
             cmd.run('%(sudo)s apt-get %(yesflag)s upgrade')
         elif arg == 'checkout':
             cmd.run('%(sudo)s apt-get %(yesflag)s install %(initial_packages)s')
-            cmd.run('hg clone" %(scons_url)s')
+            cmd.run('git clone" %(scons_url)s')
         elif arg == 'building':
             cmd.run('%(sudo)s apt-get %(yesflag)s install %(building_packages)s')
         elif arg == 'docs':
             cmd.run('%(sudo)s apt-get %(yesflag)s install %(doc_packages)s')
         elif arg == 'testing':
             cmd.run('%(sudo)s apt-get %(yesflag)s install %(testing_packages)s')
+            #TODO: maybe copy ipkg-build from openwrt git
+            #cmd.run('%(sudo)s wget https://raw.githubusercontent.com/openwrt/openwrt/master/scripts/ipkg-build SOMEWHERE')
         elif arg == 'buildbot':
             cmd.run('%(sudo)s apt-get %(yesflag)s install %(buildbot_packages)s')
         elif arg == 'python-versions':