New upstream version 3.0.0upstream/3.0.0

1 files changed, 19 insertions, 7 deletions

diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index 3c41ac0..3d67cb5 100644
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -3,6 +3,7 @@
 
 # A script for turning a generic Ubuntu system into a master for
 # SCons development.
+from __future__ import print_function
 
 import getopt
 import sys
@@ -10,7 +11,7 @@ import sys
 from Command import CommandRunner, Usage
 
 INITIAL_PACKAGES = [
-    'subversion',
+    'mercurial',
 ]
 
 INSTALL_PACKAGES = [
@@ -22,6 +23,14 @@ PYTHON_PACKAGES = [
     'gcc',
     'make',
     'zlib1g-dev',
+    'libreadline-gplv2-dev',
+    'libncursesw5-dev',
+    'libssl-dev',
+    'libsqlite3-dev',
+    'tk-dev',
+    'libgdbm-dev',
+    'libc6-dev',
+    'libbz2-dev'
 ]
 
 BUILDING_PACKAGES = [
@@ -85,7 +94,7 @@ TESTING_PACKAGES = [
 ]
 
 BUILDBOT_PACKAGES = [
-    'buildbot',
+    'buildbot-worker',
     'cron',
 ]
 
@@ -122,7 +131,7 @@ Usage:  scons_dev_master.py [-hnqy] [--password PASSWORD] [--username USER]
         buildbot                Install packages for running BuildBot
 """
 
-    scons_url = 'http://scons.tigris.org/svn/scons/trunk'
+    scons_url = 'https://bdbaddog@bitbucket.org/scons/scons'
     sudo = 'sudo'
     password = '""'
     username = 'guest'
@@ -131,12 +140,12 @@ Usage:  scons_dev_master.py [-hnqy] [--password PASSWORD] [--username USER]
     try:
         try:
             opts, args = getopt.getopt(argv[1:], short_options, long_options)
-        except getopt.error, msg:
+        except getopt.error as msg:
             raise Usage(msg)
 
         for o, a in opts:
             if o in ('-h', '--help'):
-                print helpstr
+                print(helpstr)
                 sys.exit(0)
             elif o in ('-n', '--no-exec'):
                 CommandRunner.execute = CommandRunner.do_not_execute
@@ -148,7 +157,7 @@ Usage:  scons_dev_master.py [-hnqy] [--password PASSWORD] [--username USER]
                 username = a
             elif o in ('-y', '--yes', '--assume-yes'):
                 yesflag = o
-    except Usage, err:
+    except Usage as err:
         sys.stderr.write(str(err.msg) + '\n')
         sys.stderr.write('use -h to get help\n')
         return 2
@@ -162,6 +171,7 @@ Usage:  scons_dev_master.py [-hnqy] [--password PASSWORD] [--username USER]
     testing_packages = ' '.join(TESTING_PACKAGES)
     buildbot_packages = ' '.join(BUILDBOT_PACKAGES)
     python_packages = ' '.join(PYTHON_PACKAGES)
+    doc_packages = ' '.join(DOCUMENTATION_PACKAGES)
 
     cmd = CommandRunner(locals())
 
@@ -170,9 +180,11 @@ 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('svn co --username guest --password "" %(scons_url)s')
+            cmd.run('hg 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')
         elif arg == 'buildbot':