libv8 3.3.10.2 → 3.3.10.4

data/lib/libv8/scons/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/libv8/scons/MANIFEST

@@ -88,6 +88,7 @@ engine/SCons/Tool/dmd.py
 engine/SCons/Tool/dvi.py
 engine/SCons/Tool/dvipdf.py
 engine/SCons/Tool/dvips.py
+engine/SCons/Tool/f03.py
 engine/SCons/Tool/f77.py
 engine/SCons/Tool/f90.py
 engine/SCons/Tool/f95.py

data/lib/libv8/scons/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: scons
-Version: 2.0.1
+Version: 2.1.0
 Summary: Open Source next-generation build tool.
 Home-page: http://www.scons.org/
 Author: Steven Knight

data/lib/libv8/scons/README.txt

@@ -2,7 +2,7 @@
 
                  SCons - a software construction tool
 
-                         Version 2.0.1
+                         Version 2.1.0
 
 
 This is SCons, a tool for building software (and other files).  SCons is
@@ -56,7 +56,7 @@ provided Python-standard setup script as follows:
 
 By default, the above command will do the following:
 
-    --  Install the version-numbered "scons-2.0.1" and "sconsign-2.0.1"
+    --  Install the version-numbered "scons-2.1.0" and "sconsign-2.1.0"
         scripts in the default system script directory (/usr/bin or
         C:\Python*\Scripts, for example).  This can be disabled by
         specifying the "--no-version-script" option on the command
@@ -70,17 +70,17 @@ By default, the above command will do the following:
         making it the default on your system.
 
         On UNIX or Linux systems, you can have the "scons" and "sconsign"
-        scripts be hard links or symbolic links to the "scons-2.0.1" and
-        "sconsign-2.0.1" scripts by specifying the "--hardlink-scons"
+        scripts be hard links or symbolic links to the "scons-2.1.0" and
+        "sconsign-2.1.0" scripts by specifying the "--hardlink-scons"
         or "--symlink-scons" options on the command line.
 
-    --  Install "scons-2.0.1.bat" and "scons.bat" wrapper scripts in the
+    --  Install "scons-2.1.0.bat" and "scons.bat" wrapper scripts in the
         Python prefix directory on Windows (C:\Python*, for example).
         This can be disabled by specifying the "--no-install-bat" option
         on the command line.
 
         On UNIX or Linux systems, the "--install-bat" option may be
-        specified to have "scons-2.0.1.bat" and "scons.bat" files
+        specified to have "scons-2.1.0.bat" and "scons.bat" files
         installed in the default system script directory, which is useful
         if you want to install SCons in a shared file system directory
         that can be used to execute SCons from both UNIX/Linux and
@@ -88,7 +88,7 @@ By default, the above command will do the following:
 
     --  Install the SCons build engine (a Python module) in an
         appropriate version-numbered SCons library directory
-        (/usr/lib/scons-2.0.1 or C:\Python*\scons-2.0.1, for example).
+        (/usr/lib/scons-2.1.0 or C:\Python*\scons-2.1.0, for example).
         See below for more options related to installing the build
         engine library.
 
@@ -239,5 +239,5 @@ With plenty of help from the SCons Development team:
         Greg Spencer
         Christoph Wiedemann
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-src/README.txt 5134 2010/08/16 23:02:40 bdeegan
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+src/README.txt 5357 2011/09/09 21:31:03 bdeegan

data/lib/libv8/scons/RELEASE.txt

@@ -1,98 +1,100 @@
-  A new SCons release, 2.0.1, is now available
+  A new SCons checkpoint release, 2.1.0.final.0, is now available
   on the SCons download page:
 
           http://www.scons.org/download.php
 
-  The primary purpose of this release is to remove support for Python
-  versions prior to 2.4 and streamline the SCons code base using more
-  modern python idioms.
-
-  Here is a summary of the changes since 1.3:
+  Here is a summary of the changes since 2.0:
 
   NEW FUNCTIONALITY
 
