Moving to scons 1.1.0

Review URL: http://codereview.chromium.org/8900

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4197 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 21 insertions, 5 deletions

diff --git a/third_party/scons/scons-local/SCons/Script/Interactive.py b/third_party/scons/scons-local/SCons/Script/Interactive.py
index e54b008..4618920 100644
--- a/third_party/scons/scons-local/SCons/Script/Interactive.py
+++ b/third_party/scons/scons-local/SCons/Script/Interactive.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/Interactive.py 3424 2008/09/15 11:22:20 scons"
+__revision__ = "src/engine/SCons/Script/Interactive.py 3603 2008/10/10 05:46:45 scons"
 
 __doc__ = """
 SCons interactive mode
diff --git a/third_party/scons/scons-local/SCons/Script/Main.py b/third_party/scons/scons-local/SCons/Script/Main.py
index 3893ee8..05063aa 100644
--- a/third_party/scons/scons-local/SCons/Script/Main.py
+++ b/third_party/scons/scons-local/SCons/Script/Main.py
@@ -34,7 +34,7 @@ it goes here.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/Main.py 3424 2008/09/15 11:22:20 scons"
+__revision__ = "src/engine/SCons/Script/Main.py 3603 2008/10/10 05:46:45 scons"
 
 import os
 import os.path
@@ -966,6 +966,9 @@ def _main(parser):
 
     SCons.Job.explicit_stack_size = options.stack_size
 
+    if options.md5_chunksize:
+        SCons.Node.FS.File.md5_chunksize = options.md5_chunksize
+
     platform = SCons.Platform.platform_module()
 
     if options.interactive:
diff --git a/third_party/scons/scons-local/SCons/Script/SConsOptions.py b/third_party/scons/scons-local/SCons/Script/SConsOptions.py
index 786e756..40e811a 100644
--- a/third_party/scons/scons-local/SCons/Script/SConsOptions.py
+++ b/third_party/scons/scons-local/SCons/Script/SConsOptions.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/SConsOptions.py 3424 2008/09/15 11:22:20 scons"
+__revision__ = "src/engine/SCons/Script/SConsOptions.py 3603 2008/10/10 05:46:45 scons"
 
 import optparse
 import re
@@ -126,6 +126,7 @@ class SConsValues(optparse.Values):
         'help',
         'implicit_cache',
         'max_drift',
+        'md5_chunksize',
         'no_exec',
         'num_jobs',
         'random',
@@ -177,6 +178,11 @@ class SConsValues(optparse.Values):
                 value = int(value)
             except ValueError:
                 raise SCons.Errors.UserError, "An integer is required: %s"%repr(value)
+        elif name == 'md5_chunksize':
+            try:
+                value = int(value)
+            except ValueError:
+                raise SCons.Errors.UserError, "An integer is required: %s"%repr(value)
         elif name == 'warn':
             if SCons.Util.is_String(value):
                 value = [value]
@@ -726,6 +732,13 @@ def Parser(version):
                   help="Set maximum system clock drift to N seconds.",
                   metavar="N")
 
+    op.add_option('--md5-chunksize',
+                  nargs=1, type="int",
+                  dest='md5_chunksize', default=SCons.Node.FS.File.md5_chunksize,
+                  action="store",
+                  help="Set chunk-size for MD5 signature computation to N kilobytes.",
+                  metavar="N")
+
     op.add_option('-n', '--no-exec', '--just-print', '--dry-run', '--recon',
                   dest='no_exec', default=False,
                   action="store_true",
diff --git a/third_party/scons/scons-local/SCons/Script/SConscript.py b/third_party/scons/scons-local/SCons/Script/SConscript.py
index bc806fd..87cc8cf 100644
--- a/third_party/scons/scons-local/SCons/Script/SConscript.py
+++ b/third_party/scons/scons-local/SCons/Script/SConscript.py
@@ -28,7 +28,7 @@ files.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/SConscript.py 3424 2008/09/15 11:22:20 scons"
+__revision__ = "src/engine/SCons/Script/SConscript.py 3603 2008/10/10 05:46:45 scons"
 
 import SCons
 import SCons.Action
diff --git a/third_party/scons/scons-local/SCons/Script/__init__.py b/third_party/scons/scons-local/SCons/Script/__init__.py
index 33835ed..76c4cd3 100644
--- a/third_party/scons/scons-local/SCons/Script/__init__.py
+++ b/third_party/scons/scons-local/SCons/Script/__init__.py
@@ -34,7 +34,7 @@ it goes here.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Script/__init__.py 3424 2008/09/15 11:22:20 scons"
+__revision__ = "src/engine/SCons/Script/__init__.py 3603 2008/10/10 05:46:45 scons"
 
 import time
 start_time = time.time()