diff --git a/scons/scons-LICENSE b/scons/scons-LICENSE
index d47d178b8..cc52c8dd4 100644
--- a/scons/scons-LICENSE
+++ b/scons/scons-LICENSE
@@ -3,7 +3,7 @@
This copyright and license do not apply to any other software
with which this software may have been included.
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/scons/scons-README b/scons/scons-README
index dc2d7dba7..fb723561e 100644
--- a/scons/scons-README
+++ b/scons/scons-README
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
SCons - a software construction tool
diff --git a/scons/scons-local-2.3.0/SCons/Platform/posix.py b/scons/scons-local-2.3.0/SCons/Platform/posix.py
deleted file mode 100644
index 38b2a8def..000000000
--- a/scons/scons-local-2.3.0/SCons/Platform/posix.py
+++ /dev/null
@@ -1,263 +0,0 @@
-"""SCons.Platform.posix
-
-Platform-specific initialization for POSIX (Linux, UNIX, etc.) systems.
-
-There normally shouldn't be any need to import this module directly. It
-will usually be imported through the generic SCons.Platform.Platform()
-selection method.
-"""
-
-#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# 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/Platform/posix.py 2013/03/03 09:48:35 garyo"
-
-import errno
-import os
-import os.path
-import subprocess
-import sys
-import select
-
-import SCons.Util
-from SCons.Platform import TempFileMunge
-
-exitvalmap = {
- 2 : 127,
- 13 : 126,
-}
-
-def escape(arg):
- "escape shell special characters"
- slash = '\\'
- special = '"$()'
-
- arg = arg.replace(slash, slash+slash)
- for c in special:
- arg = arg.replace(c, slash+c)
-
- return '"' + arg + '"'
-
-def exec_system(l, env):
- stat = os.system(' '.join(l))
- if stat & 0xff:
- return stat | 0x80
- return stat >> 8
-
-def exec_spawnvpe(l, env):
- stat = os.spawnvpe(os.P_WAIT, l[0], l, env)
- # os.spawnvpe() returns the actual exit code, not the encoding
- # returned by os.waitpid() or os.system().
- return stat
-
-def exec_fork(l, env):
- pid = os.fork()
- if not pid:
- # Child process.
- exitval = 127
- try:
- os.execvpe(l[0], l, env)
- except OSError, e:
- exitval = exitvalmap.get(e[0], e[0])
- sys.stderr.write("scons: %s: %s\n" % (l[0], e[1]))
- os._exit(exitval)
- else:
- # Parent process.
- pid, stat = os.waitpid(pid, 0)
- if stat & 0xff:
- return stat | 0x80
- return stat >> 8
-
-def _get_env_command(sh, escape, cmd, args, env):
- s = ' '.join(args)
- if env:
- l = ['env', '-'] + \
- [escape(t[0])+'='+escape(t[1]) for t in env.items()] + \
- [sh, '-c', escape(s)]
- s = ' '.join(l)
- return s
-
-def env_spawn(sh, escape, cmd, args, env):
- return exec_system([_get_env_command( sh, escape, cmd, args, env)], env)
-
-def spawnvpe_spawn(sh, escape, cmd, args, env):
- return exec_spawnvpe([sh, '-c', ' '.join(args)], env)
-
-def fork_spawn(sh, escape, cmd, args, env):
- return exec_fork([sh, '-c', ' '.join(args)], env)
-
-def process_cmd_output(cmd_stdout, cmd_stderr, stdout, stderr):
- stdout_eof = stderr_eof = 0
- while not (stdout_eof and stderr_eof):
- try:
- (i,o,e) = select.select([cmd_stdout, cmd_stderr], [], [])
- if cmd_stdout in i:
- str = cmd_stdout.read()
- if len(str) == 0:
- stdout_eof = 1
- elif stdout is not None:
- stdout.write(str)
- if cmd_stderr in i:
- str = cmd_stderr.read()
- if len(str) == 0:
- #sys.__stderr__.write( "stderr_eof=1\n" )
- stderr_eof = 1
- else:
- #sys.__stderr__.write( "str(stderr) = %s\n" % str )
- stderr.write(str)
- except select.error, (_errno, _strerror):
- if _errno != errno.EINTR:
- raise
-
-def exec_popen3(l, env, stdout, stderr):
- proc = subprocess.Popen(' '.join(l),
- stdout=stdout,
- stderr=stderr,
- shell=True)
- stat = proc.wait()
- if stat & 0xff:
- return stat | 0x80
- return stat >> 8
-
-def exec_piped_fork(l, env, stdout, stderr):
- # spawn using fork / exec and providing a pipe for the command's
- # stdout / stderr stream
- if stdout != stderr:
- (rFdOut, wFdOut) = os.pipe()
- (rFdErr, wFdErr) = os.pipe()
- else:
- (rFdOut, wFdOut) = os.pipe()
- rFdErr = rFdOut
- wFdErr = wFdOut
- # do the fork
- pid = os.fork()
- if not pid:
- # Child process
- os.close( rFdOut )
- if rFdOut != rFdErr:
- os.close( rFdErr )
- os.dup2( wFdOut, 1 ) # is there some symbolic way to do that ?
- os.dup2( wFdErr, 2 )
- os.close( wFdOut )
- if stdout != stderr:
- os.close( wFdErr )
- exitval = 127
- try:
- os.execvpe(l[0], l, env)
- except OSError, e:
- exitval = exitvalmap.get(e[0], e[0])
- stderr.write("scons: %s: %s\n" % (l[0], e[1]))
- os._exit(exitval)
- else:
- # Parent process
- pid, stat = os.waitpid(pid, 0)
- os.close( wFdOut )
- if stdout != stderr:
- os.close( wFdErr )
- childOut = os.fdopen( rFdOut )
- if stdout != stderr:
- childErr = os.fdopen( rFdErr )
- else:
- childErr = childOut
- process_cmd_output(childOut, childErr, stdout, stderr)
- os.close( rFdOut )
- if stdout != stderr:
- os.close( rFdErr )
- if stat & 0xff:
- return stat | 0x80
- return stat >> 8
-
-def piped_env_spawn(sh, escape, cmd, args, env, stdout, stderr):
- # spawn using Popen3 combined with the env command
- # the command name and the command's stdout is written to stdout
- # the command's stderr is written to stderr
- return exec_popen3([_get_env_command(sh, escape, cmd, args, env)],
- env, stdout, stderr)
-
-def piped_fork_spawn(sh, escape, cmd, args, env, stdout, stderr):
- # spawn using fork / exec and providing a pipe for the command's
- # stdout / stderr stream
- return exec_piped_fork([sh, '-c', ' '.join(args)],
- env, stdout, stderr)
-
-
-
-def generate(env):
- # If os.spawnvpe() exists, we use it to spawn commands. Otherwise
- # if the env utility exists, we use os.system() to spawn commands,
- # finally we fall back on os.fork()/os.exec().
- #
- # os.spawnvpe() is prefered because it is the most efficient. But
- # for Python versions without it, os.system() is prefered because it
- # is claimed that it works better with threads (i.e. -j) and is more
- # efficient than forking Python.
- #
- # NB: Other people on the scons-users mailing list have claimed that
- # os.fork()/os.exec() works better than os.system(). There may just
- # not be a default that works best for all users.
-
- if 'spawnvpe' in os.__dict__:
- spawn = spawnvpe_spawn
- elif env.Detect('env'):
- spawn = env_spawn
- else:
- spawn = fork_spawn
-
- if env.Detect('env'):
- pspawn = piped_env_spawn
- else:
- pspawn = piped_fork_spawn
-
- if 'ENV' not in env:
- env['ENV'] = {}
- env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
- env['OBJPREFIX'] = ''
- env['OBJSUFFIX'] = '.o'
- env['SHOBJPREFIX'] = '$OBJPREFIX'
- env['SHOBJSUFFIX'] = '$OBJSUFFIX'
- env['PROGPREFIX'] = ''
- env['PROGSUFFIX'] = ''
- env['LIBPREFIX'] = 'lib'
- env['LIBSUFFIX'] = '.a'
- env['SHLIBPREFIX'] = '$LIBPREFIX'
- env['SHLIBSUFFIX'] = '.so'
- env['LIBPREFIXES'] = [ '$LIBPREFIX' ]
- env['LIBSUFFIXES'] = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ]
- env['PSPAWN'] = pspawn
- env['SPAWN'] = spawn
- env['SHELL'] = 'sh'
- env['ESCAPE'] = escape
- env['TEMPFILE'] = TempFileMunge
- env['TEMPFILEPREFIX'] = '@'
- #Based on LINUX: ARG_MAX=ARG_MAX=131072 - 3000 for environment expansion
- #Note: specific platforms might rise or lower this value
- env['MAXLINELENGTH'] = 128072
-
- # This platform supports RPATH specifications.
- env['__RPATH'] = '$_RPATH'
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/scons/scons-local-2.3.0/SCons/Action.py b/scons/scons-local-2.3.1/SCons/Action.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Action.py
rename to scons/scons-local-2.3.1/SCons/Action.py
index 0021df6e7..0e31124c8 100644
--- a/scons/scons-local-2.3.0/SCons/Action.py
+++ b/scons/scons-local-2.3.1/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, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Action.py 2014/03/02 14:18:15 garyo"
import SCons.compat
@@ -109,6 +109,7 @@ import re
import sys
import subprocess
+import SCons.Debug
from SCons.Debug import logInstanceCreation
import SCons.Errors
import SCons.Executor
@@ -439,7 +440,8 @@ class ActionBase(object):
vl = self.get_varlist(target, source, env)
if is_String(vl): vl = (vl,)
for v in vl:
- result.append(env.subst('${'+v+'}'))
+ # do the subst this way to ignore $(...$) parts:
+ result.append(env.subst_target_source('${'+v+'}', SCons.Subst.SUBST_SIG, target, source))
return ''.join(result)
def __add__(self, other):
@@ -698,7 +700,7 @@ class CommandAction(_ActionAction):
# factory above does). cmd will be passed to
# Environment.subst_list() for substituting environment
# variables.
- if __debug__: logInstanceCreation(self, 'Action.CommandAction')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Action.CommandAction')
_ActionAction.__init__(self, **kw)
if is_List(cmd):
@@ -855,7 +857,7 @@ class CommandAction(_ActionAction):
class CommandGeneratorAction(ActionBase):
"""Class for command-generator actions."""
def __init__(self, generator, kw):
- if __debug__: logInstanceCreation(self, 'Action.CommandGeneratorAction')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Action.CommandGeneratorAction')
self.generator = generator
self.gen_kw = kw
self.varlist = kw.get('varlist', ())
@@ -944,7 +946,7 @@ class CommandGeneratorAction(ActionBase):
class LazyAction(CommandGeneratorAction, CommandAction):
def __init__(self, var, kw):
- if __debug__: logInstanceCreation(self, 'Action.LazyAction')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Action.LazyAction')
#FUTURE CommandAction.__init__(self, '${'+var+'}', **kw)
CommandAction.__init__(self, '${'+var+'}', **kw)
self.var = SCons.Util.to_String(var)
@@ -986,7 +988,7 @@ class FunctionAction(_ActionAction):
"""Class for Python function actions."""
def __init__(self, execfunction, kw):
- if __debug__: logInstanceCreation(self, 'Action.FunctionAction')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Action.FunctionAction')
self.execfunction = execfunction
try:
@@ -1108,7 +1110,7 @@ class FunctionAction(_ActionAction):
class ListAction(ActionBase):
"""Class for lists of other actions."""
def __init__(self, actionlist):
- if __debug__: logInstanceCreation(self, 'Action.ListAction')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Action.ListAction')
def list_of_actions(x):
if isinstance(x, ActionBase):
return x
diff --git a/scons/scons-local-2.3.0/SCons/Builder.py b/scons/scons-local-2.3.1/SCons/Builder.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Builder.py
rename to scons/scons-local-2.3.1/SCons/Builder.py
index 2c9958f85..0b5f29171 100644
--- a/scons/scons-local-2.3.0/SCons/Builder.py
+++ b/scons/scons-local-2.3.1/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, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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,11 +97,12 @@ 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 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Builder.py 2014/03/02 14:18:15 garyo"
import collections
import SCons.Action
+import SCons.Debug
from SCons.Debug import logInstanceCreation
from SCons.Errors import InternalError, UserError
import SCons.Executor
@@ -225,7 +226,7 @@ class OverrideWarner(collections.UserDict):
"""
def __init__(self, dict):
collections.UserDict.__init__(self, dict)
- if __debug__: logInstanceCreation(self, 'Builder.OverrideWarner')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Builder.OverrideWarner')
self.already_warned = None
def warn(self):
if self.already_warned:
@@ -376,7 +377,7 @@ class BuilderBase(object):
src_builder = None,
ensure_suffix = False,
**overrides):
- if __debug__: logInstanceCreation(self, 'Builder.BuilderBase')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Builder.BuilderBase')
self._memo = {}
self.action = action
self.multi = multi
@@ -847,7 +848,7 @@ class CompositeBuilder(SCons.Util.Proxy):
"""
def __init__(self, builder, cmdgen):
- if __debug__: logInstanceCreation(self, 'Builder.CompositeBuilder')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Builder.CompositeBuilder')
SCons.Util.Proxy.__init__(self, builder)
# cmdgen should always be an instance of DictCmdGenerator.
diff --git a/scons/scons-local-2.3.0/SCons/CacheDir.py b/scons/scons-local-2.3.1/SCons/CacheDir.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/CacheDir.py
rename to scons/scons-local-2.3.1/SCons/CacheDir.py
index aef03b4b4..8ac8fa986 100644
--- a/scons/scons-local-2.3.0/SCons/CacheDir.py
+++ b/scons/scons-local-2.3.1/SCons/CacheDir.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/CacheDir.py 2014/03/02 14:18:15 garyo"
__doc__ = """
CacheDir support
@@ -37,6 +37,7 @@ cache_enabled = True
cache_debug = False
cache_force = False
cache_show = False
+cache_readonly = False
def CacheRetrieveFunc(target, source, env):
t = target[0]
@@ -70,6 +71,8 @@ CacheRetrieve = SCons.Action.Action(CacheRetrieveFunc, CacheRetrieveString)
CacheRetrieveSilent = SCons.Action.Action(CacheRetrieveFunc, None)
def CachePushFunc(target, source, env):
+ if cache_readonly: return
+
t = target[0]
if t.nocache:
return
@@ -150,6 +153,9 @@ class CacheDir(object):
def is_enabled(self):
return (cache_enabled and not self.path is None)
+ def is_readonly(self):
+ return cache_readonly
+
def cachepath(self, node):
"""
"""
@@ -201,7 +207,7 @@ class CacheDir(object):
return False
def push(self, node):
- if not self.is_enabled():
+ if self.is_readonly() or not self.is_enabled():
return
return CachePush(node, [], node.get_build_env())
diff --git a/scons/scons-local-2.3.0/SCons/Conftest.py b/scons/scons-local-2.3.1/SCons/Conftest.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Conftest.py
rename to scons/scons-local-2.3.1/SCons/Conftest.py
index d4662780c..e9702ff00 100644
--- a/scons/scons-local-2.3.0/SCons/Conftest.py
+++ b/scons/scons-local-2.3.1/SCons/Conftest.py
@@ -156,7 +156,7 @@ def CheckCC(context):
too, so that it can test against non working flags.
"""
- context.Display("Checking whether the C compiler works")
+ context.Display("Checking whether the C compiler works... ")
text = """
int main()
{
@@ -176,7 +176,7 @@ def CheckSHCC(context):
too, so that it can test against non working flags.
"""
- context.Display("Checking whether the (shared) C compiler works")
+ context.Display("Checking whether the (shared) C compiler works... ")
text = """
int foo()
{
@@ -196,7 +196,7 @@ def CheckCXX(context):
too, so that it can test against non working flags.
"""
- context.Display("Checking whether the C++ compiler works")
+ context.Display("Checking whether the C++ compiler works... ")
text = """
int main()
{
@@ -216,7 +216,7 @@ def CheckSHCXX(context):
too, so that it can test against non working flags.
"""
- context.Display("Checking whether the (shared) C++ compiler works")
+ context.Display("Checking whether the (shared) C++ compiler works... ")
text = """
int main()
{
diff --git a/scons/scons-local-2.3.0/SCons/Debug.py b/scons/scons-local-2.3.1/SCons/Debug.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Debug.py
rename to scons/scons-local-2.3.1/SCons/Debug.py
index 41b0ab6ee..08d757080 100644
--- a/scons/scons-local-2.3.0/SCons/Debug.py
+++ b/scons/scons-local-2.3.1/SCons/Debug.py
@@ -6,7 +6,7 @@ needed by most users.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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,13 +28,17 @@ needed by most users.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Debug.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Debug.py 2014/03/02 14:18:15 garyo"
import os
import sys
import time
import weakref
+# Global variable that gets set to 'True' by the Main script,
+# when the creation of class instances should get tracked.
+track_instances = False
+# List of currently tracked classes
tracked_classes = {}
def logInstanceCreation(instance, name=None):
@@ -109,14 +113,15 @@ else:
return res[4]
# returns caller's stack
-def caller_stack(*backlist):
+def caller_stack():
import traceback
- if not backlist:
- backlist = [0]
+ tb = traceback.extract_stack()
+ # strip itself and the caller from the output
+ tb = tb[:-2]
result = []
- for back in backlist:
- tb = traceback.extract_stack(limit=3+back)
- key = tb[0][:3]
+ for back in tb:
+ # (filename, line number, function name, text)
+ key = back[:3]
result.append('%s:%d(%s)' % func_shorten(key))
return result
diff --git a/scons/scons-local-2.3.0/SCons/Defaults.py b/scons/scons-local-2.3.1/SCons/Defaults.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Defaults.py
rename to scons/scons-local-2.3.1/SCons/Defaults.py
index 219190a9e..dd726f138 100644
--- a/scons/scons-local-2.3.0/SCons/Defaults.py
+++ b/scons/scons-local-2.3.1/SCons/Defaults.py
@@ -10,7 +10,7 @@ from distutils.msvccompiler.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Defaults.py 2014/03/02 14:18:15 garyo"
import os
diff --git a/scons/scons-local-2.3.0/SCons/Environment.py b/scons/scons-local-2.3.1/SCons/Environment.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Environment.py
rename to scons/scons-local-2.3.1/SCons/Environment.py
index 833f3ccb9..5644a30dd 100644
--- a/scons/scons-local-2.3.0/SCons/Environment.py
+++ b/scons/scons-local-2.3.1/SCons/Environment.py
@@ -10,7 +10,7 @@ Environment
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Environment.py 2014/03/02 14:18:15 garyo"
import copy
@@ -43,6 +43,7 @@ from collections import UserDict
import SCons.Action
import SCons.Builder
+import SCons.Debug
from SCons.Debug import logInstanceCreation
import SCons.Defaults
import SCons.Errors
@@ -370,7 +371,7 @@ class SubstitutionEnvironment(object):
def __init__(self, **kw):
"""Initialization of an underlying SubstitutionEnvironment class.
"""
- if __debug__: logInstanceCreation(self, 'Environment.SubstitutionEnvironment')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.SubstitutionEnvironment')
self.fs = SCons.Node.FS.get_default_fs()
self.ans = SCons.Node.Alias.default_ans
self.lookup_list = SCons.Node.arg2nodes_lookups
@@ -704,7 +705,7 @@ class SubstitutionEnvironment(object):
# -symbolic (linker global binding)
# -R dir (deprecated linker rpath)
# IBM compilers may also accept -qframeworkdir=foo
-
+
params = shlex.split(arg)
append_next_arg_to = None # for multi-word args
for arg in params:
@@ -794,7 +795,7 @@ class SubstitutionEnvironment(object):
append_next_arg_to = arg
else:
dict['CCFLAGS'].append(arg)
-
+
for arg in flags:
do_parse(arg)
return dict
@@ -858,7 +859,7 @@ class SubstitutionEnvironment(object):
# def MergeShellPaths(self, args, prepend=1):
# """
-# Merge the dict in args into the shell environment in env['ENV'].
+# Merge the dict in args into the shell environment in env['ENV'].
# Shell path elements are appended or prepended according to prepend.
# Uses Pre/AppendENVPath, so it always appends or prepends uniquely.
@@ -931,7 +932,7 @@ class Base(SubstitutionEnvironment):
initialize things in a very specific order that doesn't work
with the much simpler base class initialization.
"""
- if __debug__: logInstanceCreation(self, 'Environment.Base')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.Base')
self._memo = {}
self.fs = SCons.Node.FS.get_default_fs()
self.ans = SCons.Node.Alias.default_ans
@@ -961,14 +962,14 @@ class Base(SubstitutionEnvironment):
platform = SCons.Platform.Platform(platform)
self._dict['PLATFORM'] = str(platform)
platform(self)
-
+
self._dict['HOST_OS'] = self._dict.get('HOST_OS',None)
self._dict['HOST_ARCH'] = self._dict.get('HOST_ARCH',None)
-
+
# Now set defaults for TARGET_{OS|ARCH}
- self._dict['TARGET_OS'] = self._dict.get('HOST_OS',None)
- self._dict['TARGET_ARCH'] = self._dict.get('HOST_ARCH',None)
-
+ self._dict['TARGET_OS'] = self._dict.get('TARGET_OS',None)
+ self._dict['TARGET_ARCH'] = self._dict.get('TARGET_ARCH',None)
+
# Apply the passed-in and customizable variables to the
# environment before calling the tools, because they may use
@@ -1157,7 +1158,7 @@ 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]
@@ -1208,7 +1209,7 @@ class Base(SubstitutionEnvironment):
orig = orig.items()
orig += val
self._dict[key] = orig
- else:
+ else:
for v in val:
orig[v] = None
else:
@@ -1231,7 +1232,7 @@ class Base(SubstitutionEnvironment):
path = str(self.fs.Dir(path))
return path
- def AppendENVPath(self, name, newpath, envname = 'ENV',
+ def AppendENVPath(self, name, newpath, envname = 'ENV',
sep = os.pathsep, delete_existing=1):
"""Append path elements to the path 'name' in the 'ENV'
dictionary for this environment. Will only add any particular
@@ -1289,7 +1290,7 @@ class Base(SubstitutionEnvironment):
dk = dk.items()
elif SCons.Util.is_String(dk):
dk = [(dk,)]
- else:
+ else:
tmp = []
for i in dk:
if SCons.Util.is_List(i):
@@ -1334,7 +1335,7 @@ class Base(SubstitutionEnvironment):
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]
+ dk = [x for x in dk if x not in val]
self._dict[key] = dk + val
else:
# By elimination, val is not a list. Since dk is a
@@ -1381,7 +1382,7 @@ class Base(SubstitutionEnvironment):
builders = self._dict['BUILDERS']
except KeyError:
pass
-
+
clone = copy.copy(self)
# BUILDERS is not safe to do a simple copy
clone._dict = semi_deepcopy_dict(self._dict, ['BUILDERS'])
@@ -1409,12 +1410,12 @@ class Base(SubstitutionEnvironment):
apply_tools(clone, tools, toolpath)
# apply them again in case the tools overwrote them
- clone.Replace(**new)
+ clone.Replace(**new)
# Finally, apply any flags to be merged in
if parse_flags: clone.MergeFlags(parse_flags)
- if __debug__: logInstanceCreation(self, 'Environment.EnvironmentClone')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.EnvironmentClone')
return clone
def Copy(self, *args, **kw):
@@ -2086,6 +2087,14 @@ class Base(SubstitutionEnvironment):
t.set_precious()
return tlist
+ def Pseudo(self, *targets):
+ tlist = []
+ for t in targets:
+ tlist.extend(self.arg2nodes(t, self.fs.Entry))
+ for t in tlist:
+ t.set_pseudo()
+ return tlist
+
def Repository(self, *dirs, **kw):
dirs = self.arg2nodes(list(dirs), self.fs.Dir)
self.fs.Repository(*dirs, **kw)
@@ -2270,7 +2279,7 @@ class OverrideEnvironment(Base):
"""
def __init__(self, subject, overrides={}):
- if __debug__: logInstanceCreation(self, 'Environment.OverrideEnvironment')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.OverrideEnvironment')
self.__dict__['__subject'] = subject
self.__dict__['overrides'] = overrides
diff --git a/scons/scons-local-2.3.0/SCons/Errors.py b/scons/scons-local-2.3.1/SCons/Errors.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Errors.py
rename to scons/scons-local-2.3.1/SCons/Errors.py
index 41dac1957..bbdfc5703 100644
--- a/scons/scons-local-2.3.0/SCons/Errors.py
+++ b/scons/scons-local-2.3.1/SCons/Errors.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ and user errors in SCons.
"""
-__revision__ = "src/engine/SCons/Errors.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Errors.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Executor.py b/scons/scons-local-2.3.1/SCons/Executor.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Executor.py
rename to scons/scons-local-2.3.1/SCons/Executor.py
index 0bea6fb69..c9f64e470 100644
--- a/scons/scons-local-2.3.0/SCons/Executor.py
+++ b/scons/scons-local-2.3.1/SCons/Executor.py
@@ -6,7 +6,7 @@ Nodes.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,10 +27,11 @@ Nodes.
# 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/Executor.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Executor.py 2014/03/02 14:18:15 garyo"
import collections
+import SCons.Debug
from SCons.Debug import logInstanceCreation
import SCons.Errors
import SCons.Memoize
@@ -123,7 +124,7 @@ class Executor(object):
def __init__(self, action, env=None, overridelist=[{}],
targets=[], sources=[], builder_kw={}):
- if __debug__: logInstanceCreation(self, 'Executor.Executor')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Executor.Executor')
self.set_action_list(action)
self.pre_actions = []
self.post_actions = []
@@ -229,6 +230,8 @@ class Executor(object):
self.action_list = action
def get_action_list(self):
+ if self.action_list is None:
+ return []
return self.pre_actions + self.action_list + self.post_actions
def get_all_targets(self):
@@ -267,7 +270,8 @@ class Executor(object):
"""
result = SCons.Util.UniqueList([])
for target in self.get_all_targets():
- result.extend(target.prerequisites)
+ if target.prerequisites is not None:
+ result.extend(target.prerequisites)
return result
def get_action_side_effects(self):
@@ -570,12 +574,12 @@ class Null(object):
"""A null Executor, with a null build Environment, that does
nothing when the rest of the methods call it.
- This might be able to disapper when we refactor things to
+ This might be able to disappear when we refactor things to
disassociate Builders from Nodes entirely, so we're not
going to worry about unit tests for this--at least for now.
"""
def __init__(self, *args, **kw):
- if __debug__: logInstanceCreation(self, 'Executor.Null')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Executor.Null')
self.batches = [Batch(kw['targets'][:], [])]
def get_build_env(self):
return get_NullEnvironment()
@@ -625,7 +629,6 @@ class Null(object):
self._morph()
self.set_action_list(action)
-
# Local Variables:
# tab-width:4
# indent-tabs-mode:nil
diff --git a/scons/scons-local-2.3.0/SCons/Job.py b/scons/scons-local-2.3.1/SCons/Job.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Job.py
rename to scons/scons-local-2.3.1/SCons/Job.py
index 4e51b993a..43a8ae5c6 100644
--- a/scons/scons-local-2.3.0/SCons/Job.py
+++ b/scons/scons-local-2.3.1/SCons/Job.py
@@ -7,7 +7,7 @@ stop, and wait on jobs.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ stop, and wait on jobs.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Job.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Job.py 2014/03/02 14:18:15 garyo"
import SCons.compat
diff --git a/scons/scons-local-2.3.0/SCons/Memoize.py b/scons/scons-local-2.3.1/SCons/Memoize.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Memoize.py
rename to scons/scons-local-2.3.1/SCons/Memoize.py
index af84745e1..50dce3b76 100644
--- a/scons/scons-local-2.3.0/SCons/Memoize.py
+++ b/scons/scons-local-2.3.1/SCons/Memoize.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Memoize.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Memoize.py 2014/03/02 14:18:15 garyo"
__doc__ = """Memoizer
diff --git a/scons/scons-local-2.3.0/SCons/Node/Alias.py b/scons/scons-local-2.3.1/SCons/Node/Alias.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Node/Alias.py
rename to scons/scons-local-2.3.1/SCons/Node/Alias.py
index 02fe12120..0b8f9b0f1 100644
--- a/scons/scons-local-2.3.0/SCons/Node/Alias.py
+++ b/scons/scons-local-2.3.1/SCons/Node/Alias.py
@@ -8,7 +8,7 @@ This creates a hash of global Aliases (dummy targets).
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ This creates a hash of global Aliases (dummy targets).
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Node/Alias.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Node/Alias.py 2014/03/02 14:18:15 garyo"
import collections
diff --git a/scons/scons-local-2.3.0/SCons/Node/FS.py b/scons/scons-local-2.3.1/SCons/Node/FS.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Node/FS.py
rename to scons/scons-local-2.3.1/SCons/Node/FS.py
index a21561f2e..f54b0ab62 100644
--- a/scons/scons-local-2.3.0/SCons/Node/FS.py
+++ b/scons/scons-local-2.3.1/SCons/Node/FS.py
@@ -11,7 +11,7 @@ that can be used by scripts or modules looking for the canonical default.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ that can be used by scripts or modules looking for the canonical default.
# 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/Node/FS.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Node/FS.py 2014/03/02 14:18:15 garyo"
import fnmatch
import os
@@ -44,6 +44,7 @@ import time
import codecs
import SCons.Action
+import SCons.Debug
from SCons.Debug import logInstanceCreation
import SCons.Errors
import SCons.Memoize
@@ -581,7 +582,7 @@ class Base(SCons.Node.Node):
our relative and absolute paths, identify our parent
directory, and indicate that this node should use
signatures."""
- if __debug__: logInstanceCreation(self, 'Node.FS.Base')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Node.FS.Base')
SCons.Node.Node.__init__(self)
# Filenames and paths are probably reused and are intern'ed to
@@ -1111,7 +1112,7 @@ class FS(LocalFS):
The path argument must be a valid absolute path.
"""
- if __debug__: logInstanceCreation(self, 'Node.FS')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Node.FS')
self._memo = {}
@@ -1445,7 +1446,7 @@ class Dir(Base):
BuildInfo = DirBuildInfo
def __init__(self, name, directory, fs):
- if __debug__: logInstanceCreation(self, 'Node.FS.Dir')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Node.FS.Dir')
Base.__init__(self, name, directory, fs)
self._morph()
@@ -1841,7 +1842,7 @@ class Dir(Base):
for entry in map(_my_normcase, entries):
d[entry] = True
self.on_disk_entries = d
- if sys.platform == 'win32':
+ if sys.platform == 'win32' or sys.platform == 'cygwin':
name = _my_normcase(name)
result = d.get(name)
if result is None:
@@ -2113,7 +2114,7 @@ class RootDir(Dir):
this directory.
"""
def __init__(self, drive, fs):
- if __debug__: logInstanceCreation(self, 'Node.FS.RootDir')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Node.FS.RootDir')
# We're going to be our own parent directory (".." entry and .dir
# attribute) so we have to set up some values so Base.__init__()
# won't gag won't it calls some of our methods.
@@ -2361,7 +2362,7 @@ class File(Base):
"Directory %s found where file expected.")
def __init__(self, name, directory, fs):
- if __debug__: logInstanceCreation(self, 'Node.FS.File')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Node.FS.File')
Base.__init__(self, name, directory, fs)
self._morph()
@@ -2397,6 +2398,8 @@ class File(Base):
self.scanner_paths = {}
if not hasattr(self, '_local'):
self._local = 0
+ if not hasattr(self, 'released_target_info'):
+ self.released_target_info = False
# If there was already a Builder set on this entry, then
# we need to make sure we call the target-decider function,
@@ -2724,7 +2727,7 @@ class File(Base):
return self.get_build_env().get_CacheDir().retrieve(self)
def visited(self):
- if self.exists():
+ if self.exists() and self.executor is not None:
self.get_build_env().get_CacheDir().push_if_forced(self)
ninfo = self.get_ninfo()
@@ -2746,6 +2749,58 @@ class File(Base):
self.store_info()
+ def release_target_info(self):
+ """Called just after this node has been marked
+ up-to-date or was built completely.
+
+ This is where we try to release as many target node infos
+ as possible for clean builds and update runs, in order
+ to minimize the overall memory consumption.
+
+ We'd like to remove a lot more attributes like self.sources
+ and self.sources_set, but they might get used
+ in a next build step. For example, during configuration
+ the source files for a built *.o file are used to figure out
+ which linker to use for the resulting Program (gcc vs. g++)!
+ That's why we check for the 'keep_targetinfo' attribute,
+ config Nodes and the Interactive mode just don't allow
+ an early release of most variables.
+
+ In the same manner, we can't simply remove the self.attributes
+ here. The smart linking relies on the shared flag, and some
+ parts of the java Tool use it to transport information
+ about nodes...
+
+ @see: built() and Node.release_target_info()
+ """
+ if (self.released_target_info or SCons.Node.interactive):
+ return
+
+ if not hasattr(self.attributes, 'keep_targetinfo'):
+ # Cache some required values, before releasing
+ # stuff like env, executor and builder...
+ self.changed(allowcache=True)
+ self.get_contents_sig()
+ self.get_build_env()
+ # Now purge unneeded stuff to free memory...
+ self.executor = None
+ self._memo.pop('rfile', None)
+ self.prerequisites = None
+ # Cleanup lists, but only if they're empty
+ if not len(self.ignore_set):
+ self.ignore_set = None
+ if not len(self.implicit_set):
+ self.implicit_set = None
+ if not len(self.depends_set):
+ self.depends_set = None
+ if not len(self.ignore):
+ self.ignore = None
+ if not len(self.depends):
+ self.depends = None
+ # Mark this node as done, we only have to release
+ # the memory once...
+ self.released_target_info = True
+
def find_src_builder(self):
if self.rexists():
return None
@@ -2956,6 +3011,52 @@ class File(Base):
SCons.Node.Node.builder_set(self, builder)
self.changed_since_last_build = self.decide_target
+ def built(self):
+ """Called just after this File node is successfully built.
+
+ Just like for 'release_target_info' we try to release
+ some more target node attributes in order to minimize the
+ overall memory consumption.
+
+ @see: release_target_info
+ """
+
+ SCons.Node.Node.built(self)
+
+ if (not SCons.Node.interactive and
+ not hasattr(self.attributes, 'keep_targetinfo')):
+ # Ensure that the build infos get computed and cached...
+ self.store_info()
+ # ... then release some more variables.
+ self._specific_sources = False
+ self.labspath = None
+ self._save_str()
+ self.cwd = None
+
+ self.scanner_paths = None
+
+ def changed(self, node=None, allowcache=False):
+ """
+ Returns if the node is up-to-date with respect to the BuildInfo
+ stored last time it was built.
+
+ For File nodes this is basically a wrapper around Node.changed(),
+ but we allow the return value to get cached after the reference
+ to the Executor got released in release_target_info().
+
+ @see: Node.changed()
+ """
+ if node is None:
+ try:
+ return self._memo['changed']
+ except KeyError:
+ pass
+
+ has_changed = SCons.Node.Node.changed(self, node)
+ if allowcache:
+ self._memo['changed'] = has_changed
+ return has_changed
+
def changed_content(self, target, prev_ni):
cur_csig = self.get_csig()
try:
@@ -3089,25 +3190,50 @@ class File(Base):
self.cachedir_csig = self.get_csig()
return self.cachedir_csig
+ def get_contents_sig(self):
+ """
+ A helper method for get_cachedir_bsig.
+
+ It computes and returns the signature for this
+ node's contents.
+ """
+
+ try:
+ return self.contentsig
+ except AttributeError:
+ pass
+
+ executor = self.get_executor()
+
+ result = self.contentsig = SCons.Util.MD5signature(executor.get_contents())
+ return result
+
def get_cachedir_bsig(self):
+ """
+ Return the signature for a cached file, including
+ its children.
+
+ It adds the path of the cached file to the cache signature,
+ because multiple targets built by the same action will all
+ have the same build signature, and we have to differentiate
+ them somehow.
+ """
try:
return self.cachesig
except AttributeError:
pass
-
- # Add the path to the cache signature, because multiple
- # targets built by the same action will all have the same
- # build signature, and we have to differentiate them somehow.
+
+ # Collect signatures for all children
children = self.children()
- executor = self.get_executor()
- # sigs = [n.get_cachedir_csig() for n in children]
sigs = [n.get_cachedir_csig() for n in children]
- sigs.append(SCons.Util.MD5signature(executor.get_contents()))
+ # Append this node's signature...
+ sigs.append(self.get_contents_sig())
+ # ...and it's path
sigs.append(self.path)
+ # Merge this all into a single signature
result = self.cachesig = SCons.Util.MD5collect(sigs)
return result
-
default_fs = None
def get_default_fs():
diff --git a/scons/scons-local-2.3.0/SCons/Node/Python.py b/scons/scons-local-2.3.1/SCons/Node/Python.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Node/Python.py
rename to scons/scons-local-2.3.1/SCons/Node/Python.py
index 153e32d0b..8936b6d3d 100644
--- a/scons/scons-local-2.3.0/SCons/Node/Python.py
+++ b/scons/scons-local-2.3.1/SCons/Node/Python.py
@@ -5,7 +5,7 @@ Python nodes.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ Python nodes.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Node/Python.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Node/Python.py 2014/03/02 14:18:15 garyo"
import SCons.Node
diff --git a/scons/scons-local-2.3.0/SCons/Node/__init__.py b/scons/scons-local-2.3.1/SCons/Node/__init__.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Node/__init__.py
rename to scons/scons-local-2.3.1/SCons/Node/__init__.py
index ece4a5a44..e6a300127 100644
--- a/scons/scons-local-2.3.0/SCons/Node/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Node/__init__.py
@@ -20,7 +20,7 @@ be able to depend on any other type of "thing."
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -41,12 +41,13 @@ be able to depend on any other type of "thing."
# 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/Node/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Node/__init__.py 2014/03/02 14:18:15 garyo"
import collections
import copy
from itertools import chain
+import SCons.Debug
from SCons.Debug import logInstanceCreation
import SCons.Executor
import SCons.Memoize
@@ -57,6 +58,10 @@ from SCons.Debug import Trace
def classname(obj):
return str(obj.__class__).split('.')[-1]
+# Set to false if we're doing a dry run. There's more than one of these
+# little treats
+do_store_info = True
+
# Node states
#
# These are in "priority" order, so that the maximum value for any
@@ -95,6 +100,11 @@ def do_nothing(node): pass
Annotate = do_nothing
+# Gets set to 'True' if we're running in interactive mode. Is
+# currently used to release parts of a target's info during
+# clean builds and update runs (see release_target_info).
+interactive = False
+
# Classes for signature info for Nodes.
class NodeInfoBase(object):
@@ -183,7 +193,7 @@ class Node(object):
pass
def __init__(self):
- if __debug__: logInstanceCreation(self, 'Node.Node')
+ if SCons.Debug.track_instances: logInstanceCreation(self, 'Node.Node')
# Note that we no longer explicitly initialize a self.builder
# attribute to None here. That's because the self.builder
# attribute may be created on-the-fly later by a subclass (the
@@ -204,7 +214,7 @@ class Node(object):
self.depends_set = set()
self.ignore = [] # dependencies to ignore
self.ignore_set = set()
- self.prerequisites = SCons.Util.UniqueList()
+ self.prerequisites = None
self.implicit = None # implicit (scanned) dependencies (None means not scanned yet)
self.waiting_parents = set()
self.waiting_s_e = set()
@@ -214,6 +224,7 @@ class Node(object):
self.env = None
self.state = no_state
self.precious = None
+ self.pseudo = False
self.noclean = 0
self.nocache = 0
self.cached = 0 # is this node pulled from cache?
@@ -286,7 +297,8 @@ class Node(object):
except AttributeError:
pass
else:
- executor.cleanup()
+ if executor is not None:
+ executor.cleanup()
def reset_executor(self):
"Remove cached executor; forces recompute when needed."
@@ -346,10 +358,11 @@ class Node(object):
methods should call this base class method to get the child
check and the BuildInfo structure.
"""
- for d in self.depends:
- if d.missing():
- msg = "Explicit dependency `%s' not found, needed by target `%s'."
- raise SCons.Errors.StopError(msg % (d, self))
+ if self.depends is not None:
+ for d in self.depends:
+ if d.missing():
+ msg = "Explicit dependency `%s' not found, needed by target `%s'."
+ raise SCons.Errors.StopError(msg % (d, self))
if self.implicit is not None:
for i in self.implicit:
if i.missing():
@@ -385,6 +398,13 @@ class Node(object):
self.clear()
+ if self.pseudo:
+ if self.exists():
+ raise SCons.Errors.UserError("Pseudo target " + str(self) + " must not exist")
+ else:
+ if not self.exists() and do_store_info:
+ SCons.Warnings.warn(SCons.Warnings.TargetNotBuiltWarning,
+ "Cannot find target " + str(self) + " after building")
self.ninfo.update(self)
def visited(self):
@@ -400,6 +420,23 @@ class Node(object):
self.ninfo.update(self)
self.store_info()
+ def release_target_info(self):
+ """Called just after this node has been marked
+ up-to-date or was built completely.
+
+ This is where we try to release as many target node infos
+ as possible for clean builds and update runs, in order
+ to minimize the overall memory consumption.
+
+ By purging attributes that aren't needed any longer after
+ a Node (=File) got built, we don't have to care that much how
+ many KBytes a Node actually requires...as long as we free
+ the memory shortly afterwards.
+
+ @see: built() and File.release_target_info()
+ """
+ pass
+
#
#
#
@@ -501,7 +538,7 @@ class Node(object):
def is_derived(self):
"""
- Returns true iff this node is derived (i.e. built).
+ Returns true if this node is derived (i.e. built).
This should return true only for nodes whose path should be in
the variant directory when duplicate=0 and should contribute their build
@@ -788,6 +825,10 @@ class Node(object):
"""Set the Node's precious value."""
self.precious = precious
+ def set_pseudo(self, pseudo = True):
+ """Set the Node's precious value."""
+ self.pseudo = pseudo
+
def set_noclean(self, noclean = 1):
"""Set the Node's noclean value."""
# Make sure noclean is an integer so the --debug=stree
@@ -837,6 +878,8 @@ class Node(object):
def add_prerequisite(self, prerequisite):
"""Adds prerequisites"""
+ if self.prerequisites is None:
+ self.prerequisites = SCons.Util.UniqueList()
self.prerequisites.extend(prerequisite)
self._children_reset()
@@ -924,20 +967,14 @@ class Node(object):
# dictionary patterns I found all ended up using "not in"
# internally anyway...)
if self.ignore_set:
- if self.implicit is None:
- iter = chain(self.sources,self.depends)
- else:
- iter = chain(self.sources, self.depends, self.implicit)
+ iter = chain.from_iterable(filter(None, [self.sources, self.depends, self.implicit]))
children = []
for i in iter:
if i not in self.ignore_set:
children.append(i)
else:
- if self.implicit is None:
- children = self.sources + self.depends
- else:
- children = self.sources + self.depends + self.implicit
+ children = self.all_children(scan=0)
self._memo['children_get'] = children
return children
@@ -964,10 +1001,7 @@ class Node(object):
# using dictionary keys, lose the order, and the only ordered
# dictionary patterns I found all ended up using "not in"
# internally anyway...)
- if self.implicit is None:
- return self.sources + self.depends
- else:
- return self.sources + self.depends + self.implicit
+ return list(chain.from_iterable(filter(None, [self.sources, self.depends, self.implicit])))
def children(self, scan=1):
"""Return a list of the node's direct children, minus those
@@ -1015,7 +1049,7 @@ class Node(object):
def Decider(self, function):
SCons.Util.AddMethod(self, function, 'changed_since_last_build')
- def changed(self, node=None):
+ def changed(self, node=None, allowcache=False):
"""
Returns if the node is up-to-date with respect to the BuildInfo
stored last time it was built. The default behavior is to compare
@@ -1028,6 +1062,15 @@ class Node(object):
any difference, but we now rely on checking every dependency
to make sure that any necessary Node information (for example,
the content signature of an #included .h file) is updated.
+
+ The allowcache option was added for supporting the early
+ release of the executor/builder structures, right after
+ a File target was built. When set to true, the return
+ value of this changed method gets cached for File nodes.
+ Like this, the executor isn't needed any longer for subsequent
+ calls to changed().
+
+ @see: FS.File.changed(), FS.File.release_target_info()
"""
t = 0
if t: Trace('changed(%s [%s], %s)' % (self, classname(self), node))
@@ -1103,17 +1146,18 @@ class Node(object):
Return a text representation, suitable for displaying to the
user, of the include tree for the sources of this node.
"""
- if self.is_derived() and self.env:
+ if self.is_derived():
env = self.get_build_env()
- for s in self.sources:
- scanner = self.get_source_scanner(s)
- if scanner:
- path = self.get_build_scanner_path(scanner)
- else:
- path = None
- def f(node, env=env, scanner=scanner, path=path):
- return node.get_found_includes(env, scanner, path)
- return SCons.Util.render_tree(s, f, 1)
+ if env:
+ for s in self.sources:
+ scanner = self.get_source_scanner(s)
+ if scanner:
+ path = self.get_build_scanner_path(scanner)
+ else:
+ path = None
+ def f(node, env=env, scanner=scanner, path=path):
+ return node.get_found_includes(env, scanner, path)
+ return SCons.Util.render_tree(s, f, 1)
else:
return None
diff --git a/scons/scons-local-2.3.0/SCons/Options/BoolOption.py b/scons/scons-local-2.3.1/SCons/Options/BoolOption.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Options/BoolOption.py
rename to scons/scons-local-2.3.1/SCons/Options/BoolOption.py
index f1569a552..cc059445e 100644
--- a/scons/scons-local-2.3.0/SCons/Options/BoolOption.py
+++ b/scons/scons-local-2.3.1/SCons/Options/BoolOption.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Options/BoolOption.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Options/BoolOption.py 2014/03/02 14:18:15 garyo"
__doc__ = """Place-holder for the old SCons.Options module hierarchy
diff --git a/scons/scons-local-2.3.0/SCons/Options/EnumOption.py b/scons/scons-local-2.3.1/SCons/Options/EnumOption.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Options/EnumOption.py
rename to scons/scons-local-2.3.1/SCons/Options/EnumOption.py
index 9207e718a..5ff79ba3a 100644
--- a/scons/scons-local-2.3.0/SCons/Options/EnumOption.py
+++ b/scons/scons-local-2.3.1/SCons/Options/EnumOption.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Options/EnumOption.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Options/EnumOption.py 2014/03/02 14:18:15 garyo"
__doc__ = """Place-holder for the old SCons.Options module hierarchy
diff --git a/scons/scons-local-2.3.0/SCons/Options/ListOption.py b/scons/scons-local-2.3.1/SCons/Options/ListOption.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Options/ListOption.py
rename to scons/scons-local-2.3.1/SCons/Options/ListOption.py
index cbf0bd98c..190dff21d 100644
--- a/scons/scons-local-2.3.0/SCons/Options/ListOption.py
+++ b/scons/scons-local-2.3.1/SCons/Options/ListOption.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Options/ListOption.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Options/ListOption.py 2014/03/02 14:18:15 garyo"
__doc__ = """Place-holder for the old SCons.Options module hierarchy
diff --git a/scons/scons-local-2.3.0/SCons/Options/PackageOption.py b/scons/scons-local-2.3.1/SCons/Options/PackageOption.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Options/PackageOption.py
rename to scons/scons-local-2.3.1/SCons/Options/PackageOption.py
index 2b27931d5..254b491ff 100644
--- a/scons/scons-local-2.3.0/SCons/Options/PackageOption.py
+++ b/scons/scons-local-2.3.1/SCons/Options/PackageOption.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Options/PackageOption.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Options/PackageOption.py 2014/03/02 14:18:15 garyo"
__doc__ = """Place-holder for the old SCons.Options module hierarchy
diff --git a/scons/scons-local-2.3.0/SCons/Options/PathOption.py b/scons/scons-local-2.3.1/SCons/Options/PathOption.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Options/PathOption.py
rename to scons/scons-local-2.3.1/SCons/Options/PathOption.py
index 56475adb2..bdde473c9 100644
--- a/scons/scons-local-2.3.0/SCons/Options/PathOption.py
+++ b/scons/scons-local-2.3.1/SCons/Options/PathOption.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Options/PathOption.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Options/PathOption.py 2014/03/02 14:18:15 garyo"
__doc__ = """Place-holder for the old SCons.Options module hierarchy
diff --git a/scons/scons-local-2.3.0/SCons/Options/__init__.py b/scons/scons-local-2.3.1/SCons/Options/__init__.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Options/__init__.py
rename to scons/scons-local-2.3.1/SCons/Options/__init__.py
index 0004b8f8f..e704de0d3 100644
--- a/scons/scons-local-2.3.0/SCons/Options/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Options/__init__.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Options/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Options/__init__.py 2014/03/02 14:18:15 garyo"
__doc__ = """Place-holder for the old SCons.Options module hierarchy
diff --git a/scons/scons-local-2.3.0/SCons/PathList.py b/scons/scons-local-2.3.1/SCons/PathList.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/PathList.py
rename to scons/scons-local-2.3.1/SCons/PathList.py
index 1129d1ed1..301c72f58 100644
--- a/scons/scons-local-2.3.0/SCons/PathList.py
+++ b/scons/scons-local-2.3.1/SCons/PathList.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/PathList.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/PathList.py 2014/03/02 14:18:15 garyo"
__doc__ = """SCons.PathList
diff --git a/scons/scons-local-2.3.0/SCons/Platform/__init__.py b/scons/scons-local-2.3.1/SCons/Platform/__init__.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Platform/__init__.py
rename to scons/scons-local-2.3.1/SCons/Platform/__init__.py
index 5a1d43741..25ea93e72 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/__init__.py
@@ -20,7 +20,7 @@ their own platform definition.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -42,7 +42,7 @@ their own platform definition.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/__init__.py 2014/03/02 14:18:15 garyo"
import SCons.compat
diff --git a/scons/scons-local-2.3.0/SCons/Platform/aix.py b/scons/scons-local-2.3.1/SCons/Platform/aix.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Platform/aix.py
rename to scons/scons-local-2.3.1/SCons/Platform/aix.py
index 70dce56be..98d4d8f93 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/aix.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/aix.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/aix.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/aix.py 2014/03/02 14:18:15 garyo"
import os
diff --git a/scons/scons-local-2.3.0/SCons/Platform/cygwin.py b/scons/scons-local-2.3.1/SCons/Platform/cygwin.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Platform/cygwin.py
rename to scons/scons-local-2.3.1/SCons/Platform/cygwin.py
index 92efdf638..7429407a3 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/cygwin.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/cygwin.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/cygwin.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/cygwin.py 2014/03/02 14:18:15 garyo"
import posix
from SCons.Platform import TempFileMunge
diff --git a/scons/scons-local-2.3.0/SCons/Platform/darwin.py b/scons/scons-local-2.3.1/SCons/Platform/darwin.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Platform/darwin.py
rename to scons/scons-local-2.3.1/SCons/Platform/darwin.py
index f1ba6be93..33078396e 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/darwin.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/darwin.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/darwin.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/darwin.py 2014/03/02 14:18:15 garyo"
import posix
import os
diff --git a/scons/scons-local-2.3.0/SCons/Platform/hpux.py b/scons/scons-local-2.3.1/SCons/Platform/hpux.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Platform/hpux.py
rename to scons/scons-local-2.3.1/SCons/Platform/hpux.py
index 232baf43a..5c003cafb 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/hpux.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/hpux.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/hpux.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/hpux.py 2014/03/02 14:18:15 garyo"
import posix
diff --git a/scons/scons-local-2.3.0/SCons/Platform/irix.py b/scons/scons-local-2.3.1/SCons/Platform/irix.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Platform/irix.py
rename to scons/scons-local-2.3.1/SCons/Platform/irix.py
index f4bc6f8ce..abb2a58be 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/irix.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/irix.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/irix.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/irix.py 2014/03/02 14:18:15 garyo"
import posix
diff --git a/scons/scons-local-2.3.0/SCons/Platform/os2.py b/scons/scons-local-2.3.1/SCons/Platform/os2.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Platform/os2.py
rename to scons/scons-local-2.3.1/SCons/Platform/os2.py
index 1409711e9..83cd7ef0a 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/os2.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/os2.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/os2.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/os2.py 2014/03/02 14:18:15 garyo"
import win32
def generate(env):
diff --git a/scons/scons-local-2.3.1/SCons/Platform/posix.py b/scons/scons-local-2.3.1/SCons/Platform/posix.py
new file mode 100644
index 000000000..5deb2d00b
--- /dev/null
+++ b/scons/scons-local-2.3.1/SCons/Platform/posix.py
@@ -0,0 +1,120 @@
+"""SCons.Platform.posix
+
+Platform-specific initialization for POSIX (Linux, UNIX, etc.) systems.
+
+There normally shouldn't be any need to import this module directly. It
+will usually be imported through the generic SCons.Platform.Platform()
+selection method.
+"""
+
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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/Platform/posix.py 2014/03/02 14:18:15 garyo"
+
+import errno
+import os
+import os.path
+import subprocess
+import sys
+import select
+
+import SCons.Util
+from SCons.Platform import TempFileMunge
+
+exitvalmap = {
+ 2 : 127,
+ 13 : 126,
+}
+
+def escape(arg):
+ "escape shell special characters"
+ slash = '\\'
+ special = '"$()'
+
+ arg = arg.replace(slash, slash+slash)
+ for c in special:
+ arg = arg.replace(c, slash+c)
+
+ return '"' + arg + '"'
+
+def exec_subprocess(l, env):
+ proc = subprocess.Popen(l, env = env, close_fds = True)
+ return proc.wait()
+
+def subprocess_spawn(sh, escape, cmd, args, env):
+ return exec_subprocess([sh, '-c', ' '.join(args)], env)
+
+def exec_popen3(l, env, stdout, stderr):
+ proc = subprocess.Popen(l, env = env, close_fds = True,
+ stdout = stdout,
+ stderr = stderr)
+ return proc.wait()
+
+def piped_env_spawn(sh, escape, cmd, args, env, stdout, stderr):
+ # spawn using Popen3 combined with the env command
+ # the command name and the command's stdout is written to stdout
+ # the command's stderr is written to stderr
+ return exec_popen3([sh, '-c', ' '.join(args)],
+ env, stdout, stderr)
+
+
+def generate(env):
+ # Bearing in mind we have python 2.4 as a baseline, we can just do this:
+ spawn = subprocess_spawn
+ pspawn = piped_env_spawn
+ # Note that this means that 'escape' is no longer used
+
+ if 'ENV' not in env:
+ env['ENV'] = {}
+ env['ENV']['PATH'] = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
+ env['OBJPREFIX'] = ''
+ env['OBJSUFFIX'] = '.o'
+ env['SHOBJPREFIX'] = '$OBJPREFIX'
+ env['SHOBJSUFFIX'] = '$OBJSUFFIX'
+ env['PROGPREFIX'] = ''
+ env['PROGSUFFIX'] = ''
+ env['LIBPREFIX'] = 'lib'
+ env['LIBSUFFIX'] = '.a'
+ env['SHLIBPREFIX'] = '$LIBPREFIX'
+ env['SHLIBSUFFIX'] = '.so'
+ env['LIBPREFIXES'] = [ '$LIBPREFIX' ]
+ env['LIBSUFFIXES'] = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ]
+ env['PSPAWN'] = pspawn
+ env['SPAWN'] = spawn
+ env['SHELL'] = 'sh'
+ env['ESCAPE'] = escape
+ env['TEMPFILE'] = TempFileMunge
+ env['TEMPFILEPREFIX'] = '@'
+ #Based on LINUX: ARG_MAX=ARG_MAX=131072 - 3000 for environment expansion
+ #Note: specific platforms might rise or lower this value
+ env['MAXLINELENGTH'] = 128072
+
+ # This platform supports RPATH specifications.
+ env['__RPATH'] = '$_RPATH'
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/scons/scons-local-2.3.0/SCons/Platform/sunos.py b/scons/scons-local-2.3.1/SCons/Platform/sunos.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Platform/sunos.py
rename to scons/scons-local-2.3.1/SCons/Platform/sunos.py
index 23e876c52..911b97f34 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/sunos.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/sunos.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/sunos.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/sunos.py 2014/03/02 14:18:15 garyo"
import posix
diff --git a/scons/scons-local-2.3.0/SCons/Platform/win32.py b/scons/scons-local-2.3.1/SCons/Platform/win32.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Platform/win32.py
rename to scons/scons-local-2.3.1/SCons/Platform/win32.py
index 3def1f834..b7b65e11e 100644
--- a/scons/scons-local-2.3.0/SCons/Platform/win32.py
+++ b/scons/scons-local-2.3.1/SCons/Platform/win32.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/win32.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Platform/win32.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/SConf.py b/scons/scons-local-2.3.1/SCons/SConf.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/SConf.py
rename to scons/scons-local-2.3.1/SCons/SConf.py
index ae51776b6..63f04c392 100644
--- a/scons/scons-local-2.3.0/SCons/SConf.py
+++ b/scons/scons-local-2.3.1/SCons/SConf.py
@@ -4,7 +4,7 @@ Autoconf-like configuration support.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ Autoconf-like configuration support.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/SConf.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/SConf.py 2014/03/02 14:18:15 garyo"
import SCons.compat
@@ -483,6 +483,9 @@ class SConfBase(object):
# so we really control how it gets written.
for n in nodes:
n.store_info = n.do_not_store_info
+ if not hasattr(n, 'attributes'):
+ n.attributes = SCons.Node.Node.Attrs()
+ n.attributes.keep_targetinfo = 1
ret = 1
@@ -776,19 +779,16 @@ class CheckContext(object):
self.did_show_result = 0
def Result(self, res):
- """Inform about the result of the test. res may be an integer or a
- string. In case of an integer, the written text will be 'yes' or 'no'.
+ """Inform about the result of the test. If res is not a string, displays
+ 'yes' or 'no' depending on whether res is evaluated as true or false.
The result is only displayed when self.did_show_result is not set.
"""
- if isinstance(res, (int, bool)):
- if res:
- text = "yes"
- else:
- text = "no"
- elif isinstance(res, str):
+ if isinstance(res, str):
text = res
+ elif res:
+ text = "yes"
else:
- raise TypeError("Expected string, int or bool, got " + str(type(res)))
+ text = "no"
if self.did_show_result == 0:
# Didn't show result yet, do it now.
diff --git a/scons/scons-local-2.3.0/SCons/SConsign.py b/scons/scons-local-2.3.1/SCons/SConsign.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/SConsign.py
rename to scons/scons-local-2.3.1/SCons/SConsign.py
index a11f4e480..a0061e877 100644
--- a/scons/scons-local-2.3.0/SCons/SConsign.py
+++ b/scons/scons-local-2.3.1/SCons/SConsign.py
@@ -5,7 +5,7 @@ Writing and reading information to the .sconsign file or files.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ Writing and reading information to the .sconsign file or files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/SConsign.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/SConsign.py 2014/03/02 14:18:15 garyo"
import SCons.compat
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/C.py b/scons/scons-local-2.3.1/SCons/Scanner/C.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Scanner/C.py
rename to scons/scons-local-2.3.1/SCons/Scanner/C.py
index 0b664a008..fedfe236a 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/C.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/C.py
@@ -5,7 +5,7 @@ This module implements the depenency scanner for C/C++ code.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ This module implements the depenency scanner for C/C++ code.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/C.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/C.py 2014/03/02 14:18:15 garyo"
import SCons.Node.FS
import SCons.Scanner
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/D.py b/scons/scons-local-2.3.1/SCons/Scanner/D.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Scanner/D.py
rename to scons/scons-local-2.3.1/SCons/Scanner/D.py
index 18b530f3a..76762b814 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/D.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/D.py
@@ -8,7 +8,7 @@ Coded by Andy Friesen
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ Coded by Andy Friesen
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/D.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/D.py 2014/03/02 14:18:15 garyo"
import re
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/Dir.py b/scons/scons-local-2.3.1/SCons/Scanner/Dir.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Scanner/Dir.py
rename to scons/scons-local-2.3.1/SCons/Scanner/Dir.py
index f508a6fe0..3c3f22725 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/Dir.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/Dir.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -20,7 +20,7 @@
# 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/Scanner/Dir.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/Dir.py 2014/03/02 14:18:15 garyo"
import SCons.Node.FS
import SCons.Scanner
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/Fortran.py b/scons/scons-local-2.3.1/SCons/Scanner/Fortran.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Scanner/Fortran.py
rename to scons/scons-local-2.3.1/SCons/Scanner/Fortran.py
index 390e95172..858c89ab6 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/Fortran.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/Fortran.py
@@ -5,7 +5,7 @@ This module implements the dependency scanner for Fortran code.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ This module implements the dependency scanner for Fortran code.
# 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/Scanner/Fortran.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/Fortran.py 2014/03/02 14:18:15 garyo"
import re
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/IDL.py b/scons/scons-local-2.3.1/SCons/Scanner/IDL.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Scanner/IDL.py
rename to scons/scons-local-2.3.1/SCons/Scanner/IDL.py
index 13a0226b9..d2710561b 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/IDL.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/IDL.py
@@ -6,7 +6,7 @@ Definition Language) files.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ Definition Language) files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/IDL.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/IDL.py 2014/03/02 14:18:15 garyo"
import SCons.Node.FS
import SCons.Scanner
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/LaTeX.py b/scons/scons-local-2.3.1/SCons/Scanner/LaTeX.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Scanner/LaTeX.py
rename to scons/scons-local-2.3.1/SCons/Scanner/LaTeX.py
index c61688bc3..21c9ba171 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/LaTeX.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/LaTeX.py
@@ -5,7 +5,7 @@ This module implements the dependency scanner for LaTeX code.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ This module implements the dependency scanner for LaTeX code.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/LaTeX.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/LaTeX.py 2014/03/02 14:18:15 garyo"
import os.path
import re
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/Prog.py b/scons/scons-local-2.3.1/SCons/Scanner/Prog.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Scanner/Prog.py
rename to scons/scons-local-2.3.1/SCons/Scanner/Prog.py
index d7e19d36d..65c950329 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/Prog.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/Prog.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Scanner/Prog.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/Prog.py 2014/03/02 14:18:15 garyo"
import SCons.Node
import SCons.Node.FS
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/RC.py b/scons/scons-local-2.3.1/SCons/Scanner/RC.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Scanner/RC.py
rename to scons/scons-local-2.3.1/SCons/Scanner/RC.py
index 3fa3e6757..4b473eb72 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/RC.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/RC.py
@@ -6,7 +6,7 @@ Definition Language) files.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ Definition Language) files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/RC.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/RC.py 2014/03/02 14:18:15 garyo"
import SCons.Node.FS
import SCons.Scanner
diff --git a/scons/scons-local-2.3.0/SCons/Scanner/__init__.py b/scons/scons-local-2.3.1/SCons/Scanner/__init__.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Scanner/__init__.py
rename to scons/scons-local-2.3.1/SCons/Scanner/__init__.py
index b7b3197a4..bfd25fdd3 100644
--- a/scons/scons-local-2.3.0/SCons/Scanner/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Scanner/__init__.py
@@ -5,7 +5,7 @@ The Scanner package for the SCons software construction utility.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ The Scanner package for the SCons software construction utility.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Scanner/__init__.py 2014/03/02 14:18:15 garyo"
import re
diff --git a/scons/scons-local-2.3.0/SCons/Script/Interactive.py b/scons/scons-local-2.3.1/SCons/Script/Interactive.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Script/Interactive.py
rename to scons/scons-local-2.3.1/SCons/Script/Interactive.py
index b9a2e1e7c..1bc4fc8c6 100644
--- a/scons/scons-local-2.3.0/SCons/Script/Interactive.py
+++ b/scons/scons-local-2.3.1/SCons/Script/Interactive.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -20,7 +20,7 @@
# 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/Script/Interactive.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Script/Interactive.py 2014/03/02 14:18:15 garyo"
__doc__ = """
SCons interactive mode
diff --git a/scons/scons-local-2.3.0/SCons/Script/Main.py b/scons/scons-local-2.3.1/SCons/Script/Main.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Script/Main.py
rename to scons/scons-local-2.3.1/SCons/Script/Main.py
index 3f1b407aa..164c61d03 100644
--- a/scons/scons-local-2.3.0/SCons/Script/Main.py
+++ b/scons/scons-local-2.3.1/SCons/Script/Main.py
@@ -13,7 +13,7 @@ it goes here.
unsupported_python_version = (2, 3, 0)
deprecated_python_version = (2, 7, 0)
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -34,7 +34,7 @@ deprecated_python_version = (2, 7, 0)
# 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/Script/Main.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Script/Main.py 2014/03/02 14:18:15 garyo"
import SCons.compat
@@ -79,7 +79,12 @@ def fetch_win32_parallel_msg():
import SCons.Platform.win32
return SCons.Platform.win32.parallel_msg
-#
+def revert_io():
+ # This call is added to revert stderr and stdout to the original
+ # ones just in case some build rule or something else in the system
+ # has redirected them elsewhere.
+ sys.stderr = sys.__stderr__
+ sys.stdout = sys.__stdout__
class SConsPrintHelpException(Exception):
pass
@@ -272,6 +277,9 @@ class BuildTask(SCons.Taskmaster.OutOfDateTask):
(EnvironmentError, SCons.Errors.StopError,
SCons.Errors.UserError))):
type, value, trace = buildError.exc_info
+ if tb and print_stacktrace:
+ sys.stderr.write("scons: internal stack trace:\n")
+ traceback.print_tb(tb, file=sys.stderr)
traceback.print_exception(type, value, trace)
elif tb and print_stacktrace:
sys.stderr.write("scons: internal stack trace:\n")
@@ -622,7 +630,7 @@ def _set_debug_values(options):
debug_values = options.debug
if "count" in debug_values:
- # All of the object counts are within "if __debug__:" blocks,
+ # All of the object counts are within "if track_instances:" blocks,
# which get stripped when running optimized (with python -O or
# from compiled *.pyo files). Provide a warning if __debug__ is
# stripped, so it doesn't just look like --debug=count is broken.
@@ -630,6 +638,7 @@ def _set_debug_values(options):
if __debug__: enable_count = True
if enable_count:
count_stats.enable(sys.stdout)
+ SCons.Debug.track_instances = True
else:
msg = "--debug=count is not supported when running SCons\n" + \
"\twith the python -O option or optimized (.pyo) modules."
@@ -644,6 +653,8 @@ def _set_debug_values(options):
if "memory" in debug_values:
memory_stats.enable(sys.stdout)
print_objects = ("objects" in debug_values)
+ if print_objects:
+ SCons.Debug.track_instances = True
if "presub" in debug_values:
SCons.Action.print_actions_presub = 1
if "stacktrace" in debug_values:
@@ -983,9 +994,9 @@ def _main(parser):
# reading SConscript files and haven't started building
# things yet, stop regardless of whether they used -i or -k
# or anything else.
+ revert_io()
sys.stderr.write("scons: *** %s Stop.\n" % e)
- exit_status = 2
- sys.exit(exit_status)
+ sys.exit(2)
global sconscript_time
sconscript_time = time.time() - start_time
@@ -1063,6 +1074,7 @@ def _main(parser):
platform = SCons.Platform.platform_module()
if options.interactive:
+ SCons.Node.interactive = True
SCons.Script.Interactive.interact(fs, OptionsParser, options,
targets, target_top)
@@ -1071,6 +1083,8 @@ def _main(parser):
# Build the targets
nodes = _build_targets(fs, options, targets, target_top)
if not nodes:
+ revert_io()
+ print 'Found nothing to build'
exit_status = 2
def _build_targets(fs, options, targets, target_top):
@@ -1083,12 +1097,14 @@ def _build_targets(fs, options, targets, target_top):
SCons.Action.print_actions = not options.silent
SCons.Action.execute_actions = not options.no_exec
SCons.Node.FS.do_store_info = not options.no_exec
+ SCons.Node.do_store_info = not options.no_exec
SCons.SConf.dryrun = options.no_exec
if options.diskcheck:
SCons.Node.FS.set_diskcheck(options.diskcheck)
SCons.CacheDir.cache_enabled = not options.cache_disable
+ SCons.CacheDir.cache_readonly = options.cache_readonly
SCons.CacheDir.cache_debug = options.cache_debug
SCons.CacheDir.cache_force = options.cache_force
SCons.CacheDir.cache_show = options.cache_show
@@ -1298,12 +1314,8 @@ def _exec_main(parser, values):
prof = Profile()
try:
prof.runcall(_main, parser)
- except SConsPrintHelpException, e:
+ finally:
prof.dump_stats(options.profile_file)
- raise e
- except SystemExit:
- pass
- prof.dump_stats(options.profile_file)
else:
_main(parser)
@@ -1331,7 +1343,7 @@ def main():
pass
parts.append(version_string("engine", SCons))
parts.append(path_string("engine", SCons))
- parts.append("Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation")
+ parts.append("Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation")
version = ''.join(parts)
import SConsOptions
@@ -1341,7 +1353,10 @@ def main():
OptionsParser = parser
try:
- _exec_main(parser, values)
+ try:
+ _exec_main(parser, values)
+ finally:
+ revert_io()
except SystemExit, s:
if s:
exit_status = s
@@ -1358,6 +1373,7 @@ def main():
parser.print_help()
exit_status = 0
except SCons.Errors.BuildError, e:
+ print e
exit_status = e.exitstatus
except:
# An exception here is likely a builtin Python exception Python
diff --git a/scons/scons-local-2.3.0/SCons/Script/SConsOptions.py b/scons/scons-local-2.3.1/SCons/Script/SConsOptions.py
similarity index 90%
rename from scons/scons-local-2.3.0/SCons/Script/SConsOptions.py
rename to scons/scons-local-2.3.1/SCons/Script/SConsOptions.py
index 6a6bae3e7..09f71b77c 100644
--- a/scons/scons-local-2.3.0/SCons/Script/SConsOptions.py
+++ b/scons/scons-local-2.3.1/SCons/Script/SConsOptions.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Script/SConsOptions.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Script/SConsOptions.py 2014/03/02 14:18:15 garyo"
import optparse
import re
@@ -248,7 +248,7 @@ class SConsOption(optparse.Option):
class SConsOptionGroup(optparse.OptionGroup):
"""
A subclass for SCons-specific option groups.
-
+
The only difference between this and the base class is that we print
the group's help text flush left, underneath their own title but
lined up with the normal "SCons Options".
@@ -337,10 +337,75 @@ class SConsOptionParser(optparse.OptionParser):
option.process(opt, value, values, self)
+ def reparse_local_options(self):
+ """
+ Re-parse the leftover command-line options stored
+ in self.largs, so that any value overridden on the
+ command line is immediately available if the user turns
+ around and does a GetOption() right away.
+
+ We mimic the processing of the single args
+ in the original OptionParser._process_args(), but here we
+ allow exact matches for long-opts only (no partial
+ argument names!).
+
+ Else, this would lead to problems in add_local_option()
+ below. When called from there, we try to reparse the
+ command-line arguments that
+ 1. haven't been processed so far (self.largs), but
+ 2. are possibly not added to the list of options yet.
+
+ So, when we only have a value for "--myargument" yet,
+ a command-line argument of "--myarg=test" would set it.
+ Responsible for this behaviour is the method
+ _match_long_opt(), which allows for partial matches of
+ the option name, as long as the common prefix appears to
+ be unique.
+ This would lead to further confusion, because we might want
+ to add another option "--myarg" later on (see issue #2929).
+
+ """
+ rargs = []
+ largs_restore = []
+ # Loop over all remaining arguments
+ skip = False
+ for l in self.largs:
+ if skip:
+ # Accept all remaining arguments as they are
+ largs_restore.append(l)
+ else:
+ if len(l) > 2 and l[0:2] == "--":
+ # Check long option
+ lopt = (l,)
+ if "=" in l:
+ # Split into option and value
+ lopt = l.split("=", 1)
+
+ if lopt[0] in self._long_opt:
+ # Argument is already known
+ rargs.append('='.join(lopt))
+ else:
+ # Not known yet, so reject for now
+ largs_restore.append('='.join(lopt))
+ else:
+ if l == "--" or l == "-":
+ # Stop normal processing and don't
+ # process the rest of the command-line opts
+ largs_restore.append(l)
+ skip = True
+ else:
+ rargs.append(l)
+
+ # Parse the filtered list
+ self.parse_args(rargs, self.values)
+ # Restore the list of remaining arguments for the
+ # next call of AddOption/add_local_option...
+ self.largs = self.largs + largs_restore
+
def add_local_option(self, *args, **kw):
"""
Adds a local option to the parser.
-
+
This is initiated by a SetOption() call to add a user-defined
command-line option. We add the option to a separate option
group for the local options, creating the group if necessary.
@@ -364,7 +429,7 @@ class SConsOptionParser(optparse.OptionParser):
# available if the user turns around and does a GetOption()
# right away.
setattr(self.values.__defaults__, result.dest, result.default)
- self.parse_args(self.largs, self.values)
+ self.reparse_local_options()
return result
@@ -394,11 +459,11 @@ class SConsIndentedHelpFormatter(optparse.IndentedHelpFormatter):
out liking:
-- add our own regular expression that doesn't break on hyphens
- (so things like --no-print-directory don't get broken);
+ (so things like --no-print-directory don't get broken);
-- wrap the list of options themselves when it's too long
(the wrapper.fill(opts) call below);
-
+
-- set the subsequent_indent when wrapping the help_text.
"""
# The help for each option consists of two parts:
@@ -564,6 +629,11 @@ def Parser(version):
action="store_true",
help="Copy already-built targets into the CacheDir.")
+ op.add_option('--cache-readonly',
+ dest='cache_readonly', default=False,
+ action="store_true",
+ help="Do not update CacheDir with built targets.")
+
op.add_option('--cache-show',
dest='cache_show', default=False,
action="store_true",
@@ -579,8 +649,10 @@ def Parser(version):
if not value in c_options:
raise OptionValueError(opt_invalid('config', value, c_options))
setattr(parser.values, option.dest, value)
+
opt_config_help = "Controls Configure subsystem: %s." \
% ", ".join(config_options)
+
op.add_option('--config',
nargs=1, type="string",
dest="config", default="auto",
@@ -606,23 +678,25 @@ def Parser(version):
"pdb", "prepare", "presub", "stacktrace",
"time"]
- def opt_debug(option, opt, value, parser,
+ def opt_debug(option, opt, value__, parser,
debug_options=debug_options,
deprecated_debug_options=deprecated_debug_options):
- if value in debug_options:
- parser.values.debug.append(value)
- elif value in deprecated_debug_options.keys():
- parser.values.debug.append(value)
- try:
- parser.values.delayed_warnings
- except AttributeError:
- parser.values.delayed_warnings = []
- msg = deprecated_debug_options[value]
- w = "The --debug=%s option is deprecated%s." % (value, msg)
- t = (SCons.Warnings.DeprecatedDebugOptionsWarning, w)
- parser.values.delayed_warnings.append(t)
- else:
- raise OptionValueError(opt_invalid('debug', value, debug_options))
+ for value in value__.split(','):
+ if value in debug_options:
+ parser.values.debug.append(value)
+ elif value in deprecated_debug_options.keys():
+ parser.values.debug.append(value)
+ try:
+ parser.values.delayed_warnings
+ except AttributeError:
+ parser.values.delayed_warnings = []
+ msg = deprecated_debug_options[value]
+ w = "The --debug=%s option is deprecated%s." % (value, msg)
+ t = (SCons.Warnings.DeprecatedDebugOptionsWarning, w)
+ parser.values.delayed_warnings.append(t)
+ else:
+ raise OptionValueError(opt_invalid('debug', value, debug_options))
+
opt_debug_help = "Print various types of debugging information: %s." \
% ", ".join(debug_options)
op.add_option('--debug',
diff --git a/scons/scons-local-2.3.0/SCons/Script/SConscript.py b/scons/scons-local-2.3.1/SCons/Script/SConscript.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Script/SConscript.py
rename to scons/scons-local-2.3.1/SCons/Script/SConscript.py
index 59039eaf9..52aade252 100644
--- a/scons/scons-local-2.3.0/SCons/Script/SConscript.py
+++ b/scons/scons-local-2.3.1/SCons/Script/SConscript.py
@@ -6,7 +6,7 @@ files.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import division
-__revision__ = "src/engine/SCons/Script/SConscript.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Script/SConscript.py 2014/03/02 14:18:15 garyo"
import SCons
import SCons.Action
diff --git a/scons/scons-local-2.3.0/SCons/Script/__init__.py b/scons/scons-local-2.3.1/SCons/Script/__init__.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Script/__init__.py
rename to scons/scons-local-2.3.1/SCons/Script/__init__.py
index 5b3eac812..c27dacdaa 100644
--- a/scons/scons-local-2.3.0/SCons/Script/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Script/__init__.py
@@ -12,7 +12,7 @@ it goes here.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -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 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Script/__init__.py 2014/03/02 14:18:15 garyo"
import time
start_time = time.time()
diff --git a/scons/scons-local-2.3.0/SCons/Sig.py b/scons/scons-local-2.3.1/SCons/Sig.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Sig.py
rename to scons/scons-local-2.3.1/SCons/Sig.py
index a14a99f42..66803ddca 100644
--- a/scons/scons-local-2.3.0/SCons/Sig.py
+++ b/scons/scons-local-2.3.1/SCons/Sig.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Sig.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Sig.py 2014/03/02 14:18:15 garyo"
__doc__ = """Place-holder for the old SCons.Sig module hierarchy
diff --git a/scons/scons-local-2.3.0/SCons/Subst.py b/scons/scons-local-2.3.1/SCons/Subst.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Subst.py
rename to scons/scons-local-2.3.1/SCons/Subst.py
index 94a0df800..0ca649075 100644
--- a/scons/scons-local-2.3.0/SCons/Subst.py
+++ b/scons/scons-local-2.3.1/SCons/Subst.py
@@ -5,7 +5,7 @@ SCons string substitution.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ SCons string substitution.
# 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/Subst.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Subst.py 2014/03/02 14:18:15 garyo"
import collections
import re
@@ -78,6 +78,14 @@ class Literal(object):
def is_literal(self):
return 1
+ def __eq__(self, other):
+ if not isinstance(other, Literal):
+ return False
+ return self.lstr == other.lstr
+
+ def __neq__(self, other):
+ return not self.__eq__(other)
+
class SpecialAttrWrapper(object):
"""This is a wrapper for what we call a 'Node special attribute.'
This is any of the attributes of a Node that we can reference from
@@ -172,7 +180,7 @@ class NLWrapper(object):
In practice, this might be a wash performance-wise, but it's a little
cleaner conceptually...
"""
-
+
def __init__(self, list, func):
self.list = list
self.func = func
@@ -190,7 +198,7 @@ class NLWrapper(object):
self._create_nodelist = self._return_nodelist
return self.nodelist
_create_nodelist = _gen_nodelist
-
+
class Targets_or_Sources(collections.UserList):
"""A class that implements $TARGETS or $SOURCES expansions by in turn
@@ -451,7 +459,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={
raise_exception(NameError(key), lvars['TARGETS'], s)
else:
return ''
-
+
# Before re-expanding the result, handle
# recursive expansion by copying the local
# variable dictionary and overwriting a null
diff --git a/scons/scons-local-2.3.0/SCons/Taskmaster.py b/scons/scons-local-2.3.1/SCons/Taskmaster.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Taskmaster.py
rename to scons/scons-local-2.3.1/SCons/Taskmaster.py
index 461023a01..5e4851a0c 100644
--- a/scons/scons-local-2.3.0/SCons/Taskmaster.py
+++ b/scons/scons-local-2.3.1/SCons/Taskmaster.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -47,7 +47,7 @@ interface and the SCons build engine. There are two key classes here:
target(s) that it decides need to be evaluated and/or built.
"""
-__revision__ = "src/engine/SCons/Taskmaster.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Taskmaster.py 2014/03/02 14:18:15 garyo"
from itertools import chain
import operator
@@ -186,6 +186,8 @@ class Task(object):
# or implicit dependencies exists, and also initialize the
# .sconsign info.
executor = self.targets[0].get_executor()
+ if executor is None:
+ return
executor.prepare()
for t in executor.get_action_targets():
if print_prepare:
@@ -289,6 +291,7 @@ class Task(object):
post-visit actions that must take place regardless of whether
or not the target was an actual built target or a source Node.
"""
+ global print_prepare
T = self.tm.trace
if T: T.write(self.trace_message('Task.executed_with_callbacks()',
self.node))
@@ -301,7 +304,12 @@ class Task(object):
if not t.cached:
t.push_to_cache()
t.built()
- t.visited()
+ t.visited()
+ if (not print_prepare and
+ (not hasattr(self, 'options') or not self.options.debug_includes)):
+ t.release_target_info()
+ else:
+ t.visited()
executed = executed_with_callbacks
@@ -382,6 +390,7 @@ class Task(object):
This is the default behavior for building only what's necessary.
"""
+ global print_prepare
T = self.tm.trace
if T: T.write(self.trace_message(u'Task.make_ready_current()',
self.node))
@@ -414,6 +423,9 @@ class Task(object):
# parallel build...)
t.visited()
t.set_state(NODE_UP_TO_DATE)
+ if (not print_prepare and
+ (not hasattr(self, 'options') or not self.options.debug_includes)):
+ t.release_target_info()
make_ready = make_ready_current
@@ -453,14 +465,15 @@ class Task(object):
parents[p] = parents.get(p, 0) + 1
for t in targets:
- for s in t.side_effects:
- if s.get_state() == NODE_EXECUTING:
- s.set_state(NODE_NO_STATE)
- for p in s.waiting_parents:
- parents[p] = parents.get(p, 0) + 1
- for p in s.waiting_s_e:
- if p.ref_count == 0:
- self.tm.candidates.append(p)
+ if t.side_effects is not None:
+ for s in t.side_effects:
+ if s.get_state() == NODE_EXECUTING:
+ s.set_state(NODE_NO_STATE)
+ for p in s.waiting_parents:
+ parents[p] = parents.get(p, 0) + 1
+ for p in s.waiting_s_e:
+ if p.ref_count == 0:
+ self.tm.candidates.append(p)
for p, subtract in parents.items():
p.ref_count = p.ref_count - subtract
@@ -927,7 +940,11 @@ class Taskmaster(object):
if node is None:
return None
- tlist = node.get_executor().get_all_targets()
+ executor = node.get_executor()
+ if executor is None:
+ return None
+
+ tlist = executor.get_all_targets()
task = self.tasker(self, tlist, node in self.original_top, node)
try:
diff --git a/scons/scons-local-2.3.0/SCons/Tool/386asm.py b/scons/scons-local-2.3.1/SCons/Tool/386asm.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/386asm.py
rename to scons/scons-local-2.3.1/SCons/Tool/386asm.py
index 2b26c0f95..0d96b3d45 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/386asm.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/386asm.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/386asm.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/386asm.py 2014/03/02 14:18:15 garyo"
from SCons.Tool.PharLapCommon import addPharLapPaths
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/BitKeeper.py b/scons/scons-local-2.3.1/SCons/Tool/BitKeeper.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/BitKeeper.py
rename to scons/scons-local-2.3.1/SCons/Tool/BitKeeper.py
index 288ef909f..f99054c36 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/BitKeeper.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/BitKeeper.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/BitKeeper.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/BitKeeper.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/CVS.py b/scons/scons-local-2.3.1/SCons/Tool/CVS.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/CVS.py
rename to scons/scons-local-2.3.1/SCons/Tool/CVS.py
index 3e60643ee..035ee6300 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/CVS.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/CVS.py
@@ -8,7 +8,7 @@ selection method.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ selection method.
# 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/Tool/CVS.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/CVS.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/FortranCommon.py b/scons/scons-local-2.3.1/SCons/Tool/FortranCommon.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/FortranCommon.py
rename to scons/scons-local-2.3.1/SCons/Tool/FortranCommon.py
index 7b470a2a1..bd211ef69 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/FortranCommon.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/FortranCommon.py
@@ -5,7 +5,7 @@ Stuff for processing Fortran, common to all fortran dialects.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ Stuff for processing Fortran, common to all fortran dialects.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/FortranCommon.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/FortranCommon.py 2014/03/02 14:18:15 garyo"
import re
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/GettextCommon.py b/scons/scons-local-2.3.1/SCons/Tool/GettextCommon.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/GettextCommon.py
rename to scons/scons-local-2.3.1/SCons/Tool/GettextCommon.py
index 2b1b9254c..db8d95092 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/GettextCommon.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/GettextCommon.py
@@ -3,7 +3,7 @@
Used by several tools of `gettext` toolset.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@ Used by several tools of `gettext` toolset.
# 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/Tool/GettextCommon.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/GettextCommon.py 2014/03/02 14:18:15 garyo"
import SCons.Warnings
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/JavaCommon.py b/scons/scons-local-2.3.1/SCons/Tool/JavaCommon.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/JavaCommon.py
rename to scons/scons-local-2.3.1/SCons/Tool/JavaCommon.py
index ea5e5bd58..8e5473dc9 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/JavaCommon.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/JavaCommon.py
@@ -5,7 +5,7 @@ Stuff for processing Java.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ Stuff for processing Java.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/JavaCommon.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/JavaCommon.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/__init__.py b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/__init__.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/MSCommon/__init__.py
rename to scons/scons-local-2.3.1/SCons/Tool/MSCommon/__init__.py
index 37226633b..6efdcce7b 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/__init__.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Tool/MSCommon/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/MSCommon/__init__.py 2014/03/02 14:18:15 garyo"
__doc__ = """
Common functions for Microsoft Visual Studio and Visual C/C++.
diff --git a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/arch.py b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/arch.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/MSCommon/arch.py
rename to scons/scons-local-2.3.1/SCons/Tool/MSCommon/arch.py
index e6eb38228..3fc4eedeb 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/arch.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/arch.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Tool/MSCommon/arch.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/MSCommon/arch.py 2014/03/02 14:18:15 garyo"
__doc__ = """Module to define supported Windows chip architectures.
"""
diff --git a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/common.py b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/common.py
similarity index 89%
rename from scons/scons-local-2.3.0/SCons/Tool/MSCommon/common.py
rename to scons/scons-local-2.3.1/SCons/Tool/MSCommon/common.py
index e3fda5af1..006e17e72 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/common.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/common.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Tool/MSCommon/common.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/MSCommon/common.py 2014/03/02 14:18:15 garyo"
__doc__ = """
Common helper functions for working with the Microsoft tool chain.
@@ -55,12 +55,12 @@ _is_win64 = None
def is_win64():
"""Return true if running on windows 64 bits.
-
+
Works whether python itself runs in 64 bits or 32 bits."""
# Unfortunately, python does not provide a useful way to determine
# if the underlying Windows OS is 32-bit or 64-bit. Worse, whether
# the Python itself is 32-bit or 64-bit affects what it returns,
- # so nothing in sys.* or os.* help.
+ # so nothing in sys.* or os.* help.
# Apparently the best solution is to use env vars that Windows
# sets. If PROCESSOR_ARCHITECTURE is not x86, then the python
@@ -120,11 +120,21 @@ def normalize_env(env, keys, force=False):
if k in os.environ and (force or not k in normenv):
normenv[k] = os.environ[k].encode('mbcs')
+ # This shouldn't be necessary, since the default environment should include system32,
+ # but keep this here to be safe, since it's needed to find reg.exe which the MSVC
+ # bat scripts use.
+ sys32_dir = os.path.join(os.environ.get("SystemRoot", os.environ.get("windir",r"C:\Windows\system32")),"System32")
+
+ if sys32_dir not in normenv['PATH']:
+ normenv['PATH'] = normenv['PATH'] + os.pathsep + sys32_dir
+
+ debug("PATH: %s"%normenv['PATH'])
+
return normenv
def get_output(vcbat, args = None, env = None):
"""Parse the output of given bat file, with given args."""
-
+
if env is None:
# Create a blank environment, for use in launching the tools
env = SCons.Environment.Environment(tools=[])
@@ -136,6 +146,9 @@ def get_output(vcbat, args = None, env = None):
# settings in vs.py.
vars = [
'COMSPEC',
+# VS100 and VS110: Still set, but modern MSVC setup scripts will
+# discard these if registry has values. However Intel compiler setup
+# script still requires these as of 2013/2014.
'VS110COMNTOOLS',
'VS100COMNTOOLS',
'VS90COMNTOOLS',
@@ -166,6 +179,11 @@ def get_output(vcbat, args = None, env = None):
# and won't work under Pythons not built with threading.
stdout = popen.stdout.read()
stderr = popen.stderr.read()
+
+ # Extra debug logic, uncomment if necessar
+# debug('get_output():stdout:%s'%stdout)
+# debug('get_output():stderr:%s'%stderr)
+
if stderr:
# TODO: find something better to do with stderr;
# this at least prevents errors from getting swallowed.
@@ -196,7 +214,7 @@ def parse_output(output, keep = ("INCLUDE", "LIB", "LIBPATH", "PATH")):
p = p.encode('mbcs')
# XXX: For some reason, VC98 .bat file adds "" around the PATH
# values, and it screws up the environment later, so we strip
- # it.
+ # it.
p = p.strip('"')
dkeep[key].append(p)
diff --git a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/netframework.py b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/netframework.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/MSCommon/netframework.py
rename to scons/scons-local-2.3.1/SCons/Tool/MSCommon/netframework.py
index e1c12a643..fef75eb86 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/netframework.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/netframework.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -20,7 +20,7 @@
# 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/Tool/MSCommon/netframework.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/MSCommon/netframework.py 2014/03/02 14:18:15 garyo"
__doc__ = """
"""
diff --git a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/sdk.py b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/sdk.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/MSCommon/sdk.py
rename to scons/scons-local-2.3.1/SCons/Tool/MSCommon/sdk.py
index 1536a22bf..320ef4c38 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/sdk.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/sdk.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Tool/MSCommon/sdk.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py 2014/03/02 14:18:15 garyo"
__doc__ = """Module to detect the Platform/Windows SDK
diff --git a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/vc.py b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/vc.py
similarity index 89%
rename from scons/scons-local-2.3.0/SCons/Tool/MSCommon/vc.py
rename to scons/scons-local-2.3.1/SCons/Tool/MSCommon/vc.py
index ec285c83b..582bf23e7 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/vc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/vc.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@
# * test on 64 bits XP + VS 2005 (and VS 6 if possible)
# * SDK
# * Assembly
-__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py 2014/03/02 14:18:15 garyo"
__doc__ = """Module for Visual C/C++ detection and configuration.
"""
@@ -81,6 +81,7 @@ _ARCH_TO_CANONICAL = {
"itanium" : "ia64",
"x86" : "x86",
"x86_64" : "amd64",
+ "x86_amd64" : "x86_amd64", # Cross compile to 64 bit from 32bits
}
# Given a (host, target) tuple, return the argument for the bat file. Both host
@@ -88,6 +89,7 @@ _ARCH_TO_CANONICAL = {
_HOST_TARGET_ARCH_TO_BAT_ARCH = {
("x86", "x86"): "x86",
("x86", "amd64"): "x86_amd64",
+ ("amd64", "x86_amd64"): "x86_amd64", # This is present in (at least) VS2012 express
("amd64", "amd64"): "amd64",
("amd64", "x86"): "x86",
("x86", "ia64"): "x86_ia64"
@@ -256,15 +258,16 @@ def find_batch_file(env,msvc_version,host_arch,target_arch):
installed_sdks=get_installed_sdks()
for _sdk in installed_sdks:
- sdk_bat_file=_sdk.get_sdk_vc_script(host_arch,target_arch)
- sdk_bat_file_path=os.path.join(pdir,sdk_bat_file)
- debug('vc.py:find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path)
- if os.path.exists(sdk_bat_file_path):
- return (batfilename,sdk_bat_file_path)
+ sdk_bat_file = _sdk.get_sdk_vc_script(host_arch,target_arch)
+ if not sdk_bat_file:
+ debug("vc.py:find_batch_file() not found:%s"%_sdk)
else:
- debug("vc.py:find_batch_file() not found:%s"%sdk_bat_file_path)
- else:
- return (batfilename,None)
+ sdk_bat_file_path = os.path.join(pdir,sdk_bat_file)
+ if os.path.exists(sdk_bat_file_path):
+ debug('vc.py:find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path)
+ return (batfilename,sdk_bat_file_path)
+ return (batfilename,None)
+
__INSTALLED_VCS_RUN = None
@@ -357,13 +360,23 @@ def msvc_find_valid_batch_script(env,version):
# target platform
(host_platform, target_platform,req_target_platform) = get_host_target(env)
- # If the user hasn't specifically requested a TARGET_ARCH, and
- # The TARGET_ARCH is amd64 then also try 32 bits if there are no viable
- # 64 bit tools installed
try_target_archs = [target_platform]
- if not req_target_platform and target_platform in ('amd64','x86_64'):
+ debug("msvs_find_valid_batch_script(): req_target_platform %s target_platform:%s"%(req_target_platform,target_platform))
+
+ # VS2012 has a "cross compile" environment to build 64 bit
+ # with x86_amd64 as the argument to the batch setup script
+ if req_target_platform in ('amd64','x86_64'):
+ try_target_archs.append('x86_amd64')
+ elif not req_target_platform and target_platform in ['amd64','x86_64']:
+ # There may not be "native" amd64, but maybe "cross" x86_amd64 tools
+ try_target_archs.append('x86_amd64')
+ # If the user hasn't specifically requested a TARGET_ARCH, and
+ # The TARGET_ARCH is amd64 then also try 32 bits if there are no viable
+ # 64 bit tools installed
try_target_archs.append('x86')
+ debug("msvs_find_valid_batch_script(): host_platform: %s try_target_archs:%s"%(host_platform, try_target_archs))
+
d = None
for tp in try_target_archs:
# Set to current arch.
@@ -399,6 +412,7 @@ def msvc_find_valid_batch_script(env,version):
except BatchFileExecutionError, e:
debug('vc.py:msvc_find_valid_batch_script() use_script 3: failed running VC script %s: %s: Error:%s'%(repr(vc_script),arg,e))
vc_script=None
+ continue
if not vc_script and sdk_script:
debug('vc.py:msvc_find_valid_batch_script() use_script 4: trying sdk script: %s'%(sdk_script))
try:
@@ -409,6 +423,9 @@ def msvc_find_valid_batch_script(env,version):
elif not vc_script and not sdk_script:
debug('vc.py:msvc_find_valid_batch_script() use_script 6: Neither VC script nor SDK script found')
continue
+
+ debug("vc.py:msvc_find_valid_batch_script() Found a working script/target: %s %s"%(repr(sdk_script),arg))
+ break # We've found a working target_platform, so stop looking
# If we cannot find a viable installed compiler, reset the TARGET_ARCH
# To it's initial value
diff --git a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/vs.py b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/vs.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/MSCommon/vs.py
rename to scons/scons-local-2.3.1/SCons/Tool/MSCommon/vs.py
index 18b31a0be..783ca2e7f 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/MSCommon/vs.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/MSCommon/vs.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Tool/MSCommon/vs.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py 2014/03/02 14:18:15 garyo"
__doc__ = """Module to detect Visual Studio and/or Visual C/C++
"""
diff --git a/scons/scons-local-2.3.0/SCons/Tool/Perforce.py b/scons/scons-local-2.3.1/SCons/Tool/Perforce.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/Perforce.py
rename to scons/scons-local-2.3.1/SCons/Tool/Perforce.py
index 3b56fee24..3e132ad35 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/Perforce.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/Perforce.py
@@ -8,7 +8,7 @@ selection method.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ selection method.
# 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/Tool/Perforce.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/Perforce.py 2014/03/02 14:18:15 garyo"
import os
diff --git a/scons/scons-local-2.3.0/SCons/Tool/PharLapCommon.py b/scons/scons-local-2.3.1/SCons/Tool/PharLapCommon.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/PharLapCommon.py
rename to scons/scons-local-2.3.1/SCons/Tool/PharLapCommon.py
index 7602073f2..dc5e9dbb4 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/PharLapCommon.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/PharLapCommon.py
@@ -7,7 +7,7 @@ Phar Lap ETS tool chain. Right now, this is linkloc and
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ Phar Lap ETS tool chain. Right now, this is linkloc and
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/PharLapCommon.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/PharLapCommon.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/RCS.py b/scons/scons-local-2.3.1/SCons/Tool/RCS.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/RCS.py
rename to scons/scons-local-2.3.1/SCons/Tool/RCS.py
index 05505ac8b..4ecb4992c 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/RCS.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/RCS.py
@@ -8,7 +8,7 @@ selection method.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ selection method.
# 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/Tool/RCS.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/RCS.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/SCCS.py b/scons/scons-local-2.3.1/SCons/Tool/SCCS.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/SCCS.py
rename to scons/scons-local-2.3.1/SCons/Tool/SCCS.py
index 6f795a5cc..cee057b6a 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/SCCS.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/SCCS.py
@@ -8,7 +8,7 @@ selection method.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ selection method.
# 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/Tool/SCCS.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/SCCS.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/Subversion.py b/scons/scons-local-2.3.1/SCons/Tool/Subversion.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/Subversion.py
rename to scons/scons-local-2.3.1/SCons/Tool/Subversion.py
index 41771ad28..3b45b12b9 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/Subversion.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/Subversion.py
@@ -8,7 +8,7 @@ selection method.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ selection method.
# 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/Tool/Subversion.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/Subversion.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/__init__.py b/scons/scons-local-2.3.1/SCons/Tool/__init__.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Tool/__init__.py
rename to scons/scons-local-2.3.1/SCons/Tool/__init__.py
index b12095f94..b946507a0 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/__init__.py
@@ -14,7 +14,7 @@ tool definition.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -35,7 +35,7 @@ tool definition.
# 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/Tool/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/__init__.py 2014/03/02 14:18:15 garyo"
import imp
import sys
@@ -257,6 +257,10 @@ def VersionShLibLinkNames(version, libname, env):
print "VersionShLibLinkNames: linkname = ",linkname
linknames.append(linkname)
elif platform == 'posix':
+ if sys.platform.startswith('openbsd'):
+ # OpenBSD uses x.y shared library versioning numbering convention
+ # and doesn't use symlinks to backwards-compatible libraries
+ return []
# For libfoo.so.x.y.z, linknames libfoo.so libfoo.so.x.y libfoo.so.x
suffix_re = re.escape(shlib_suffix + '.' + version)
# First linkname has no version number
@@ -302,13 +306,17 @@ symlinks for the platform we are on"""
if version:
# set the shared library link flags
if platform == 'posix':
- suffix_re = re.escape(shlib_suffix + '.' + version)
- (major, age, revision) = version.split(".")
- # soname will have only the major version number in it
- soname = re.sub(suffix_re, shlib_suffix, libname) + '.' + major
- shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-soname=%s' % soname ]
- if Verbose:
- print " soname ",soname,", shlink_flags ",shlink_flags
+ shlink_flags += [ '-Wl,-Bsymbolic' ]
+ # OpenBSD doesn't usually use SONAME for libraries
+ if not sys.platform.startswith('openbsd'):
+ # continue setup of shlink flags for all other POSIX systems
+ suffix_re = re.escape(shlib_suffix + '.' + version)
+ (major, age, revision) = version.split(".")
+ # soname will have only the major version number in it
+ soname = re.sub(suffix_re, shlib_suffix, libname) + '.' + major
+ shlink_flags += [ '-Wl,-soname=%s' % soname ]
+ if Verbose:
+ print " soname ",soname,", shlink_flags ",shlink_flags
elif platform == 'cygwin':
shlink_flags += [ '-Wl,-Bsymbolic',
'-Wl,--out-implib,${TARGET.base}.a' ]
@@ -337,18 +345,32 @@ symlinks for the platform we are on"""
for count in range(len(linknames)):
linkname = linknames[count]
if count > 0:
- os.symlink(os.path.basename(linkname),lastname)
+ try:
+ os.remove(lastlinkname)
+ except:
+ pass
+ os.symlink(os.path.basename(linkname),lastlinkname)
if Verbose:
- print "VerShLib: made sym link of %s -> %s" % (lastname,linkname)
- lastname = linkname
+ print "VerShLib: made sym link of %s -> %s" % (lastlinkname,linkname)
+ lastlinkname = linkname
# finish chain of sym links with link to the actual library
if len(linknames)>0:
- os.symlink(lib_ver,lastname)
+ try:
+ os.remove(lastlinkname)
+ except:
+ pass
+ os.symlink(lib_ver,lastlinkname)
if Verbose:
- print "VerShLib: made sym link of %s -> %s" % (lib_ver,linkname)
+ print "VerShLib: made sym link of %s -> %s" % (linkname, lib_ver)
return result
-ShLibAction = SCons.Action.Action(VersionedSharedLibrary, None)
+# Fix http://scons.tigris.org/issues/show_bug.cgi?id=2903 :
+# Ensure we still depend on SCons.Defaults.ShLinkAction command line which is $SHLINKCOM.
+# This was tricky because we don't want changing LIBPATH to cause a rebuild, but
+# changing other link args should. LIBPATH has $( ... $) around it but until this
+# fix, when the varlist was added to the build sig those ignored parts weren't getting
+# ignored.
+ShLibAction = SCons.Action.Action(VersionedSharedLibrary, None, varlist=['SHLINKCOM'])
def createSharedLibBuilder(env):
"""This is a utility function that creates the SharedLibrary
@@ -733,6 +755,14 @@ def tool_list(platform, env):
assemblers = ['as']
fortran_compilers = ['gfortran', 'f95', 'f90', 'g77']
ars = ['ar']
+ elif str(platform) == 'cygwin':
+ "prefer GNU tools on Cygwin, except for a platform-specific linker"
+ linkers = ['cyglink', 'mslink', 'ilink']
+ c_compilers = ['gcc', 'msvc', 'intelc', 'icc', 'cc']
+ cxx_compilers = ['g++', 'msvc', 'intelc', 'icc', 'c++']
+ assemblers = ['gas', 'nasm', 'masm']
+ fortran_compilers = ['gfortran', 'g77', 'ifort', 'ifl', 'f95', 'f90', 'f77']
+ ars = ['ar', 'mslib']
else:
"prefer GNU tools on all other platforms"
linkers = ['gnulink', 'mslink', 'ilink']
diff --git a/scons/scons-local-2.3.0/SCons/Tool/aixc++.py b/scons/scons-local-2.3.1/SCons/Tool/aixc++.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/aixc++.py
rename to scons/scons-local-2.3.1/SCons/Tool/aixc++.py
index e9cc5c232..6f1ea5b16 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/aixc++.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/aixc++.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixc++.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/aixc++.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/aixcc.py b/scons/scons-local-2.3.1/SCons/Tool/aixcc.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/aixcc.py
rename to scons/scons-local-2.3.1/SCons/Tool/aixcc.py
index 44cb0ab14..bdcb68128 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/aixcc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/aixcc.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixcc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/aixcc.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/aixf77.py b/scons/scons-local-2.3.1/SCons/Tool/aixf77.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/aixf77.py
rename to scons/scons-local-2.3.1/SCons/Tool/aixf77.py
index 19f8594b4..3a8400b29 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/aixf77.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/aixf77.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixf77.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/aixf77.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/aixlink.py b/scons/scons-local-2.3.1/SCons/Tool/aixlink.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/aixlink.py
rename to scons/scons-local-2.3.1/SCons/Tool/aixlink.py
index 980568a3a..44a7ca579 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/aixlink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/aixlink.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixlink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/aixlink.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/applelink.py b/scons/scons-local-2.3.1/SCons/Tool/applelink.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/applelink.py
rename to scons/scons-local-2.3.1/SCons/Tool/applelink.py
index a67fc10cc..70ad558d9 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/applelink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/applelink.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/applelink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/applelink.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/ar.py b/scons/scons-local-2.3.1/SCons/Tool/ar.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/ar.py
rename to scons/scons-local-2.3.1/SCons/Tool/ar.py
index c11b5437d..d9ef9a42a 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/ar.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/ar.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ar.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/ar.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/as.py b/scons/scons-local-2.3.1/SCons/Tool/as.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/as.py
rename to scons/scons-local-2.3.1/SCons/Tool/as.py
index 29b0266e7..d245f7b40 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/as.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/as.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/as.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/as.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/bcc32.py b/scons/scons-local-2.3.1/SCons/Tool/bcc32.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/bcc32.py
rename to scons/scons-local-2.3.1/SCons/Tool/bcc32.py
index c152353b4..ce4f23484 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/bcc32.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/bcc32.py
@@ -5,7 +5,7 @@ XXX
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ XXX
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/bcc32.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/bcc32.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/c++.py b/scons/scons-local-2.3.1/SCons/Tool/c++.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/c++.py
rename to scons/scons-local-2.3.1/SCons/Tool/c++.py
index 18f4afe29..7b98b767d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/c++.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/c++.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/c++.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/c++.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/cc.py b/scons/scons-local-2.3.1/SCons/Tool/cc.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/cc.py
rename to scons/scons-local-2.3.1/SCons/Tool/cc.py
index 00ecc2f25..0702138d7 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/cc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/cc.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/cc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/cc.py 2014/03/02 14:18:15 garyo"
import SCons.Tool
import SCons.Defaults
diff --git a/scons/scons-local-2.3.0/SCons/Tool/cvf.py b/scons/scons-local-2.3.1/SCons/Tool/cvf.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/cvf.py
rename to scons/scons-local-2.3.1/SCons/Tool/cvf.py
index 2bf10da79..d35c1b13d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/cvf.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/cvf.py
@@ -5,7 +5,7 @@ Tool-specific initialization for the Compaq Visual Fortran compiler.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ Tool-specific initialization for the Compaq Visual Fortran compiler.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/cvf.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/cvf.py 2014/03/02 14:18:15 garyo"
import fortran
diff --git a/scons/scons-local-2.3.1/SCons/Tool/cyglink.py b/scons/scons-local-2.3.1/SCons/Tool/cyglink.py
new file mode 100644
index 000000000..87716cf94
--- /dev/null
+++ b/scons/scons-local-2.3.1/SCons/Tool/cyglink.py
@@ -0,0 +1,94 @@
+"""SCons.Tool.cyglink
+
+Customization of gnulink for Cygwin (http://www.cygwin.com/)
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+import SCons.Action
+import SCons.Util
+
+import gnulink
+
+def shlib_generator(target, source, env, for_signature):
+ cmd = SCons.Util.CLVar(['$SHLINK'])
+
+ dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
+ if dll: cmd.extend(['-o', dll])
+
+ cmd.extend(['$SHLINKFLAGS', '$__RPATH'])
+
+ implib = env.FindIxes(target, 'IMPLIBPREFIX', 'IMPLIBSUFFIX')
+ if implib:
+ cmd.extend([
+ '-Wl,--out-implib='+implib.get_string(for_signature),
+ '-Wl,--export-all-symbols',
+ '-Wl,--enable-auto-import',
+ '-Wl,--whole-archive', '$SOURCES',
+ '-Wl,--no-whole-archive', '$_LIBDIRFLAGS', '$_LIBFLAGS'
+ ])
+ else:
+ cmd.extend(['$SOURCES', '$_LIBDIRFLAGS', '$_LIBFLAGS'])
+
+ return [cmd]
+
+def shlib_emitter(target, source, env):
+ dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
+ no_import_lib = env.get('no_import_lib', 0)
+
+ if not dll or len(target) > 1:
+ raise SCons.Errors.UserError("A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX"))
+
+ # Remove any "lib" after the prefix
+ pre = env.subst('$SHLIBPREFIX')
+ if dll.name[len(pre):len(pre)+3] == 'lib':
+ dll.name = pre + dll.name[len(pre)+3:]
+
+ orig_target = target
+ target = [env.fs.File(dll)]
+ target[0].attributes.shared = 1
+
+ # Append an import lib target
+ if not no_import_lib:
+ # Create list of target libraries as strings
+ target_strings = env.ReplaceIxes(orig_target[0],
+ 'SHLIBPREFIX', 'SHLIBSUFFIX',
+ 'IMPLIBPREFIX', 'IMPLIBSUFFIX')
+
+ implib_target = env.fs.File(target_strings)
+ implib_target.attributes.shared = 1
+ target.append(implib_target)
+
+ return (target, source)
+
+
+shlib_action = SCons.Action.Action(shlib_generator, generator=1)
+
+def generate(env):
+ """Add Builders and construction variables for cyglink to an Environment."""
+ gnulink.generate(env)
+
+ env['LINKFLAGS'] = SCons.Util.CLVar('-Wl,-no-undefined')
+
+ env['SHLINKCOM'] = shlib_action
+ env['LDMODULECOM'] = shlib_action
+ env.Append(SHLIBEMITTER = [shlib_emitter])
+
+ env['SHLIBPREFIX'] = 'cyg'
+ env['SHLIBSUFFIX'] = '.dll'
+
+ env['IMPLIBPREFIX'] = 'lib'
+ env['IMPLIBSUFFIX'] = '.dll.a'
+
+def exists(env):
+ return gnulink.exists(env)
+
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/scons/scons-local-2.3.0/SCons/Tool/default.py b/scons/scons-local-2.3.1/SCons/Tool/default.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Tool/default.py
rename to scons/scons-local-2.3.1/SCons/Tool/default.py
index 4faab7ee1..ccb215c8a 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/default.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/default.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/default.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/default.py 2014/03/02 14:18:15 garyo"
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/dmd.py b/scons/scons-local-2.3.1/SCons/Tool/dmd.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/dmd.py
rename to scons/scons-local-2.3.1/SCons/Tool/dmd.py
index 3c73f80ea..67355b1ad 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/dmd.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/dmd.py
@@ -35,7 +35,7 @@ Lib tool variables:
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -57,7 +57,7 @@ Lib tool variables:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/dmd.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/dmd.py 2014/03/02 14:18:15 garyo"
import os
diff --git a/scons/scons-local-2.3.1/SCons/Tool/docbook/__init__.py b/scons/scons-local-2.3.1/SCons/Tool/docbook/__init__.py
new file mode 100644
index 000000000..72ea17586
--- /dev/null
+++ b/scons/scons-local-2.3.1/SCons/Tool/docbook/__init__.py
@@ -0,0 +1,877 @@
+
+"""SCons.Tool.docbook
+
+Tool-specific initialization for Docbook.
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+
+"""
+
+#
+# Copyright (c) 2001-7,2010 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+import os
+import glob
+import re
+
+import SCons.Action
+import SCons.Builder
+import SCons.Defaults
+import SCons.Script
+import SCons.Tool
+import SCons.Util
+
+# Get full path to this script
+scriptpath = os.path.dirname(os.path.realpath(__file__))
+
+# Local folder for the collection of DocBook XSLs
+db_xsl_folder = 'docbook-xsl-1.76.1'
+
+# Do we have libxml2/libxslt/lxml?
+has_libxml2 = True
+has_lxml = True
+try:
+ import libxml2
+ import libxslt
+except:
+ has_libxml2 = False
+try:
+ import lxml
+except:
+ has_lxml = False
+
+# Set this to True, to prefer xsltproc over libxml2 and lxml
+prefer_xsltproc = False
+
+# Regexs for parsing Docbook XML sources of MAN pages
+re_manvolnum = re.compile("([^<]*)")
+re_refname = re.compile("([^<]*)")
+
+#
+# Helper functions
+#
+def __extend_targets_sources(target, source):
+ """ Prepare the lists of target and source files. """
+ if not SCons.Util.is_List(target):
+ target = [target]
+ if not source:
+ source = target[:]
+ elif not SCons.Util.is_List(source):
+ source = [source]
+ if len(target) < len(source):
+ target.extend(source[len(target):])
+
+ return target, source
+
+def __init_xsl_stylesheet(kw, env, user_xsl_var, default_path):
+ if kw.get('DOCBOOK_XSL','') == '':
+ xsl_style = kw.get('xsl', env.subst(user_xsl_var))
+ if xsl_style == '':
+ path_args = [scriptpath, db_xsl_folder] + default_path
+ xsl_style = os.path.join(*path_args)
+ kw['DOCBOOK_XSL'] = xsl_style
+
+def __select_builder(lxml_builder, libxml2_builder, cmdline_builder):
+ """ Selects a builder, based on which Python modules are present. """
+ if prefer_xsltproc:
+ return cmdline_builder
+
+ if not has_libxml2:
+ # At the moment we prefer libxml2 over lxml, the latter can lead
+ # to conflicts when installed together with libxml2.
+ if has_lxml:
+ return lxml_builder
+ else:
+ return cmdline_builder
+
+ return libxml2_builder
+
+def __ensure_suffix(t, suffix):
+ """ Ensure that the target t has the given suffix. """
+ tpath = str(t)
+ if not tpath.endswith(suffix):
+ return tpath+suffix
+
+ return t
+
+def __ensure_suffix_stem(t, suffix):
+ """ Ensure that the target t has the given suffix, and return the file's stem. """
+ tpath = str(t)
+ if not tpath.endswith(suffix):
+ stem = tpath
+ tpath += suffix
+
+ return tpath, stem
+ else:
+ stem, ext = os.path.splitext(tpath)
+
+ return t, stem
+
+def __get_xml_text(root):
+ """ Return the text for the given root node (xml.dom.minidom). """
+ txt = ""
+ for e in root.childNodes:
+ if (e.nodeType == e.TEXT_NODE):
+ txt += e.data
+ return txt
+
+def __create_output_dir(base_dir):
+ """ Ensure that the output directory base_dir exists. """
+ root, tail = os.path.split(base_dir)
+ dir = None
+ if tail:
+ if base_dir.endswith('/'):
+ dir = base_dir
+ else:
+ dir = root
+ else:
+ if base_dir.endswith('/'):
+ dir = base_dir
+
+ if dir and not os.path.isdir(dir):
+ os.makedirs(dir)
+
+
+#
+# Supported command line tools and their call "signature"
+#
+xsltproc_com = {'xsltproc' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE',
+ 'saxon' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE $DOCBOOK_XSLTPROCPARAMS',
+ 'saxon-xslt' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -o $TARGET $DOCBOOK_XSL $SOURCE $DOCBOOK_XSLTPROCPARAMS',
+ 'xalan' : '$DOCBOOK_XSLTPROC $DOCBOOK_XSLTPROCFLAGS -q -out $TARGET -xsl $DOCBOOK_XSL -in $SOURCE'}
+xmllint_com = {'xmllint' : '$DOCBOOK_XMLLINT $DOCBOOK_XMLLINTFLAGS --xinclude $SOURCE > $TARGET'}
+fop_com = {'fop' : '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -fo $SOURCE -pdf $TARGET',
+ 'xep' : '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -valid -fo $SOURCE -pdf $TARGET',
+ 'jw' : '$DOCBOOK_FOP $DOCBOOK_FOPFLAGS -f docbook -b pdf $SOURCE -o $TARGET'}
+
+def __detect_cl_tool(env, chainkey, cdict):
+ """
+ Helper function, picks a command line tool from the list
+ and initializes its environment variables.
+ """
+ if env.get(chainkey,'') == '':
+ clpath = ''
+ for cltool in cdict:
+ clpath = env.WhereIs(cltool)
+ if clpath:
+ env[chainkey] = clpath
+ if not env[chainkey + 'COM']:
+ env[chainkey + 'COM'] = cdict[cltool]
+
+def _detect(env):
+ """
+ Detect all the command line tools that we might need for creating
+ the requested output formats.
+ """
+ global prefer_xsltproc
+
+ if env.get('DOCBOOK_PREFER_XSLTPROC',''):
+ prefer_xsltproc = True
+
+ if ((not has_libxml2 and not has_lxml) or (prefer_xsltproc)):
+ # Try to find the XSLT processors
+ __detect_cl_tool(env, 'DOCBOOK_XSLTPROC', xsltproc_com)
+ __detect_cl_tool(env, 'DOCBOOK_XMLLINT', xmllint_com)
+
+ __detect_cl_tool(env, 'DOCBOOK_FOP', fop_com)
+
+#
+# Scanners
+#
+include_re = re.compile('fileref\\s*=\\s*["|\']([^\\n]*)["|\']')
+sentity_re = re.compile('')
+
+def __xml_scan(node, env, path, arg):
+ """ Simple XML file scanner, detecting local images and XIncludes as implicit dependencies. """
+ # Does the node exist yet?
+ if not os.path.isfile(str(node)):
+ return []
+
+ if env.get('DOCBOOK_SCANENT',''):
+ # Use simple pattern matching for system entities..., no support
+ # for recursion yet.
+ contents = node.get_text_contents()
+ return sentity_re.findall(contents)
+
+ xsl_file = os.path.join(scriptpath,'utils','xmldepend.xsl')
+ if not has_libxml2 or prefer_xsltproc:
+ if has_lxml and not prefer_xsltproc:
+
+ from lxml import etree
+
+ xsl_tree = etree.parse(xsl_file)
+ doc = etree.parse(str(node))
+ result = doc.xslt(xsl_tree)
+
+ depfiles = [x.strip() for x in str(result).splitlines() if x.strip() != "" and not x.startswith(" 1:
+ env.Clean(outfiles[0], outfiles[1:])
+
+
+ return result
+
+def DocbookSlidesPdf(env, target, source=None, *args, **kw):
+ """
+ A pseudo-Builder, providing a Docbook toolchain for PDF slides output.
+ """
+ # Init list of targets/sources
+ target, source = __extend_targets_sources(target, source)
+
+ # Init XSL stylesheet
+ __init_xsl_stylesheet(kw, env, '$DOCBOOK_DEFAULT_XSL_SLIDESPDF', ['slides','fo','plain.xsl'])
+
+ # Setup builder
+ __builder = __select_builder(__lxml_builder, __libxml2_builder, __xsltproc_builder)
+
+ # Create targets
+ result = []
+ for t,s in zip(target,source):
+ t, stem = __ensure_suffix_stem(t, '.pdf')
+ xsl = __builder.__call__(env, stem+'.fo', s, **kw)
+ env.Depends(xsl, kw['DOCBOOK_XSL'])
+ result.extend(xsl)
+ result.extend(__fop_builder.__call__(env, t, xsl, **kw))
+
+ return result
+
+def DocbookSlidesHtml(env, target, source=None, *args, **kw):
+ """
+ A pseudo-Builder, providing a Docbook toolchain for HTML slides output.
+ """
+ # Init list of targets/sources
+ if not SCons.Util.is_List(target):
+ target = [target]
+ if not source:
+ source = target
+ target = ['index.html']
+ elif not SCons.Util.is_List(source):
+ source = [source]
+
+ # Init XSL stylesheet
+ __init_xsl_stylesheet(kw, env, '$DOCBOOK_DEFAULT_XSL_SLIDESHTML', ['slides','html','plain.xsl'])
+
+ # Setup builder
+ __builder = __select_builder(__lxml_builder, __libxml2_builder, __xsltproc_builder)
+
+ # Detect base dir
+ base_dir = kw.get('base_dir', '')
+ if base_dir:
+ __create_output_dir(base_dir)
+
+ # Create targets
+ result = []
+ r = __builder.__call__(env, __ensure_suffix(str(target[0]), '.html'), source[0], **kw)
+ env.Depends(r, kw['DOCBOOK_XSL'])
+ result.extend(r)
+ # Add supporting files for cleanup
+ env.Clean(r, [os.path.join(base_dir, 'toc.html')] +
+ glob.glob(os.path.join(base_dir, 'foil*.html')))
+
+ return result
+
+def DocbookXInclude(env, target, source, *args, **kw):
+ """
+ A pseudo-Builder, for resolving XIncludes in a separate processing step.
+ """
+ # Init list of targets/sources
+ target, source = __extend_targets_sources(target, source)
+
+ # Setup builder
+ __builder = __select_builder(__xinclude_lxml_builder,__xinclude_libxml2_builder,__xmllint_builder)
+
+ # Create targets
+ result = []
+ for t,s in zip(target,source):
+ result.extend(__builder.__call__(env, t, s, **kw))
+
+ return result
+
+def DocbookXslt(env, target, source=None, *args, **kw):
+ """
+ A pseudo-Builder, applying a simple XSL transformation to the input file.
+ """
+ # Init list of targets/sources
+ target, source = __extend_targets_sources(target, source)
+
+ # Init XSL stylesheet
+ kw['DOCBOOK_XSL'] = kw.get('xsl', 'transform.xsl')
+
+ # Setup builder
+ __builder = __select_builder(__lxml_builder, __libxml2_builder, __xsltproc_builder)
+
+ # Create targets
+ result = []
+ for t,s in zip(target,source):
+ r = __builder.__call__(env, t, s, **kw)
+ env.Depends(r, kw['DOCBOOK_XSL'])
+ result.extend(r)
+
+ return result
+
+
+def generate(env):
+ """Add Builders and construction variables for docbook to an Environment."""
+
+ env.SetDefault(
+ # Default names for customized XSL stylesheets
+ DOCBOOK_DEFAULT_XSL_EPUB = '',
+ DOCBOOK_DEFAULT_XSL_HTML = '',
+ DOCBOOK_DEFAULT_XSL_HTMLCHUNKED = '',
+ DOCBOOK_DEFAULT_XSL_HTMLHELP = '',
+ DOCBOOK_DEFAULT_XSL_PDF = '',
+ DOCBOOK_DEFAULT_XSL_MAN = '',
+ DOCBOOK_DEFAULT_XSL_SLIDESPDF = '',
+ DOCBOOK_DEFAULT_XSL_SLIDESHTML = '',
+
+ # Paths to the detected executables
+ DOCBOOK_XSLTPROC = '',
+ DOCBOOK_XMLLINT = '',
+ DOCBOOK_FOP = '',
+
+ # Additional flags for the text processors
+ DOCBOOK_XSLTPROCFLAGS = SCons.Util.CLVar(''),
+ DOCBOOK_XMLLINTFLAGS = SCons.Util.CLVar(''),
+ DOCBOOK_FOPFLAGS = SCons.Util.CLVar(''),
+ DOCBOOK_XSLTPROCPARAMS = SCons.Util.CLVar(''),
+
+ # Default command lines for the detected executables
+ DOCBOOK_XSLTPROCCOM = xsltproc_com['xsltproc'],
+ DOCBOOK_XMLLINTCOM = xmllint_com['xmllint'],
+ DOCBOOK_FOPCOM = fop_com['fop'],
+
+ # Screen output for the text processors
+ DOCBOOK_XSLTPROCCOMSTR = None,
+ DOCBOOK_XMLLINTCOMSTR = None,
+ DOCBOOK_FOPCOMSTR = None,
+
+ )
+ _detect(env)
+
+ try:
+ env.AddMethod(DocbookEpub, "DocbookEpub")
+ env.AddMethod(DocbookHtml, "DocbookHtml")
+ env.AddMethod(DocbookHtmlChunked, "DocbookHtmlChunked")
+ env.AddMethod(DocbookHtmlhelp, "DocbookHtmlhelp")
+ env.AddMethod(DocbookPdf, "DocbookPdf")
+ env.AddMethod(DocbookMan, "DocbookMan")
+ env.AddMethod(DocbookSlidesPdf, "DocbookSlidesPdf")
+ env.AddMethod(DocbookSlidesHtml, "DocbookSlidesHtml")
+ env.AddMethod(DocbookXInclude, "DocbookXInclude")
+ env.AddMethod(DocbookXslt, "DocbookXslt")
+ except AttributeError:
+ # Looks like we use a pre-0.98 version of SCons...
+ from SCons.Script.SConscript import SConsEnvironment
+ SConsEnvironment.DocbookEpub = DocbookEpub
+ SConsEnvironment.DocbookHtml = DocbookHtml
+ SConsEnvironment.DocbookHtmlChunked = DocbookHtmlChunked
+ SConsEnvironment.DocbookHtmlhelp = DocbookHtmlhelp
+ SConsEnvironment.DocbookPdf = DocbookPdf
+ SConsEnvironment.DocbookMan = DocbookMan
+ SConsEnvironment.DocbookSlidesPdf = DocbookSlidesPdf
+ SConsEnvironment.DocbookSlidesHtml = DocbookSlidesHtml
+ SConsEnvironment.DocbookXInclude = DocbookXInclude
+ SConsEnvironment.DocbookXslt = DocbookXslt
+
+
+def exists(env):
+ return 1
diff --git a/scons/scons-local-2.3.0/SCons/Tool/dvi.py b/scons/scons-local-2.3.1/SCons/Tool/dvi.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/dvi.py
rename to scons/scons-local-2.3.1/SCons/Tool/dvi.py
index 496e6988f..f5caf21f7 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/dvi.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/dvi.py
@@ -5,7 +5,7 @@ Common DVI Builder definition for various other Tool modules that use it.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ Common DVI Builder definition for various other Tool modules that use it.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/dvi.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/dvi.py 2014/03/02 14:18:15 garyo"
import SCons.Builder
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/dvipdf.py b/scons/scons-local-2.3.1/SCons/Tool/dvipdf.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/dvipdf.py
rename to scons/scons-local-2.3.1/SCons/Tool/dvipdf.py
index 5fe8d8892..a49a11241 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/dvipdf.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/dvipdf.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# 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/Tool/dvipdf.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/dvipdf.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Defaults
diff --git a/scons/scons-local-2.3.0/SCons/Tool/dvips.py b/scons/scons-local-2.3.1/SCons/Tool/dvips.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/dvips.py
rename to scons/scons-local-2.3.1/SCons/Tool/dvips.py
index a0f9e6fa8..2b09245eb 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/dvips.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/dvips.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/dvips.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/dvips.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/f03.py b/scons/scons-local-2.3.1/SCons/Tool/f03.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/f03.py
rename to scons/scons-local-2.3.1/SCons/Tool/f03.py
index 791562541..258db7066 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/f03.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/f03.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f03.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/f03.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/f77.py b/scons/scons-local-2.3.1/SCons/Tool/f77.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/f77.py
rename to scons/scons-local-2.3.1/SCons/Tool/f77.py
index 7f49892bb..c56f72782 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/f77.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/f77.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f77.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/f77.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Scanner.Fortran
diff --git a/scons/scons-local-2.3.0/SCons/Tool/f90.py b/scons/scons-local-2.3.1/SCons/Tool/f90.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/f90.py
rename to scons/scons-local-2.3.1/SCons/Tool/f90.py
index bd07ae0a5..39be3b4bd 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/f90.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/f90.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f90.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/f90.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Scanner.Fortran
diff --git a/scons/scons-local-2.3.0/SCons/Tool/f95.py b/scons/scons-local-2.3.1/SCons/Tool/f95.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/f95.py
rename to scons/scons-local-2.3.1/SCons/Tool/f95.py
index 5c16d484c..3acc39a51 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/f95.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/f95.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f95.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/f95.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/filesystem.py b/scons/scons-local-2.3.1/SCons/Tool/filesystem.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/filesystem.py
rename to scons/scons-local-2.3.1/SCons/Tool/filesystem.py
index 431ad4c2b..3c124b79c 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/filesystem.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/filesystem.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/filesystem.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/filesystem.py 2014/03/02 14:18:15 garyo"
import SCons
from SCons.Tool.install import copyFunc
diff --git a/scons/scons-local-2.3.0/SCons/Tool/fortran.py b/scons/scons-local-2.3.1/SCons/Tool/fortran.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/fortran.py
rename to scons/scons-local-2.3.1/SCons/Tool/fortran.py
index 35fcd5360..b3b0d0b8e 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/fortran.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/fortran.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/fortran.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/fortran.py 2014/03/02 14:18:15 garyo"
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/g++.py b/scons/scons-local-2.3.1/SCons/Tool/g++.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/g++.py
rename to scons/scons-local-2.3.1/SCons/Tool/g++.py
index be7d93536..d894644e4 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/g++.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/g++.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/g++.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/g++.py 2014/03/02 14:18:15 garyo"
import os.path
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/g77.py b/scons/scons-local-2.3.1/SCons/Tool/g77.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/g77.py
rename to scons/scons-local-2.3.1/SCons/Tool/g77.py
index 5e1d1a1e6..7a7b7aefc 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/g77.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/g77.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/g77.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/g77.py 2014/03/02 14:18:15 garyo"
import SCons.Util
from SCons.Tool.FortranCommon import add_all_to_env, add_f77_to_env
diff --git a/scons/scons-local-2.3.0/SCons/Tool/gas.py b/scons/scons-local-2.3.1/SCons/Tool/gas.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/gas.py
rename to scons/scons-local-2.3.1/SCons/Tool/gas.py
index 143ede936..f016c969f 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/gas.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/gas.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gas.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/gas.py 2014/03/02 14:18:15 garyo"
as_module = __import__('as', globals(), locals(), [])
diff --git a/scons/scons-local-2.3.0/SCons/Tool/gcc.py b/scons/scons-local-2.3.1/SCons/Tool/gcc.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/gcc.py
rename to scons/scons-local-2.3.1/SCons/Tool/gcc.py
index 5b49ff83f..09e48319f 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/gcc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/gcc.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gcc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/gcc.py 2014/03/02 14:18:15 garyo"
import cc
import os
diff --git a/scons/scons-local-2.3.0/SCons/Tool/gettext.py b/scons/scons-local-2.3.1/SCons/Tool/gettext.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/gettext.py
rename to scons/scons-local-2.3.1/SCons/Tool/gettext.py
index b561eda40..8a2588834 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/gettext.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/gettext.py
@@ -2,7 +2,7 @@
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -23,7 +23,7 @@
# 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/Tool/gettext.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/gettext.py 2014/03/02 14:18:15 garyo"
#############################################################################
def generate(env,**kw):
diff --git a/scons/scons-local-2.3.0/SCons/Tool/gfortran.py b/scons/scons-local-2.3.1/SCons/Tool/gfortran.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/gfortran.py
rename to scons/scons-local-2.3.1/SCons/Tool/gfortran.py
index 463f70e78..4d2c137d1 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/gfortran.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/gfortran.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gfortran.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/gfortran.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/gnulink.py b/scons/scons-local-2.3.1/SCons/Tool/gnulink.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/gnulink.py
rename to scons/scons-local-2.3.1/SCons/Tool/gnulink.py
index 281a0d082..d475de444 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/gnulink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/gnulink.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gnulink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/gnulink.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/gs.py b/scons/scons-local-2.3.1/SCons/Tool/gs.py
similarity index 74%
rename from scons/scons-local-2.3.0/SCons/Tool/gs.py
rename to scons/scons-local-2.3.1/SCons/Tool/gs.py
index fc53b7e0a..91c6434a0 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/gs.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/gs.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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,9 +31,10 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gs.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/gs.py 2014/03/02 14:18:15 garyo"
import SCons.Action
+import SCons.Builder
import SCons.Platform
import SCons.Util
@@ -52,17 +53,26 @@ GhostscriptAction = None
def generate(env):
"""Add Builders and construction variables for Ghostscript to an
Environment."""
-
global GhostscriptAction
- if GhostscriptAction is None:
- GhostscriptAction = SCons.Action.Action('$GSCOM', '$GSCOMSTR')
-
- import pdf
- pdf.generate(env)
-
- bld = env['BUILDERS']['PDF']
- bld.add_action('.ps', GhostscriptAction)
+ # The following try-except block enables us to use the Tool
+ # in standalone mode (without the accompanying pdf.py),
+ # whenever we need an explicit call of gs via the Gs()
+ # Builder ...
+ try:
+ if GhostscriptAction is None:
+ GhostscriptAction = SCons.Action.Action('$GSCOM', '$GSCOMSTR')
+
+ import pdf
+ pdf.generate(env)
+
+ bld = env['BUILDERS']['PDF']
+ bld.add_action('.ps', GhostscriptAction)
+ except ImportError, e:
+ pass
+ gsbuilder = SCons.Builder.Builder(action = SCons.Action.Action('$GSCOM', '$GSCOMSTR'))
+ env['BUILDERS']['Gs'] = gsbuilder
+
env['GS'] = gs
env['GSFLAGS'] = SCons.Util.CLVar('-dNOPAUSE -dBATCH -sDEVICE=pdfwrite')
env['GSCOM'] = '$GS $GSFLAGS -sOutputFile=$TARGET $SOURCES'
diff --git a/scons/scons-local-2.3.0/SCons/Tool/hpc++.py b/scons/scons-local-2.3.1/SCons/Tool/hpc++.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/hpc++.py
rename to scons/scons-local-2.3.1/SCons/Tool/hpc++.py
index 94b7fec7a..4920cffe1 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/hpc++.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/hpc++.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/hpc++.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/hpc++.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/hpcc.py b/scons/scons-local-2.3.1/SCons/Tool/hpcc.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/hpcc.py
rename to scons/scons-local-2.3.1/SCons/Tool/hpcc.py
index efd523026..bb745bae2 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/hpcc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/hpcc.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/hpcc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/hpcc.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/hplink.py b/scons/scons-local-2.3.1/SCons/Tool/hplink.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/hplink.py
rename to scons/scons-local-2.3.1/SCons/Tool/hplink.py
index 627c9e946..ea979f568 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/hplink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/hplink.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/hplink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/hplink.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/icc.py b/scons/scons-local-2.3.1/SCons/Tool/icc.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/icc.py
rename to scons/scons-local-2.3.1/SCons/Tool/icc.py
index aa54a0ae2..ac0629c6a 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/icc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/icc.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/icc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/icc.py 2014/03/02 14:18:15 garyo"
import cc
diff --git a/scons/scons-local-2.3.0/SCons/Tool/icl.py b/scons/scons-local-2.3.1/SCons/Tool/icl.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/icl.py
rename to scons/scons-local-2.3.1/SCons/Tool/icl.py
index f0a252ba0..518a90267 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/icl.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/icl.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/icl.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/icl.py 2014/03/02 14:18:15 garyo"
import SCons.Tool.intelc
diff --git a/scons/scons-local-2.3.0/SCons/Tool/ifl.py b/scons/scons-local-2.3.1/SCons/Tool/ifl.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/ifl.py
rename to scons/scons-local-2.3.1/SCons/Tool/ifl.py
index 678a0d14a..6e52fca03 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/ifl.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/ifl.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ifl.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/ifl.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
from SCons.Scanner.Fortran import FortranScan
diff --git a/scons/scons-local-2.3.0/SCons/Tool/ifort.py b/scons/scons-local-2.3.1/SCons/Tool/ifort.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/ifort.py
rename to scons/scons-local-2.3.1/SCons/Tool/ifort.py
index 80c170ba5..c61dc1275 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/ifort.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/ifort.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ifort.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/ifort.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
from SCons.Scanner.Fortran import FortranScan
diff --git a/scons/scons-local-2.3.0/SCons/Tool/ilink.py b/scons/scons-local-2.3.1/SCons/Tool/ilink.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/ilink.py
rename to scons/scons-local-2.3.1/SCons/Tool/ilink.py
index 7fa9b33b7..7cd94d74e 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/ilink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/ilink.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ilink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/ilink.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/ilink32.py b/scons/scons-local-2.3.1/SCons/Tool/ilink32.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/ilink32.py
rename to scons/scons-local-2.3.1/SCons/Tool/ilink32.py
index 8b9cef66e..c8a49db78 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/ilink32.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/ilink32.py
@@ -5,7 +5,7 @@ XXX
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ XXX
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ilink32.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/ilink32.py 2014/03/02 14:18:15 garyo"
import SCons.Tool
import SCons.Tool.bcc32
diff --git a/scons/scons-local-2.3.0/SCons/Tool/install.py b/scons/scons-local-2.3.1/SCons/Tool/install.py
similarity index 91%
rename from scons/scons-local-2.3.0/SCons/Tool/install.py
rename to scons/scons-local-2.3.1/SCons/Tool/install.py
index 6f67fac27..8c3265078 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/install.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/install.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/install.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/install.py 2014/03/02 14:18:15 garyo"
import os
import re
@@ -133,6 +133,11 @@ def copyFuncVersionedLib(dest, source, env):
if os.path.isdir(source):
raise SCons.Errors.UserError("cannot install directory `%s' as a version library" % str(source) )
else:
+ # remove the link if it is already there
+ try:
+ os.remove(dest)
+ except:
+ pass
shutil.copy2(source, dest)
st = os.stat(source)
os.chmod(dest, stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
@@ -196,11 +201,34 @@ def versionedLibLinks(dest, source, env):
if version != None:
# libname includes the version number if one was given
linknames = SCons.Tool.VersionShLibLinkNames(version,libname,env)
- for linkname in linknames:
- if Verbose:
- print "make link of %s to %s" %(libname, os.path.join(install_dir, linkname))
+ if Verbose:
+ print "versionedLibLinks: linknames ",linknames
+ # Here we just need the file name w/o path as the target of the link
+ lib_ver = libname
+ # make symlink of adjacent names in linknames
+ for count in range(len(linknames)):
+ linkname = linknames[count]
fulllinkname = os.path.join(install_dir, linkname)
- os.symlink(libname,fulllinkname)
+ if Verbose:
+ print "full link name ",fulllinkname
+ if count > 0:
+ try:
+ os.remove(lastlinkname)
+ except:
+ pass
+ os.symlink(os.path.basename(fulllinkname),lastlinkname)
+ if Verbose:
+ print "versionedLibLinks: made sym link of %s -> %s" % (lastlinkname,os.path.basename(fulllinkname))
+ lastlinkname = fulllinkname
+ # finish chain of sym links with link to the actual library
+ if len(linknames)>0:
+ try:
+ os.remove(lastlinkname)
+ except:
+ pass
+ os.symlink(lib_ver,lastlinkname)
+ if Verbose:
+ print "versionedLibLinks: made sym link of %s -> %s" % (lib_ver,lastlinkname)
return
def installFunc(target, source, env):
@@ -269,6 +297,8 @@ def add_versioned_targets_to_INSTALLED_FILES(target, source, env):
global _INSTALLED_FILES, _UNIQUE_INSTALLED_FILES
Verbose = False
_INSTALLED_FILES.extend(target)
+ if Verbose:
+ print "ver lib emitter ",repr(target)
# see if we have a versioned shared library, if so generate side effects
version, libname, install_dir = versionedLibVersion(target[0].path, env)
@@ -281,6 +311,9 @@ def add_versioned_targets_to_INSTALLED_FILES(target, source, env):
fulllinkname = os.path.join(install_dir, linkname)
env.SideEffect(fulllinkname,target[0])
env.Clean(target[0],fulllinkname)
+ _INSTALLED_FILES.append(fulllinkname)
+ if Verbose:
+ print "installed list ", _INSTALLED_FILES
_UNIQUE_INSTALLED_FILES = None
return (target, source)
diff --git a/scons/scons-local-2.3.0/SCons/Tool/intelc.py b/scons/scons-local-2.3.1/SCons/Tool/intelc.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/intelc.py
rename to scons/scons-local-2.3.1/SCons/Tool/intelc.py
index 5d267ff97..1bd799fd7 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/intelc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/intelc.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import division
-__revision__ = "src/engine/SCons/Tool/intelc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/intelc.py 2014/03/02 14:18:15 garyo"
import math, sys, os.path, glob, string, re
@@ -317,7 +317,7 @@ def get_intel_compiler_top(version, abi):
for d in glob.glob('/opt/intel/composerxe-*'):
# Typical dir here is /opt/intel/composerxe-2011.4.184
m = re.search(r'([0-9][0-9.]*)$', d)
- if m and m.group(1) == verison and \
+ if m and m.group(1) == version and \
(os.path.exists(os.path.join(d, "bin", "ia32", "icc")) or
os.path.exists(os.path.join(d, "bin", "intel64", "icc"))):
top = d
diff --git a/scons/scons-local-2.3.0/SCons/Tool/ipkg.py b/scons/scons-local-2.3.1/SCons/Tool/ipkg.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/ipkg.py
rename to scons/scons-local-2.3.1/SCons/Tool/ipkg.py
index 2abc0e639..3fb58db92 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/ipkg.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/ipkg.py
@@ -11,7 +11,7 @@ packages fake_root.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ packages fake_root.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ipkg.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/ipkg.py 2014/03/02 14:18:15 garyo"
import os
diff --git a/scons/scons-local-2.3.0/SCons/Tool/jar.py b/scons/scons-local-2.3.1/SCons/Tool/jar.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/jar.py
rename to scons/scons-local-2.3.1/SCons/Tool/jar.py
index ec8afcac9..8b5c7f1fe 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/jar.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/jar.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/jar.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/jar.py 2014/03/02 14:18:15 garyo"
import SCons.Subst
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/javac.py b/scons/scons-local-2.3.1/SCons/Tool/javac.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/javac.py
rename to scons/scons-local-2.3.1/SCons/Tool/javac.py
index a039ace5e..924998984 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/javac.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/javac.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# 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/Tool/javac.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/javac.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/javah.py b/scons/scons-local-2.3.1/SCons/Tool/javah.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/javah.py
rename to scons/scons-local-2.3.1/SCons/Tool/javah.py
index 6e8089c6c..2c2533dc8 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/javah.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/javah.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/javah.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/javah.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/latex.py b/scons/scons-local-2.3.1/SCons/Tool/latex.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/latex.py
rename to scons/scons-local-2.3.1/SCons/Tool/latex.py
index 75033bc13..899a508df 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/latex.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/latex.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/latex.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/latex.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Defaults
diff --git a/scons/scons-local-2.3.0/SCons/Tool/lex.py b/scons/scons-local-2.3.1/SCons/Tool/lex.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/lex.py
rename to scons/scons-local-2.3.1/SCons/Tool/lex.py
index 63277309f..00e292f03 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/lex.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/lex.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/lex.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/lex.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/link.py b/scons/scons-local-2.3.1/SCons/Tool/link.py
similarity index 90%
rename from scons/scons-local-2.3.0/SCons/Tool/link.py
rename to scons/scons-local-2.3.1/SCons/Tool/link.py
index 008a7d799..f6e883fd7 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/link.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/link.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/link.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/link.py 2014/03/02 14:18:15 garyo"
import re
@@ -127,6 +127,18 @@ def shlib_emitter_names(target, source, env):
print "shlib_emitter_names: side effect: ", name
# add version_name to list of names to be a Side effect
version_names.append(version_name)
+ elif platform == 'cygwin':
+ shlib_suffix = env.subst('$SHLIBSUFFIX')
+ name = target[0].name
+ # generate library name with the version number
+ suffix_re = re.escape(shlib_suffix)
+ version_name = re.sub(suffix_re, '-' + re.sub('\.', '-', version) + shlib_suffix, name)
+ if Verbose:
+ print "shlib_emitter_names: target is ", version_name
+ print "shlib_emitter_names: side effect: ", name
+ # add version_name to list of names to be a Side effect
+ version_names.append(version_name)
+
except KeyError:
version = None
return version_names
diff --git a/scons/scons-local-2.3.0/SCons/Tool/linkloc.py b/scons/scons-local-2.3.1/SCons/Tool/linkloc.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/linkloc.py
rename to scons/scons-local-2.3.1/SCons/Tool/linkloc.py
index 6fdd4da4f..9f5a6dccc 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/linkloc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/linkloc.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/linkloc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/linkloc.py 2014/03/02 14:18:15 garyo"
import os.path
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/m4.py b/scons/scons-local-2.3.1/SCons/Tool/m4.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/m4.py
rename to scons/scons-local-2.3.1/SCons/Tool/m4.py
index dfef65945..5088b5819 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/m4.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/m4.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/m4.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/m4.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/masm.py b/scons/scons-local-2.3.1/SCons/Tool/masm.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/masm.py
rename to scons/scons-local-2.3.1/SCons/Tool/masm.py
index b7fb94ede..178584d90 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/masm.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/masm.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/masm.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/masm.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/midl.py b/scons/scons-local-2.3.1/SCons/Tool/midl.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/midl.py
rename to scons/scons-local-2.3.1/SCons/Tool/midl.py
index a69406d1a..e5a871f12 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/midl.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/midl.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/midl.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/midl.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/mingw.py b/scons/scons-local-2.3.1/SCons/Tool/mingw.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/mingw.py
rename to scons/scons-local-2.3.1/SCons/Tool/mingw.py
index a81c94ccf..46ca9e415 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/mingw.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/mingw.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mingw.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/mingw.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/msgfmt.py b/scons/scons-local-2.3.1/SCons/Tool/msgfmt.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/msgfmt.py
rename to scons/scons-local-2.3.1/SCons/Tool/msgfmt.py
index d444ae21e..b83173838 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/msgfmt.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/msgfmt.py
@@ -1,6 +1,6 @@
""" msgfmt tool """
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@
# 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/Tool/msgfmt.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/msgfmt.py 2014/03/02 14:18:15 garyo"
from SCons.Builder import BuilderBase
#############################################################################
diff --git a/scons/scons-local-2.3.0/SCons/Tool/msginit.py b/scons/scons-local-2.3.1/SCons/Tool/msginit.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/msginit.py
rename to scons/scons-local-2.3.1/SCons/Tool/msginit.py
index fcbd564c0..d745dc54c 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/msginit.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/msginit.py
@@ -3,7 +3,7 @@
Tool specific initialization of msginit tool.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@ Tool specific initialization of msginit tool.
# 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/Tool/msginit.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/msginit.py 2014/03/02 14:18:15 garyo"
import SCons.Warnings
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/msgmerge.py b/scons/scons-local-2.3.1/SCons/Tool/msgmerge.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/msgmerge.py
rename to scons/scons-local-2.3.1/SCons/Tool/msgmerge.py
index 35315f939..e50824e45 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/msgmerge.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/msgmerge.py
@@ -3,7 +3,7 @@
Tool specific initialization for `msgmerge` tool.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@ Tool specific initialization for `msgmerge` tool.
# 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/Tool/msgmerge.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/msgmerge.py 2014/03/02 14:18:15 garyo"
#############################################################################
def _update_or_init_po_files(target, source, env):
diff --git a/scons/scons-local-2.3.0/SCons/Tool/mslib.py b/scons/scons-local-2.3.1/SCons/Tool/mslib.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/mslib.py
rename to scons/scons-local-2.3.1/SCons/Tool/mslib.py
index b85186728..0f95e4143 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/mslib.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/mslib.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mslib.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/mslib.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/mslink.py b/scons/scons-local-2.3.1/SCons/Tool/mslink.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/mslink.py
rename to scons/scons-local-2.3.1/SCons/Tool/mslink.py
index a35d7dab2..9374ffefa 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/mslink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/mslink.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mslink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/mslink.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/mssdk.py b/scons/scons-local-2.3.1/SCons/Tool/mssdk.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/mssdk.py
rename to scons/scons-local-2.3.1/SCons/Tool/mssdk.py
index 84291bcba..6112bff65 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/mssdk.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/mssdk.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/Tool/mssdk.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/mssdk.py 2014/03/02 14:18:15 garyo"
"""engine.SCons.Tool.mssdk
diff --git a/scons/scons-local-2.3.0/SCons/Tool/msvc.py b/scons/scons-local-2.3.1/SCons/Tool/msvc.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/msvc.py
rename to scons/scons-local-2.3.1/SCons/Tool/msvc.py
index 552c8ef04..e09fe9f89 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/msvc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/msvc.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/msvc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/msvc.py 2014/03/02 14:18:15 garyo"
import os.path
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/msvs.py b/scons/scons-local-2.3.1/SCons/Tool/msvs.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/msvs.py
rename to scons/scons-local-2.3.1/SCons/Tool/msvs.py
index 24f382742..6e05b47a7 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/msvs.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/msvs.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# 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/Tool/msvs.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/msvs.py 2014/03/02 14:18:15 garyo"
import SCons.compat
diff --git a/scons/scons-local-2.3.0/SCons/Tool/mwcc.py b/scons/scons-local-2.3.1/SCons/Tool/mwcc.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/mwcc.py
rename to scons/scons-local-2.3.1/SCons/Tool/mwcc.py
index 48433012f..1f12b4864 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/mwcc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/mwcc.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mwcc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/mwcc.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/mwld.py b/scons/scons-local-2.3.1/SCons/Tool/mwld.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/mwld.py
rename to scons/scons-local-2.3.1/SCons/Tool/mwld.py
index ff875a57d..649e22047 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/mwld.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/mwld.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mwld.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/mwld.py 2014/03/02 14:18:15 garyo"
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/nasm.py b/scons/scons-local-2.3.1/SCons/Tool/nasm.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/nasm.py
rename to scons/scons-local-2.3.1/SCons/Tool/nasm.py
index d754a2afb..805eeb046 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/nasm.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/nasm.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/nasm.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/nasm.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/__init__.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/__init__.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/__init__.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/__init__.py
index b0a7549e2..a356f4634 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/__init__.py
@@ -4,7 +4,7 @@ SCons Packaging Tool.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -25,7 +25,7 @@ SCons Packaging Tool.
# 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/Tool/packaging/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/__init__.py 2014/03/02 14:18:15 garyo"
import SCons.Environment
from SCons.Variables import *
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/ipk.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/ipk.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/ipk.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/ipk.py
index 77c6420d9..c7c2ecbea 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/ipk.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/ipk.py
@@ -2,7 +2,7 @@
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/ipk.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/ipk.py 2014/03/02 14:18:15 garyo"
import SCons.Builder
import SCons.Node.FS
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/msi.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/msi.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/msi.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/msi.py
index 26eb63041..5c81c2fe1 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/msi.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/msi.py
@@ -4,7 +4,7 @@ The msi packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -25,7 +25,7 @@ The msi packager.
# 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/Tool/packaging/msi.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/msi.py 2014/03/02 14:18:15 garyo"
import os
import SCons
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/rpm.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/rpm.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/rpm.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/rpm.py
index d60166f7c..049bf4597 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/rpm.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/rpm.py
@@ -4,7 +4,7 @@ The rpm packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -25,7 +25,7 @@ The rpm packager.
# 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/Tool/packaging/rpm.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/rpm.py 2014/03/02 14:18:15 garyo"
import os
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/src_tarbz2.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/src_tarbz2.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/src_tarbz2.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/src_tarbz2.py
index 1da2becae..6a98b385d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/src_tarbz2.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/src_tarbz2.py
@@ -4,7 +4,7 @@ The tarbz2 SRC packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ The tarbz2 SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/src_tarbz2.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/src_tarbz2.py 2014/03/02 14:18:15 garyo"
from SCons.Tool.packaging import putintopackageroot
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/src_targz.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/src_targz.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/src_targz.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/src_targz.py
index bde3316fe..de7d17b22 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/src_targz.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/src_targz.py
@@ -4,7 +4,7 @@ The targz SRC packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ The targz SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/src_targz.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/src_targz.py 2014/03/02 14:18:15 garyo"
from SCons.Tool.packaging import putintopackageroot
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/src_zip.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/src_zip.py
similarity index 91%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/src_zip.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/src_zip.py
index e5a752e36..86160dece 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/src_zip.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/src_zip.py
@@ -4,7 +4,7 @@ The zip SRC packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ The zip SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/src_zip.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/src_zip.py 2014/03/02 14:18:15 garyo"
from SCons.Tool.packaging import putintopackageroot
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/tarbz2.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/tarbz2.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/tarbz2.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/tarbz2.py
index 0c8e4e768..7df69320d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/tarbz2.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/tarbz2.py
@@ -4,7 +4,7 @@ The tarbz2 SRC packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ The tarbz2 SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/tarbz2.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/tarbz2.py 2014/03/02 14:18:15 garyo"
from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/targz.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/targz.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/targz.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/targz.py
index 32b74cfb9..6a9024ceb 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/targz.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/targz.py
@@ -4,7 +4,7 @@ The targz SRC packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ The targz SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/targz.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/targz.py 2014/03/02 14:18:15 garyo"
from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot
diff --git a/scons/scons-local-2.3.0/SCons/Tool/packaging/zip.py b/scons/scons-local-2.3.1/SCons/Tool/packaging/zip.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/Tool/packaging/zip.py
rename to scons/scons-local-2.3.1/SCons/Tool/packaging/zip.py
index 1f34581e1..862589ca7 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/packaging/zip.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/packaging/zip.py
@@ -4,7 +4,7 @@ The zip SRC packager.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ The zip SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/zip.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/packaging/zip.py 2014/03/02 14:18:15 garyo"
from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot
diff --git a/scons/scons-local-2.3.0/SCons/Tool/pdf.py b/scons/scons-local-2.3.1/SCons/Tool/pdf.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/pdf.py
rename to scons/scons-local-2.3.1/SCons/Tool/pdf.py
index 1b68f107b..b93891d39 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/pdf.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/pdf.py
@@ -6,7 +6,7 @@ Add an explicit action to run epstopdf to convert .eps files to .pdf
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ Add an explicit action to run epstopdf to convert .eps files to .pdf
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/pdf.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/pdf.py 2014/03/02 14:18:15 garyo"
import SCons.Builder
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/pdflatex.py b/scons/scons-local-2.3.1/SCons/Tool/pdflatex.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/pdflatex.py
rename to scons/scons-local-2.3.1/SCons/Tool/pdflatex.py
index 80756d184..a5ec45876 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/pdflatex.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/pdflatex.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/pdflatex.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/pdflatex.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/pdftex.py b/scons/scons-local-2.3.1/SCons/Tool/pdftex.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/pdftex.py
rename to scons/scons-local-2.3.1/SCons/Tool/pdftex.py
index 34ca325b0..aa002ad10 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/pdftex.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/pdftex.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/pdftex.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/pdftex.py 2014/03/02 14:18:15 garyo"
import os
import SCons.Action
diff --git a/scons/scons-local-2.3.0/SCons/Tool/qt.py b/scons/scons-local-2.3.1/SCons/Tool/qt.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/qt.py
rename to scons/scons-local-2.3.1/SCons/Tool/qt.py
index 96e14b1cf..22c777000 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/qt.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/qt.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/qt.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/qt.py 2014/03/02 14:18:15 garyo"
import os.path
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/rmic.py b/scons/scons-local-2.3.1/SCons/Tool/rmic.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/rmic.py
rename to scons/scons-local-2.3.1/SCons/Tool/rmic.py
index df90bc081..689d823b0 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/rmic.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/rmic.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/rmic.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/rmic.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/rpcgen.py b/scons/scons-local-2.3.1/SCons/Tool/rpcgen.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/rpcgen.py
rename to scons/scons-local-2.3.1/SCons/Tool/rpcgen.py
index 309db8299..2caf244fe 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/rpcgen.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/rpcgen.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/rpcgen.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/rpcgen.py 2014/03/02 14:18:15 garyo"
from SCons.Builder import Builder
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/rpm.py b/scons/scons-local-2.3.1/SCons/Tool/rpm.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/rpm.py
rename to scons/scons-local-2.3.1/SCons/Tool/rpm.py
index ef31bd574..9be0d796d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/rpm.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/rpm.py
@@ -11,7 +11,7 @@ tar.gz consisting of the source file and a specfile.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ tar.gz consisting of the source file and a specfile.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/rpm.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/rpm.py 2014/03/02 14:18:15 garyo"
import os
import re
@@ -79,7 +79,7 @@ def build_rpm(target, source, env):
errstr=output,
filename=str(target[0]) )
else:
- # XXX: assume that LC_ALL=c is set while running rpmbuild
+ # XXX: assume that LC_ALL=C is set while running rpmbuild
output_files = re.compile( 'Wrote: (.*)' ).findall( output )
for output, input in zip( output_files, target ):
@@ -117,7 +117,7 @@ def generate(env):
bld = RpmBuilder
env['BUILDERS']['Rpm'] = bld
- env.SetDefault(RPM = 'LC_ALL=c rpmbuild')
+ env.SetDefault(RPM = 'LC_ALL=C rpmbuild')
env.SetDefault(RPMFLAGS = SCons.Util.CLVar('-ta'))
env.SetDefault(RPMCOM = rpmAction)
env.SetDefault(RPMSUFFIX = '.rpm')
diff --git a/scons/scons-local-2.3.0/SCons/Tool/rpmutils.py b/scons/scons-local-2.3.1/SCons/Tool/rpmutils.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/rpmutils.py
rename to scons/scons-local-2.3.1/SCons/Tool/rpmutils.py
index 16d980a4f..f482fbbf2 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/rpmutils.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/rpmutils.py
@@ -14,7 +14,7 @@ exact syntax.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -35,7 +35,7 @@ exact syntax.
# 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/Tool/rpmutils.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/rpmutils.py 2014/03/02 14:18:15 garyo"
import platform
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sgiar.py b/scons/scons-local-2.3.1/SCons/Tool/sgiar.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/sgiar.py
rename to scons/scons-local-2.3.1/SCons/Tool/sgiar.py
index 27f5f7544..a1a94a57d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sgiar.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sgiar.py
@@ -11,7 +11,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgiar.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sgiar.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sgic++.py b/scons/scons-local-2.3.1/SCons/Tool/sgic++.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/sgic++.py
rename to scons/scons-local-2.3.1/SCons/Tool/sgic++.py
index ae2ac2c4b..4dcdc1d72 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sgic++.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sgic++.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgic++.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sgic++.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sgicc.py b/scons/scons-local-2.3.1/SCons/Tool/sgicc.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/sgicc.py
rename to scons/scons-local-2.3.1/SCons/Tool/sgicc.py
index 54e05a31b..15c34c19d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sgicc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sgicc.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgicc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sgicc.py 2014/03/02 14:18:15 garyo"
import cc
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sgilink.py b/scons/scons-local-2.3.1/SCons/Tool/sgilink.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/sgilink.py
rename to scons/scons-local-2.3.1/SCons/Tool/sgilink.py
index 82c44193e..10069c6cc 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sgilink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sgilink.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgilink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sgilink.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sunar.py b/scons/scons-local-2.3.1/SCons/Tool/sunar.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/sunar.py
rename to scons/scons-local-2.3.1/SCons/Tool/sunar.py
index 3a4d7c2dc..154e44f7f 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sunar.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sunar.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunar.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sunar.py 2014/03/02 14:18:15 garyo"
import SCons.Defaults
import SCons.Tool
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sunc++.py b/scons/scons-local-2.3.1/SCons/Tool/sunc++.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/sunc++.py
rename to scons/scons-local-2.3.1/SCons/Tool/sunc++.py
index 7234239e0..2f1ceaf06 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sunc++.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sunc++.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunc++.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sunc++.py 2014/03/02 14:18:15 garyo"
import SCons
diff --git a/scons/scons-local-2.3.0/SCons/Tool/suncc.py b/scons/scons-local-2.3.1/SCons/Tool/suncc.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/suncc.py
rename to scons/scons-local-2.3.1/SCons/Tool/suncc.py
index f7442d8bd..67edb8ae4 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/suncc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/suncc.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/suncc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/suncc.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sunf77.py b/scons/scons-local-2.3.1/SCons/Tool/sunf77.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/sunf77.py
rename to scons/scons-local-2.3.1/SCons/Tool/sunf77.py
index eb6378156..5eb664de4 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sunf77.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sunf77.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunf77.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sunf77.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sunf90.py b/scons/scons-local-2.3.1/SCons/Tool/sunf90.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/sunf90.py
rename to scons/scons-local-2.3.1/SCons/Tool/sunf90.py
index cfee2ee7c..0a08c70e9 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sunf90.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sunf90.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunf90.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sunf90.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sunf95.py b/scons/scons-local-2.3.1/SCons/Tool/sunf95.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/sunf95.py
rename to scons/scons-local-2.3.1/SCons/Tool/sunf95.py
index 31d57b11e..fd0be66ea 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sunf95.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sunf95.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunf95.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sunf95.py 2014/03/02 14:18:15 garyo"
import SCons.Util
diff --git a/scons/scons-local-2.3.0/SCons/Tool/sunlink.py b/scons/scons-local-2.3.1/SCons/Tool/sunlink.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/Tool/sunlink.py
rename to scons/scons-local-2.3.1/SCons/Tool/sunlink.py
index 46393417e..5cc6024cb 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/sunlink.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/sunlink.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunlink.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/sunlink.py 2014/03/02 14:18:15 garyo"
import os
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/swig.py b/scons/scons-local-2.3.1/SCons/Tool/swig.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/swig.py
rename to scons/scons-local-2.3.1/SCons/Tool/swig.py
index 6bbe922cb..188d229df 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/swig.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/swig.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/swig.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/swig.py 2014/03/02 14:18:15 garyo"
import os.path
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/tar.py b/scons/scons-local-2.3.1/SCons/Tool/tar.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Tool/tar.py
rename to scons/scons-local-2.3.1/SCons/Tool/tar.py
index e28935839..9c09f0e58 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/tar.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/tar.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/tar.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/tar.py 2014/03/02 14:18:15 garyo"
import SCons.Action
import SCons.Builder
diff --git a/scons/scons-local-2.3.0/SCons/Tool/tex.py b/scons/scons-local-2.3.1/SCons/Tool/tex.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Tool/tex.py
rename to scons/scons-local-2.3.1/SCons/Tool/tex.py
index 59606348c..515002ced 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/tex.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/tex.py
@@ -10,7 +10,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/tex.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/tex.py 2014/03/02 14:18:15 garyo"
import os.path
import re
diff --git a/scons/scons-local-2.3.0/SCons/Tool/textfile.py b/scons/scons-local-2.3.1/SCons/Tool/textfile.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/textfile.py
rename to scons/scons-local-2.3.1/SCons/Tool/textfile.py
index 5e8307bf0..048b0f0d6 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/textfile.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/textfile.py
@@ -1,6 +1,6 @@
# -*- python -*-
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -44,7 +44,7 @@ Textfile/Substfile builder for SCons.
is unpredictible whether the expansion will occur.
"""
-__revision__ = "src/engine/SCons/Tool/textfile.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/textfile.py 2014/03/02 14:18:15 garyo"
import SCons
diff --git a/scons/scons-local-2.3.0/SCons/Tool/tlib.py b/scons/scons-local-2.3.1/SCons/Tool/tlib.py
similarity index 93%
rename from scons/scons-local-2.3.0/SCons/Tool/tlib.py
rename to scons/scons-local-2.3.1/SCons/Tool/tlib.py
index 5a30712ff..834d5d5d4 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/tlib.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/tlib.py
@@ -5,7 +5,7 @@ XXX
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ XXX
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/tlib.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/tlib.py 2014/03/02 14:18:15 garyo"
import SCons.Tool
import SCons.Tool.bcc32
diff --git a/scons/scons-local-2.3.0/SCons/Tool/wix.py b/scons/scons-local-2.3.1/SCons/Tool/wix.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Tool/wix.py
rename to scons/scons-local-2.3.1/SCons/Tool/wix.py
index 5b4c606bf..1cc2ef25d 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/wix.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/wix.py
@@ -8,7 +8,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/wix.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/wix.py 2014/03/02 14:18:15 garyo"
import SCons.Builder
import SCons.Action
diff --git a/scons/scons-local-2.3.0/SCons/Tool/xgettext.py b/scons/scons-local-2.3.1/SCons/Tool/xgettext.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Tool/xgettext.py
rename to scons/scons-local-2.3.1/SCons/Tool/xgettext.py
index 6de021ace..3224ec929 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/xgettext.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/xgettext.py
@@ -3,7 +3,7 @@
Tool specific initialization of `xgettext` tool.
"""
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@ Tool specific initialization of `xgettext` tool.
# 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/Tool/xgettext.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/xgettext.py 2014/03/02 14:18:15 garyo"
#############################################################################
class _CmdRunner(object):
diff --git a/scons/scons-local-2.3.0/SCons/Tool/yacc.py b/scons/scons-local-2.3.1/SCons/Tool/yacc.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Tool/yacc.py
rename to scons/scons-local-2.3.1/SCons/Tool/yacc.py
index 1934181f7..15aca3968 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/yacc.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/yacc.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/yacc.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/yacc.py 2014/03/02 14:18:15 garyo"
import os.path
diff --git a/scons/scons-local-2.3.0/SCons/Tool/zip.py b/scons/scons-local-2.3.1/SCons/Tool/zip.py
similarity index 90%
rename from scons/scons-local-2.3.0/SCons/Tool/zip.py
rename to scons/scons-local-2.3.1/SCons/Tool/zip.py
index 86ae55e16..8a914cf2a 100644
--- a/scons/scons-local-2.3.0/SCons/Tool/zip.py
+++ b/scons/scons-local-2.3.1/SCons/Tool/zip.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/zip.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/zip.py 2014/03/02 14:18:15 garyo"
import os.path
@@ -57,9 +57,9 @@ if internal_zip:
for fname in filenames:
path = os.path.join(dirpath, fname)
if os.path.isfile(path):
- zf.write(path)
+ zf.write(path, os.path.relpath(path, str(env.get('ZIPROOT', ''))))
else:
- zf.write(str(s))
+ zf.write(str(s), os.path.relpath(str(s), str(env.get('ZIPROOT', ''))))
zf.close()
else:
zipcompression = 0
@@ -88,6 +88,7 @@ def generate(env):
env['ZIPCOM'] = zipAction
env['ZIPCOMPRESSION'] = zipcompression
env['ZIPSUFFIX'] = '.zip'
+ env['ZIPROOT'] = SCons.Util.CLVar('')
def exists(env):
return internal_zip or env.Detect('zip')
diff --git a/scons/scons-local-2.3.0/SCons/Util.py b/scons/scons-local-2.3.1/SCons/Util.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/Util.py
rename to scons/scons-local-2.3.1/SCons/Util.py
index 9f66ce099..9fc649bd5 100644
--- a/scons/scons-local-2.3.0/SCons/Util.py
+++ b/scons/scons-local-2.3.1/SCons/Util.py
@@ -3,7 +3,7 @@
Various utility functions go here.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -24,7 +24,7 @@ Various utility functions go here.
# 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/Util.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Util.py 2014/03/02 14:18:15 garyo"
import os
import sys
diff --git a/scons/scons-local-2.3.0/SCons/Variables/BoolVariable.py b/scons/scons-local-2.3.1/SCons/Variables/BoolVariable.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/Variables/BoolVariable.py
rename to scons/scons-local-2.3.1/SCons/Variables/BoolVariable.py
index cdfe3671d..e7814bbb7 100644
--- a/scons/scons-local-2.3.0/SCons/Variables/BoolVariable.py
+++ b/scons/scons-local-2.3.1/SCons/Variables/BoolVariable.py
@@ -12,7 +12,7 @@ Usage example:
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -34,7 +34,7 @@ Usage example:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/BoolVariable.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Variables/BoolVariable.py 2014/03/02 14:18:15 garyo"
__all__ = ['BoolVariable',]
diff --git a/scons/scons-local-2.3.0/SCons/Variables/EnumVariable.py b/scons/scons-local-2.3.1/SCons/Variables/EnumVariable.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Variables/EnumVariable.py
rename to scons/scons-local-2.3.1/SCons/Variables/EnumVariable.py
index 9e2970f6b..33fa45bf2 100644
--- a/scons/scons-local-2.3.0/SCons/Variables/EnumVariable.py
+++ b/scons/scons-local-2.3.1/SCons/Variables/EnumVariable.py
@@ -15,7 +15,7 @@ Usage example:
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -37,7 +37,7 @@ Usage example:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/EnumVariable.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Variables/EnumVariable.py 2014/03/02 14:18:15 garyo"
__all__ = ['EnumVariable',]
diff --git a/scons/scons-local-2.3.0/SCons/Variables/ListVariable.py b/scons/scons-local-2.3.1/SCons/Variables/ListVariable.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/Variables/ListVariable.py
rename to scons/scons-local-2.3.1/SCons/Variables/ListVariable.py
index 735d5257b..e831f68cb 100644
--- a/scons/scons-local-2.3.0/SCons/Variables/ListVariable.py
+++ b/scons/scons-local-2.3.1/SCons/Variables/ListVariable.py
@@ -25,7 +25,7 @@ Usage example:
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -46,7 +46,7 @@ Usage example:
# 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/Variables/ListVariable.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Variables/ListVariable.py 2014/03/02 14:18:15 garyo"
# Know Bug: This should behave like a Set-Type, but does not really,
# since elements can occur twice.
diff --git a/scons/scons-local-2.3.0/SCons/Variables/PackageVariable.py b/scons/scons-local-2.3.1/SCons/Variables/PackageVariable.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Variables/PackageVariable.py
rename to scons/scons-local-2.3.1/SCons/Variables/PackageVariable.py
index 665692c6c..72e3674d5 100644
--- a/scons/scons-local-2.3.0/SCons/Variables/PackageVariable.py
+++ b/scons/scons-local-2.3.1/SCons/Variables/PackageVariable.py
@@ -28,7 +28,7 @@ Usage example:
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -50,7 +50,7 @@ Usage example:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/PackageVariable.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Variables/PackageVariable.py 2014/03/02 14:18:15 garyo"
__all__ = ['PackageVariable',]
diff --git a/scons/scons-local-2.3.0/SCons/Variables/PathVariable.py b/scons/scons-local-2.3.1/SCons/Variables/PathVariable.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Variables/PathVariable.py
rename to scons/scons-local-2.3.1/SCons/Variables/PathVariable.py
index b79a7606a..556de5911 100644
--- a/scons/scons-local-2.3.0/SCons/Variables/PathVariable.py
+++ b/scons/scons-local-2.3.1/SCons/Variables/PathVariable.py
@@ -46,7 +46,7 @@ Usage example:
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -68,7 +68,7 @@ Usage example:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/PathVariable.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Variables/PathVariable.py 2014/03/02 14:18:15 garyo"
__all__ = ['PathVariable',]
diff --git a/scons/scons-local-2.3.0/SCons/Variables/__init__.py b/scons/scons-local-2.3.1/SCons/Variables/__init__.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/Variables/__init__.py
rename to scons/scons-local-2.3.1/SCons/Variables/__init__.py
index 3d9d8452a..f5e9b93d1 100644
--- a/scons/scons-local-2.3.0/SCons/Variables/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/Variables/__init__.py
@@ -5,7 +5,7 @@ customizable variables to an SCons build.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ customizable variables to an SCons build.
# 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/Variables/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Variables/__init__.py 2014/03/02 14:18:15 garyo"
import os.path
import sys
diff --git a/scons/scons-local-2.3.0/SCons/Warnings.py b/scons/scons-local-2.3.1/SCons/Warnings.py
similarity index 97%
rename from scons/scons-local-2.3.0/SCons/Warnings.py
rename to scons/scons-local-2.3.1/SCons/Warnings.py
index d7cadc25a..bbbd1dc4b 100644
--- a/scons/scons-local-2.3.0/SCons/Warnings.py
+++ b/scons/scons-local-2.3.1/SCons/Warnings.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ This file implements the warnings framework for SCons.
"""
-__revision__ = "src/engine/SCons/Warnings.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Warnings.py 2014/03/02 14:18:15 garyo"
import sys
@@ -42,6 +42,9 @@ class WarningOnByDefault(Warning):
# NOTE: If you add a new warning class, add it to the man page, too!
+class TargetNotBuiltWarning(Warning): # Should go to OnByDefault
+ pass
+
class CacheWriteErrorWarning(Warning):
pass
diff --git a/scons/scons-local-2.3.0/SCons/__init__.py b/scons/scons-local-2.3.1/SCons/__init__.py
similarity index 87%
rename from scons/scons-local-2.3.0/SCons/__init__.py
rename to scons/scons-local-2.3.1/SCons/__init__.py
index d1a369f4f..f41a1b6b9 100644
--- a/scons/scons-local-2.3.0/SCons/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/__init__.py
@@ -5,7 +5,7 @@ The main package for the SCons software construction utility.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,15 +27,15 @@ The main package for the SCons software construction utility.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/__init__.py 2014/03/02 14:18:15 garyo"
-__version__ = "2.3.0"
+__version__ = "2.3.1"
__build__ = ""
-__buildsys__ = "reepicheep"
+__buildsys__ = "lubuntu"
-__date__ = "2013/03/03 09:48:35"
+__date__ = "2014/03/02 14:18:15"
__developer__ = "garyo"
diff --git a/scons/scons-local-2.3.0/SCons/compat/__init__.py b/scons/scons-local-2.3.1/SCons/compat/__init__.py
similarity index 98%
rename from scons/scons-local-2.3.0/SCons/compat/__init__.py
rename to scons/scons-local-2.3.1/SCons/compat/__init__.py
index 56f374259..832dff6b5 100644
--- a/scons/scons-local-2.3.0/SCons/compat/__init__.py
+++ b/scons/scons-local-2.3.1/SCons/compat/__init__.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -60,7 +60,7 @@ function defined below loads the module as the "real" name (without the
rest of our code will find our pre-loaded compatibility module.
"""
-__revision__ = "src/engine/SCons/compat/__init__.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/compat/__init__.py 2014/03/02 14:18:15 garyo"
import os
import sys
diff --git a/scons/scons-local-2.3.0/SCons/compat/_scons_builtins.py b/scons/scons-local-2.3.1/SCons/compat/_scons_builtins.py
similarity index 96%
rename from scons/scons-local-2.3.0/SCons/compat/_scons_builtins.py
rename to scons/scons-local-2.3.1/SCons/compat/_scons_builtins.py
index 1202d46e0..532703228 100644
--- a/scons/scons-local-2.3.0/SCons/compat/_scons_builtins.py
+++ b/scons/scons-local-2.3.1/SCons/compat/_scons_builtins.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -51,7 +51,7 @@ the FUNCTIONS or DATA output, that means those names are already built in
to this version of Python and we don't need to add them from this module.
"""
-__revision__ = "src/engine/SCons/compat/_scons_builtins.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/compat/_scons_builtins.py 2014/03/02 14:18:15 garyo"
import builtins
diff --git a/scons/scons-local-2.3.0/SCons/compat/_scons_collections.py b/scons/scons-local-2.3.1/SCons/compat/_scons_collections.py
similarity index 95%
rename from scons/scons-local-2.3.0/SCons/compat/_scons_collections.py
rename to scons/scons-local-2.3.1/SCons/compat/_scons_collections.py
index 7cf685ccd..94352acc3 100644
--- a/scons/scons-local-2.3.0/SCons/compat/_scons_collections.py
+++ b/scons/scons-local-2.3.1/SCons/compat/_scons_collections.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ used by SCons, in an interface that looks enough like collections for
our purposes.
"""
-__revision__ = "src/engine/SCons/compat/_scons_collections.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/compat/_scons_collections.py 2014/03/02 14:18:15 garyo"
# Use exec to hide old names from fixers.
exec("""if True:
diff --git a/scons/scons-local-2.3.0/SCons/compat/_scons_dbm.py b/scons/scons-local-2.3.1/SCons/compat/_scons_dbm.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/compat/_scons_dbm.py
rename to scons/scons-local-2.3.1/SCons/compat/_scons_dbm.py
index e6df06341..dd02ed1a5 100644
--- a/scons/scons-local-2.3.0/SCons/compat/_scons_dbm.py
+++ b/scons/scons-local-2.3.1/SCons/compat/_scons_dbm.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ that the whichdb.whichdb() implementstation in the various 2.X versions of
Python won't blow up even if dbm wasn't compiled in.
"""
-__revision__ = "src/engine/SCons/compat/_scons_dbm.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/compat/_scons_dbm.py 2014/03/02 14:18:15 garyo"
class error(Exception):
pass
diff --git a/scons/scons-local-2.3.0/SCons/compat/_scons_hashlib.py b/scons/scons-local-2.3.1/SCons/compat/_scons_hashlib.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/compat/_scons_hashlib.py
rename to scons/scons-local-2.3.1/SCons/compat/_scons_hashlib.py
index d4e30232b..32975727d 100644
--- a/scons/scons-local-2.3.0/SCons/compat/_scons_hashlib.py
+++ b/scons/scons-local-2.3.1/SCons/compat/_scons_hashlib.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ purposes, anyway). In fact, this module will raise an ImportError if
the underlying md5 module isn't available.
"""
-__revision__ = "src/engine/SCons/compat/_scons_hashlib.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/compat/_scons_hashlib.py 2014/03/02 14:18:15 garyo"
import md5
from string import hexdigits
diff --git a/scons/scons-local-2.3.0/SCons/compat/_scons_io.py b/scons/scons-local-2.3.1/SCons/compat/_scons_io.py
similarity index 92%
rename from scons/scons-local-2.3.0/SCons/compat/_scons_io.py
rename to scons/scons-local-2.3.1/SCons/compat/_scons_io.py
index 194029efd..18777eaa4 100644
--- a/scons/scons-local-2.3.0/SCons/compat/_scons_io.py
+++ b/scons/scons-local-2.3.1/SCons/compat/_scons_io.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@ functionality. It only wraps the portions of io functionality used
by SCons, in an interface that looks enough like io for our purposes.
"""
-__revision__ = "src/engine/SCons/compat/_scons_io.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/compat/_scons_io.py 2014/03/02 14:18:15 garyo"
# Use the "imp" module to protect the imports below from fixers.
import imp
diff --git a/scons/scons-local-2.3.0/SCons/compat/_scons_sets.py b/scons/scons-local-2.3.1/SCons/compat/_scons_sets.py
similarity index 100%
rename from scons/scons-local-2.3.0/SCons/compat/_scons_sets.py
rename to scons/scons-local-2.3.1/SCons/compat/_scons_sets.py
diff --git a/scons/scons-local-2.3.0/SCons/compat/_scons_subprocess.py b/scons/scons-local-2.3.1/SCons/compat/_scons_subprocess.py
similarity index 100%
rename from scons/scons-local-2.3.0/SCons/compat/_scons_subprocess.py
rename to scons/scons-local-2.3.1/SCons/compat/_scons_subprocess.py
diff --git a/scons/scons-local-2.3.0/SCons/cpp.py b/scons/scons-local-2.3.1/SCons/cpp.py
similarity index 99%
rename from scons/scons-local-2.3.0/SCons/cpp.py
rename to scons/scons-local-2.3.1/SCons/cpp.py
index 6999292dc..a5698fd92 100644
--- a/scons/scons-local-2.3.0/SCons/cpp.py
+++ b/scons/scons-local-2.3.1/SCons/cpp.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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/cpp.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/cpp.py 2014/03/02 14:18:15 garyo"
__doc__ = """
SCons C Pre-Processor module
diff --git a/scons/scons-local-2.3.0/SCons/dblite.py b/scons/scons-local-2.3.1/SCons/dblite.py
similarity index 100%
rename from scons/scons-local-2.3.0/SCons/dblite.py
rename to scons/scons-local-2.3.1/SCons/dblite.py
diff --git a/scons/scons-local-2.3.0/SCons/exitfuncs.py b/scons/scons-local-2.3.1/SCons/exitfuncs.py
similarity index 94%
rename from scons/scons-local-2.3.0/SCons/exitfuncs.py
rename to scons/scons-local-2.3.1/SCons/exitfuncs.py
index 26df1983d..586eb2796 100644
--- a/scons/scons-local-2.3.0/SCons/exitfuncs.py
+++ b/scons/scons-local-2.3.1/SCons/exitfuncs.py
@@ -5,7 +5,7 @@ Register functions which are executed when SCons exits for any reason.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -27,7 +27,7 @@ Register functions which are executed when SCons exits for any reason.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/exitfuncs.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/exitfuncs.py 2014/03/02 14:18:15 garyo"
import atexit
diff --git a/scons/scons-local-2.3.0/scons-2.3.0.egg-info b/scons/scons-local-2.3.1/scons-2.3.1.egg-info
similarity index 96%
rename from scons/scons-local-2.3.0/scons-2.3.0.egg-info
rename to scons/scons-local-2.3.1/scons-2.3.1.egg-info
index cd00aa720..bfd6e3f79 100644
--- a/scons/scons-local-2.3.0/scons-2.3.0.egg-info
+++ b/scons/scons-local-2.3.1/scons-2.3.1.egg-info
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: scons
-Version: 2.3.0
+Version: 2.3.1
Summary: Open Source next-generation build tool.
Home-page: http://www.scons.org/
Author: Steven Knight
diff --git a/scons/scons-time.py b/scons/scons-time.py
index 2b67410ec..0a515666b 100755
--- a/scons/scons-time.py
+++ b/scons/scons-time.py
@@ -9,7 +9,7 @@
#
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@
from __future__ import division
from __future__ import nested_scopes
-__revision__ = "src/script/scons-time.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/script/scons-time.py 2014/03/02 14:18:15 garyo"
import getopt
import glob
diff --git a/scons/scons.py b/scons/scons.py
index 466c72833..87919a1ae 100755
--- a/scons/scons.py
+++ b/scons/scons.py
@@ -2,7 +2,7 @@
#
# SCons - a Software Constructor
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -23,15 +23,15 @@
# 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/script/scons.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/script/scons.py 2014/03/02 14:18:15 garyo"
-__version__ = "2.3.0"
+__version__ = "2.3.1"
__build__ = ""
-__buildsys__ = "reepicheep"
+__buildsys__ = "lubuntu"
-__date__ = "2013/03/03 09:48:35"
+__date__ = "2014/03/02 14:18:15"
__developer__ = "garyo"
diff --git a/scons/sconsign.py b/scons/sconsign.py
index 99f0ee83d..0c243229d 100755
--- a/scons/sconsign.py
+++ b/scons/sconsign.py
@@ -2,7 +2,7 @@
#
# SCons - a Software Constructor
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -23,15 +23,15 @@
# 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/script/sconsign.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/script/sconsign.py 2014/03/02 14:18:15 garyo"
-__version__ = "2.3.0"
+__version__ = "2.3.1"
__build__ = ""
-__buildsys__ = "reepicheep"
+__buildsys__ = "lubuntu"
-__date__ = "2013/03/03 09:48:35"
+__date__ = "2014/03/02 14:18:15"
__developer__ = "garyo"