-  - There should be no new functionality or bug fixes in this checkpoint.
-
-  DEPRECATED FUNCTIONALITY
-
-  - All features or usages deprecated in 1.3 should have been removed.
-    Uses of formerly-deprecated features should get an error.
-
-  - The BuildDir() method and the build_dir option now get warnings.
+    - SCons can now automatically embed manifests in Windows executables
+      and DLLs, by setting WINDOWS_EMBED_MANIFEST in the environment.
 
-  - The SourceCode() function and its associated factory functions have
-    started their deprecation cycle and can have a warning enabled.
+    - SCons now searches for site_scons dirs in several system-wide
+      and per-user locations, in addition to the SConstruct top dir.
+      This should enable much easier use of third-party (non-core)
+      Tools.
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-  - Any Command() or env.Command() calls that use the following Action
-    factory functions will have their targets rebuilt when upgrading
-    from any pre-2.0 release:
+    - scons --version now prints the path to the SCons package in use
 
-        Chmod()
-        Copy()
-        Delete()
-        Mkdir()
-        Move()
-        Touch()
+    - List modifications to existing features, where the previous behavior
+      wouldn't actually be considered a bug
 
-    (The rebuild occurs because the underlying Python class that
-    implements these functions has been changed to a new-style Python
-    class, and that changes the Python byte code and therefore the
-    build signature of the functions.)
+    - Add initial support for VS/VC 2010
 
   FIXES
 
-  - MSVC/MSVS/SDK support has been improved. A number of issues with
-    determining the correct version and architecture have been resolved.
-
-  - Fix propagation from environment of VS*COMNTOOLS to resolve issues
-    initializing MSVC/MSVS/SDK issues.
-
-  - Fixed a case-sensitivity problem with Fortran modules.
-
-  - Fix the ability to append to default $*FLAGS values (which are
-    implemented as CLVar instances) in a copied construction environment
-    without affecting the original construction environment's value.
-
-  - Updated the TeX command strings to include a /D on Windows in
-    case the new directory is on a different drive letter.
-
-  - Fixed the LaTeX scanner so dependencies are found in commands that
-    are broken across lines with a comment or have embedded spaces.
+    - Windows resource compiler (RC) scanner now handles DOS line endings
+    - Visual Studio project generation now works when CPPPATH contains Dir nodes
+    - Visual Studio projects are regenerated when CPPPATH or CPPDEFINES change
+      NOTE: this will cause all MSVS projects to be regenerated with this version.
+    - Passing MSVC_BATCH=False works now (treated same as 0)
+    - Long compile lines no longer break MSVC_BATCH mode
+    - RPATH is now in LINKCOM rather than LINKFLAGS, so resetting
+      LINKFLAGS doesn't kill RPATH
+    - Precompiled headers on Windows no longer break when used with
+      variant dirs containing spaces.
+    - Delete can now delete symlinks to directories and broken symlinks
+    - CPPDEFINES containing dictionaries now work better.
+    - A problem with using implicit-cache and removing dependencies on
+      disk is corrected.
+    - A problem with FS Entries which are dirs and have builders
+      is corrected.
+    - A problem with Install() of a dir when the dest dir exists
+      is corrected.
+    - Windows subprocess output should now be more reliable.
+    - The users guide and man page have various fixes.
+    - Appending to default $*FLAGS in a copied environment
+      now works properly.
+    - LaTeX scanner is improved for broken lines or embedded spaces.
+    - Windows UNC paths (\\SERVER\SHARE\dir) now work much better.
 
   IMPROVEMENTS
 
-  - Support for Python versions prior to 2.4 has been removed.  As of
-    this writing, we believe that SCons will still work with Python 2.3,
-    but this is not guaranteed.
-  - Code paths that included special cases for older Python versions have
-    been streamlined.
-  - The code base has been converted to use more modern idioms.  Although
-    we don't have any direct measurements (yet), we believe that SCons
-    startup time should be decreased and the overall code should run faster.
-
-  PACKAGING
-
-  - No changes.
+    - ParseFlags now supports -std=c++0x and related CXXFLAGS
+    - ParseFlags now supports -dylib_file from pkgconfig
+    - New debugging options to print unlink/relinking of variant files
+      (--debug=duplicate) and preparation of targets (--debug=prepare).
+    - SCons can now generate MSVS 9.0 and 10.0 Projects and Solutions.
+    - MSVS Solution generation is improved.
+    - Fortran 03 is supported (preliminary)
+    - .sx files are now treated as assembly sources.
+    - site_scons/site_init.py is now treated as a proper module
+      with __doc__, __file__ and __name__.
+    - TeX command strings now work on Windows when the new dir is
+      on a different drive letter.
+    - DMD version 2 is supported (using the phobos2 library)
+    - New --debug=prepare option shows each target as it's prepared
+      for building; can help when you don't know why a target isn't
+      being built.
 
   DOCUMENTATION
 
