Imported Upstream version 2.0.1upstream/2.0.1

6 files changed, 43 insertions, 21 deletions

diff --git a/bin/import-test.py b/bin/import-test.py
index 906bab0..4991aee 100644
--- a/bin/import-test.py
+++ b/bin/import-test.py
@@ -25,7 +25,7 @@
 # """ triple-quotes will need to have their contents edited by hand.
 #
 
-__revision__ = "bin/import-test.py 5023 2010/06/14 22:05:46 scons"
+__revision__ = "bin/import-test.py 5134 2010/08/16 23:02:40 bdeegan"
 
 import os.path
 import sys
diff --git a/bin/install_scons.py b/bin/install_scons.py
index b5e0af8..00129f6 100644
--- a/bin/install_scons.py
+++ b/bin/install_scons.py
@@ -22,6 +22,8 @@ import getopt
 import os
 import shutil
 import sys
+import tarfile
+import urllib
 
 from Command import CommandRunner, Usage
 
@@ -87,7 +89,12 @@ all_versions = [
     '1.3.0',
     '1.3.0.d20100404',
     '1.3.0.d20100501',
+    '1.3.0.d20100523',
+    '1.3.0.d20100606',
     '2.0.0.alpha.20100508',
+    '2.0.0.beta.20100531',
+    '2.0.0.beta.20100605',
+    '2.0.0.final.0',
 ]
 
 def main(argv=None):
@@ -97,8 +104,12 @@ def main(argv=None):
     all = False
     downloads_dir = 'Downloads'
     downloads_url = 'http://downloads.sourceforge.net/scons'
-    sudo = 'sudo'
-    prefix = '/usr/local'
+    if sys.platform == 'win32':
+        sudo = ''
+        prefix = sys.prefix
+    else:
+        sudo = 'sudo'
+        prefix = '/usr/local'
     python = sys.executable
 
     short_options = 'ad:hnp:q'
@@ -153,16 +164,19 @@ Usage:  install_scons.py [-ahnq] [-d DIR] [-p PREFIX] [VERSION ...]
     for version in args:
         scons = 'scons-' + version
         tar_gz = os.path.join(downloads_dir, scons + '.tar.gz')
-        tar_gz_url = os.path.join(downloads_url, scons + '.tar.gz')
+        tar_gz_url = "%s/%s.tar.gz" % (downloads_url, scons)
 
         cmd.subst_dictionary(locals())
 
         if not os.path.exists(tar_gz):
             if not os.path.exists(downloads_dir):
                 cmd.run('mkdir %(downloads_dir)s')
-            cmd.run('wget -O %(tar_gz)s %(tar_gz_url)s')
+            cmd.run((urllib.urlretrieve, tar_gz_url, tar_gz),
+                    'wget -O %(tar_gz)s %(tar_gz_url)s')
 
-        cmd.run('tar zxf %(tar_gz)s')
+        def extract(tar_gz):
+            tarfile.open(tar_gz, "r:gz").extractall()
+        cmd.run((extract, tar_gz), 'tar zxf %(tar_gz)s')
 
         cmd.run('cd %(scons)s')
 
diff --git a/bin/linecount.py b/bin/linecount.py
index 7d6e457..9d0be94 100644
--- a/bin/linecount.py
+++ b/bin/linecount.py
@@ -23,7 +23,7 @@
 # interesting one for most purposes.
 from __future__ import division
 
-__revision__ = "bin/linecount.py 5023 2010/06/14 22:05:46 scons"
+__revision__ = "bin/linecount.py 5134 2010/08/16 23:02:40 bdeegan"
 
 import os.path
 
diff --git a/bin/restore.sh b/bin/restore.sh
index 3fd8d72..6db56f1 100644
--- a/bin/restore.sh
+++ b/bin/restore.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 #
-# Simple hack script to restore __revision__, __COPYRIGHT_, 2.0.0.final.0
+# Simple hack script to restore __revision__, __COPYRIGHT_, 2.0.1
 # and other similar variables to what gets checked in to source.  This
 # comes in handy when people send in diffs based on the released source.
 #