-  - The entries for SourceCode() and its associated factory functions now
-    state that the functions are deprecated.
-
-  - Document the AllowSubstExceptions() function in the User's Guide.
-
-
-  DEVELOPMENT
-
-  - Code no longer has to be compatible with Python versions back to 1.5.2.
-    Although code is tested with Python 2.3 and is still believed to work,
-    the official new floor is Python 2.4.
-
-  Thanks to Greg Noel, Steven Knight, Dirk Baechle, William Deegan,
-  W. Trevor King, Joe Zuntz, Bauke Conijn, Matt Hughes, Rob Managan, 
-  and Jim Randall for their contributions to this release.
+    - Added new getting started section
+
+  Thanks to
+  Dirk Baechle,
+  Vincent Beffara,
+  Grzegorz Bizoń,
+  Jean-François Colson,
+  Bauke Conijn,
+  Bill Deegan,
+  Ken Deeter,
+  Luca Falavigna,
+  Alexander Goomenyuk,
+  Justin Gullingsrud,
+  Steven Knight,
+  Arve Knudsen,
+  Jean-Baptiste Lab,
+  Rob Managan,
+  Gary Oberbrunner,
+  Evgeny Podjachev,
+  Sohail Somani,
+  Anatoly Techtonik,
+  Allen Weeks,
+  Russel Winder,
+  Joe Zuntz
+  for their contributions to this release.
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-src/RELEASE.txt 5023 2010/06/14 22:05:46 scons

data/lib/libv8/scons/engine/SCons/Action.py

@@ -76,7 +76,7 @@ way for wrapping up the functions.
 
 """
 
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -97,7 +97,7 @@ way for wrapping up the functions.
 # 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__ = "src/engine/SCons/Action.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/engine/SCons/Action.py 5357 2011/09/09 21:31:03 bdeegan"
 
 import SCons.compat
 
@@ -300,8 +300,10 @@ def _actionAppend(act1, act2):
     # a single ListAction.
     a1 = Action(act1)
     a2 = Action(act2)
-    if a1 is None or a2 is None:
-        raise TypeError("Cannot append %s to %s" % (type(act1), type(act2)))
+    if a1 is None:
+        return a2
+    if a2 is None:
+        return a1
     if isinstance(a1, ListAction):
         if isinstance(a2, ListAction):
             return ListAction(a1.list + a2.list)
@@ -385,6 +387,10 @@ def _do_create_action(act, kw):
         # The list of string commands may include a LazyAction, so we
         # reprocess them via _do_create_list_action.
         return _do_create_list_action(commands, kw)
+    # Catch a common error case with a nice message:
+    if isinstance(act, int) or isinstance(act, float):
+        raise TypeError("Don't know how to create an Action from a number (%s)"%act)
+    # Else fail silently (???)
     return None
 
 def _do_create_list_action(act, kw):
@@ -497,7 +503,18 @@ class _ActionAction(ActionBase):
             SCons.Util.AddMethod(self, batch_key, 'batch_key')
 
     def print_cmd_line(self, s, target, source, env):
-        sys.stdout.write(s + u"\n")
+        # In python 3, and in some of our tests, sys.stdout is
+        # a String io object, and it takes unicode strings only
+        # In other cases it's a regular Python 2.x file object
+        # which takes strings (bytes), and if you pass those a
+        # unicode object they try to decode with 'ascii' codec
+        # which fails if the cmd line has any hi-bit-set chars.
+        # This code assumes s is a regular string, but should
+        # work if it's unicode too.
+        try:
+            sys.stdout.write(unicode(s + "\n"))
+        except UnicodeDecodeError:
+            sys.stdout.write(s + "\n")
 
     def __call__(self, target, source, env,
                                exitstatfunc=_null,
@@ -654,7 +671,6 @@ def _subproc(scons_env, cmd, error = 'ignore', **kw):
     kw['env'] = new_env
 
     try:
-        #FUTURE return subprocess.Popen(cmd, **kw)
         return subprocess.Popen(cmd, **kw)
     except EnvironmentError, e:
         if error == 'raise': raise

data/lib/libv8/scons/engine/SCons/Builder.py

@@ -76,7 +76,7 @@ There are the following methods for internal use within this module:
 """
 
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -97,7 +97,7 @@ There are the following methods for internal use within this module:
 # 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__ = "src/engine/SCons/Builder.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/engine/SCons/Builder.py 5357 2011/09/09 21:31:03 bdeegan"
 
 import collections
 

data/lib/libv8/scons/engine/SCons/CacheDir.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/CacheDir.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/engine/SCons/CacheDir.py 5357 2011/09/09 21:31:03 bdeegan"
 
 __doc__ = """
 CacheDir support

data/lib/libv8/scons/engine/SCons/Debug.py

@@ -6,7 +6,7 @@ needed by most users.
 """
 
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -28,7 +28,7 @@ needed by most users.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Debug.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/engine/SCons/Debug.py 5357 2011/09/09 21:31:03 bdeegan"
 
 import os
 import sys

data/lib/libv8/scons/engine/SCons/Defaults.py

@@ -10,7 +10,7 @@ from distutils.msvccompiler.
 """
 
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@ from distutils.msvccompiler.
 #
 from __future__ import division
 
-__revision__ = "src/engine/SCons/Defaults.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/engine/SCons/Defaults.py 5357 2011/09/09 21:31:03 bdeegan"
 
 
 import os
@@ -199,14 +199,15 @@ def delete_func(dest, must_exist=0):
         dest = [dest]
     for entry in dest:
         entry = str(entry)
-        if not must_exist and not os.path.exists(entry):
+        # os.path.exists returns False with broken links that exist
+        entry_exists = os.path.exists(entry) or os.path.islink(entry)
+        if not entry_exists and not must_exist:
             continue
-        if not os.path.exists(entry) or os.path.isfile(entry):
-            os.unlink(entry)
-            continue
-        else:
+        # os.path.isdir returns True when entry is a link to a dir
+        if os.path.isdir(entry) and not os.path.islink(entry):
             shutil.rmtree(entry, 1)
             continue
+        os.unlink(entry)
 
 def delete_strfunc(dest, must_exist=0):
     return 'Delete(%s)' % get_paths_str(dest)
@@ -372,10 +373,23 @@ def processDefines(defs):
     if SCons.Util.is_List(defs):
         l = []
         for d in defs:
-            if SCons.Util.is_List(d) or isinstance(d, tuple):
-                l.append(str(d[0]) + '=' + str(d[1]))
-            else:
+            if d is None:
+                continue
+            elif SCons.Util.is_List(d) or isinstance(d, tuple):
+                if len(d) >= 2:
+                    l.append(str(d[0]) + '=' + str(d[1]))
+                else:
+                    l.append(str(d[0]))
+            elif SCons.Util.is_Dict(d):
+                for macro,value in d.iteritems():
+                    if value is not None:
+                        l.append(str(macro) + '=' + str(value))
+                    else:
+                        l.append(str(macro))
+            elif SCons.Util.is_String(d):
                 l.append(str(d))
+            else:
+                raise SCons.Errors.UserError("DEFINE %s is not a list, dict, string or None."%repr(d))
     elif SCons.Util.is_Dict(defs):
         # The items in a dictionary are stored in random order, but
         # if the order of the command-line options changes from

data/lib/libv8/scons/engine/SCons/Environment.py

@@ -10,7 +10,7 @@ Environment
 """
 
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@ Environment
 # 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__ = "src/engine/SCons/Environment.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/engine/SCons/Environment.py 5357 2011/09/09 21:31:03 bdeegan"
 
 
 import copy
@@ -649,6 +649,7 @@ class SubstitutionEnvironment(object):
             'ASFLAGS'       : SCons.Util.CLVar(''),
             'CFLAGS'        : SCons.Util.CLVar(''),
             'CCFLAGS'       : SCons.Util.CLVar(''),