@@ -24,7 +24,7 @@ for i in `find $DIRS -name '*.py'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation/p
 w
-/^__revision__ = /s/= .*/= "bin/restore.sh 5023 2010/06/14 22:05:46 scons"/p
+/^__revision__ = /s/= .*/= "bin/restore.sh 5134 2010/08/16 23:02:40 bdeegan"/p
 w
 q
 EOF
@@ -35,7 +35,7 @@ for i in `find $DIRS -name 'scons.bat'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation/p
 w
-/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh 5023 2010/06/14 22:05:46 scons/p
+/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh 5134 2010/08/16 23:02:40 bdeegan/p
 w
 q
 EOF
@@ -44,15 +44,15 @@ done
 for i in `find $DIRS -name '__init__.py' -o -name 'scons.py' -o -name 'sconsign.py'`; do
     header $i
     ed $i <<EOF
-/^__version__ = /s/= .*/= "2.0.0.final.0"/p
+/^__version__ = /s/= .*/= "2.0.1"/p
 w
-/^__build__ = /s/= .*/= "r5023"/p
+/^__build__ = /s/= .*/= "r5134"/p
 w
-/^__buildsys__ = /s/= .*/= "scons-dev"/p
+/^__buildsys__ = /s/= .*/= "cooldog"/p
 w
-/^__date__ = /s/= .*/= "2010/06/14 22:05:46"/p
+/^__date__ = /s/= .*/= "2010/08/16 23:02:40"/p
 w
-/^__developer__ = /s/= .*/= "scons"/p
+/^__developer__ = /s/= .*/= "bdeegan"/p
 w
 q
 EOF
@@ -61,7 +61,7 @@ done
 for i in `find $DIRS -name 'setup.py'`; do
     header $i
     ed $i <<EOF
-/^ *version = /s/= .*/= "2.0.0.final.0",/p
+/^ *version = /s/= .*/= "2.0.1",/p
 w
 q
 EOF
@@ -72,9 +72,9 @@ for i in `find $DIRS -name '*.txt'`; do
     ed $i <<EOF
 g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation/p
 w
-/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh 5023 2010/06/14 22:05:46 scons/p
+/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh 5134 2010/08/16 23:02:40 bdeegan/p
 w
-/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.0.0.final.0/p
+/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.0.1/p
 w
 q
 EOF
diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index 4fa810d..9372df4 100644
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -44,6 +44,10 @@ BUILDING_PACKAGES = [
     #'docbook2x',
     #'tetex-bin',
     #'tetex-latex',
+
+    # for ubuntu 9.10 
+    # 'texlive-lang-french'
+
 ]
 
 DOCUMENTATION_PACKAGES = [
@@ -75,7 +79,7 @@ TESTING_PACKAGES = [
     'python-all-dev',
     'rcs',
     'rpm',
-    'sun-java5-jdk',
+#    'sun-java5-jdk',
     'sun-java6-jdk',
     'swig',
     'texlive-base-bin',
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 5c438db..7e11c4b 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -57,7 +57,7 @@ In 'post' mode, files are prepared for the next release cycle:
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "bin/update-release-info.py 5023 2010/06/14 22:05:46 scons"
+__revision__ = "bin/update-release-info.py 5134 2010/08/16 23:02:40 bdeegan"
 
 import os
 import sys
@@ -114,7 +114,11 @@ if version_tuple[3] != 'final':
     else:
         yyyy,mm,dd,_,_,_ = release_date
         version_tuple = version_tuple[:4] + ((yyyy*100 + mm)*100 + dd,)
-version_string = '.'.join(map(str, version_tuple))
+    version_string = '.'.join(map(str, version_tuple))
+else:
+    # Final release doesn't have type or builddate in version string
+    version_string = '.'.join(map(str, version_tuple[:3]))
+
 version_type = version_tuple[3]
 if DEBUG: print 'version string', version_string