+            'CXXFLAGS'      : SCons.Util.CLVar(''),
             'CPPDEFINES'    : [],
             'CPPFLAGS'      : SCons.Util.CLVar(''),
             'CPPPATH'       : [],
@@ -723,6 +724,9 @@ class SubstitutionEnvironment(object):
                    append_next_arg_to = None
                 elif not arg[0] in ['-', '+']:
                     dict['LIBS'].append(self.fs.File(arg))
+                elif arg == '-dylib_file':
+                    dict['LINKFLAGS'].append(arg)
+                    append_next_arg_to = 'LINKFLAGS'
                 elif arg[:2] == '-L':
                     if arg[2:]:
                         dict['LIBPATH'].append(arg[2:])
@@ -766,16 +770,20 @@ class SubstitutionEnvironment(object):
                         dict['FRAMEWORKPATH'].append(arg[2:])
                     else:
                         append_next_arg_to = 'FRAMEWORKPATH'
-                elif arg == '-mno-cygwin':
+                elif arg in ['-mno-cygwin',
+                             '-pthread',
+                             '-openmp',
+                             '-fopenmp']:
                     dict['CCFLAGS'].append(arg)
                     dict['LINKFLAGS'].append(arg)
                 elif arg == '-mwindows':
                     dict['LINKFLAGS'].append(arg)
-                elif arg == '-pthread':
-                    dict['CCFLAGS'].append(arg)
-                    dict['LINKFLAGS'].append(arg)
                 elif arg[:5] == '-std=':
-                    dict['CFLAGS'].append(arg) # C only
+                    if arg[5:].find('++')!=-1:
+                        key='CXXFLAGS'
+                    else:
+                        key='CFLAGS'
+                    dict[key].append(arg)
                 elif arg[0] == '+':
                     dict['CCFLAGS'].append(arg)
                     dict['LINKFLAGS'].append(arg)
@@ -1146,12 +1154,17 @@ class Base(SubstitutionEnvironment):
             # "continue" statements whenever we finish processing an item,
             # but Python 1.5.2 apparently doesn't let you use "continue"
             # within try:-except: blocks, so we have to nest our code.
-            try:
+            try:                
+                if key == 'CPPDEFINES' and SCons.Util.is_String(self._dict[key]):
+                    self._dict[key] = [self._dict[key]]
                 orig = self._dict[key]
             except KeyError:
                 # No existing variable in the environment, so just set
                 # it to the new value.
-                self._dict[key] = val
+                if key == 'CPPDEFINES' and SCons.Util.is_String(val):
+                    self._dict[key] = [val]
+                else:
+                    self._dict[key] = val
             else:
                 try:
                     # Check if the original looks like a dictionary.
@@ -1188,8 +1201,13 @@ class Base(SubstitutionEnvironment):
                     # The original looks like a dictionary, so update it
                     # based on what we think the value looks like.
                     if SCons.Util.is_List(val):
-                        for v in val:
-                            orig[v] = None
+                        if key == 'CPPDEFINES':
+                            orig = orig.items()
+                            orig += val
+                            self._dict[key] = orig
+                        else:    
+                            for v in val:
+                                orig[v] = None
                     else:
                         try:
                             update_dict(val)
@@ -1251,8 +1269,39 @@ class Base(SubstitutionEnvironment):
                 self._dict[key].update(val)
             elif SCons.Util.is_List(val):
                 dk = self._dict[key]
-                if not SCons.Util.is_List(dk):
-                    dk = [dk]
+                if key == 'CPPDEFINES':
+                    tmp = []
+                    for i in val:
+                        if SCons.Util.is_List(i):
+                            if len(i) >= 2:
+                                tmp.append((i[0], i[1]))
+                            else:
+                                tmp.append((i[0],))
+                        elif SCons.Util.is_Tuple(i):
+                            tmp.append(i)
+                        else:
+                            tmp.append((i,))
+                    val = tmp
+                    if SCons.Util.is_Dict(dk):
+                        dk = dk.items()
+                    elif SCons.Util.is_String(dk):
+                        dk = [(dk,)]
+                    else:                    
+                        tmp = []
+                        for i in dk:
+                            if SCons.Util.is_List(i):
+                                if len(i) >= 2:
+                                    tmp.append((i[0], i[1]))
+                                else:
+                                    tmp.append((i[0],))
+                            elif SCons.Util.is_Tuple(i):
+                                tmp.append(i)
+                            else:
+                                tmp.append((i,))
+                        dk = tmp
+                else:
+                    if not SCons.Util.is_List(dk):
+                        dk = [dk]
                 if delete_existing:
                     dk = [x for x in dk if x not in val]
                 else:
@@ -1261,15 +1310,57 @@ class Base(SubstitutionEnvironment):
             else:
                 dk = self._dict[key]
                 if SCons.Util.is_List(dk):
-                    # By elimination, val is not a list.  Since dk is a
-                    # list, wrap val in a list first.
-                    if delete_existing:
-                        dk = [x for x in dk if x not in val]
-                        self._dict[key] = dk + [val]
+                    if key == 'CPPDEFINES':
+                        tmp = []
+                        for i in dk:
+                            if SCons.Util.is_List(i):
+                                if len(i) >= 2:
+                                    tmp.append((i[0], i[1]))
+                                else:
+                                    tmp.append((i[0],))
+                            elif SCons.Util.is_Tuple(i):
+                                tmp.append(i)
+                            else:
+                                tmp.append((i,))
+                        dk = tmp
+                        if SCons.Util.is_Dict(val):
+                            val = val.items()
+                        elif SCons.Util.is_String(val):
+                            val = [(val,)]
+                        if delete_existing:
+                            dk = filter(lambda x, val=val: x not in val, dk)
+                            self._dict[key] = dk + val
+                        else:
+                            dk = [x for x in dk if x not in val]                
+                            self._dict[key] = dk + val
                     else:
-                        if not val in dk:
+                        # By elimination, val is not a list.  Since dk is a
+                        # list, wrap val in a list first.
+                        if delete_existing:
+                            dk = filter(lambda x, val=val: x not in val, dk)
                             self._dict[key] = dk + [val]
+                        else:
+                            if not val in dk:
+                                self._dict[key] = dk + [val]
                 else:
+                    if key == 'CPPDEFINES':
+                        if SCons.Util.is_String(dk):
+                            dk = [dk]
+                        elif SCons.Util.is_Dict(dk):
+                            dk = dk.items()
+                        if SCons.Util.is_String(val):
+                            if val in dk:
+                                val = []
+                            else:
+                                val = [val]
+                        elif SCons.Util.is_Dict(val):
+                            tmp = []
+                            for i,j in val.iteritems():
+                                if j is not None:
+                                    tmp.append((i,j))
+                                else:
+                                    tmp.append(i)
+                            val = tmp
                     if delete_existing:
                         dk = [x for x in dk if x not in val]
                     self._dict[key] = dk + val
@@ -2285,6 +2376,12 @@ def NoSubstitutionProxy(subject):
             return getattr(self.__dict__['__subject'], name)
         def __setattr__(self, name, value):
             return setattr(self.__dict__['__subject'], name, value)
+        def executor_to_lvars(self, kwdict):
+            if kwdict.has_key('executor'):
+                kwdict['lvars'] = kwdict['executor'].get_lvars()
+                del kwdict['executor']
+            else:
+                kwdict['lvars'] = {}
         def raw_to_mode(self, dict):
             try:
                 raw = dict['raw']
@@ -2301,12 +2398,14 @@ def NoSubstitutionProxy(subject):
             nargs = (string, self,) + args
             nkw = kwargs.copy()
             nkw['gvars'] = {}
+            self.executor_to_lvars(nkw)
             self.raw_to_mode(nkw)
             return SCons.Subst.scons_subst_list(*nargs, **nkw)
         def subst_target_source(self, string, *args, **kwargs):
             nargs = (string, self,) + args
             nkw = kwargs.copy()
             nkw['gvars'] = {}
+            self.executor_to_lvars(nkw)
             self.raw_to_mode(nkw)
             return SCons.Subst.scons_subst(*nargs, **nkw)
     return _NoSubstitutionProxy(subject)