diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 14:14:33 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2010-03-10 14:14:33 +0100 |
| commit | df69433d6a185b997f1ec3c0d30768061c5b500f (patch) | |
| tree | f976ed6769e1273e04dca843c18d8bf87fc9b976 | |
| parent | da3aa9be25ad2463a8f27318b914d2322f782a9e (diff) | |
| parent | 68e4fe5ac49effe8959bc8532584edf04553c931 (diff) | |
Merge commit 'upstream/1.2.0.d20100306'
261 files changed, 806 insertions, 441 deletions
@@ -9,7 +9,7 @@ copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010' # This gets inserted into the man pages to reflect the month of release. -month_year = 'January 2010' +month_year = 'March 2010' # # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation @@ -798,7 +798,7 @@ for p in [ scons ]: # # Now run everything in src_file through the sed command we - # concocted to expand SConstruct, 1.2.0.d20100117, etc. + # concocted to expand SConstruct, 1.2.0.d20100306, etc. # for b in src_files: s = p['filemap'].get(b, b) diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py index d3a043b..cd78195 100644 --- a/bin/SConsDoc.py +++ b/bin/SConsDoc.py @@ -5,8 +5,8 @@ __doc__ = """ This module parses home-brew XML files that document various things -in SCons. Right now, it handles Builders, construction variables, -and Tools, but we expect it to get extended in the future. +in SCons. Right now, it handles Builders, functions, construction +variables, and Tools, but we expect it to get extended in the future. In general, you can use any DocBook tag in the input, and this module just adds processing various home-brew tags to try to make life a @@ -14,14 +14,14 @@ little easier. Builder example: - <builder name="VARIABLE"> + <builder name="BUILDER"> <summary> - This is the summary description of an SCons Tool. + This is the summary description of an SCons Builder. It will get placed in the man page, and in the appropriate User's Guide appendix. The name of any builder may be interpolated anywhere in the document by specifying the - &b-VARIABLE; + &b-BUILDER; element. It need not be on a line by itself. Unlike normal XML, blank lines are significant in these @@ -35,6 +35,32 @@ Builder example: </summary> </builder> +Function example: + + <scons_function name="FUNCTION"> + <arguments> + (arg1, arg2, key=value) + </arguments> + <summary> + This is the summary description of an SCons function. + It will get placed in the man page, + and in the appropriate User's Guide appendix. + The name of any builder may be interpolated + anywhere in the document by specifying the + &f-FUNCTION; + element. It need not be on a line by itself. + + Unlike normal XML, blank lines are significant in these + descriptions and serve to separate paragraphs. + They'll get replaced in DocBook output with appropriate tags + to indicate a new paragraph. + + <example> + print "this is example code, it will be offset and indented" + </example> + </summary> + </scons_function> + Construction variable example: <cvar name="VARIABLE"> @@ -60,14 +86,14 @@ Construction variable example: Tool example: - <tool name="VARIABLE"> + <tool name="TOOL"> <summary> This is the summary description of an SCons Tool. It will get placed in the man page, and in the appropriate User's Guide appendix. The name of any tool may be interpolated anywhere in the document by specifying the - &t-VARIABLE; + &t-TOOL; element. It need not be on a line by itself. Unlike normal XML, blank lines are significant in these @@ -82,12 +108,13 @@ Tool example: </tool> """ -import os.path import imp +import os.path +import re import sys import xml.sax.handler -class Item: +class Item(object): def __init__(self, name): self.name = name self.sort_name = name.lower() @@ -106,6 +133,12 @@ class Item: class Builder(Item): pass +class Function(Item): + def __init__(self, name, global_signature, env_signature): + super(Function, self).__init__(name) + self.global_signature = global_signature + self.env_signature = env_signature + class Tool(Item): def __init__(self, name): Item.__init__(self, name) @@ -126,6 +159,22 @@ class Chunk: def append(self, data): self.body.append(data) +class Arguments: + def __init__(self, body=None): + if not body: + body = [] + self.body = body + def __str__(self): + s = ''.join(self.body).strip() + result = [] + for m in re.findall('([a-zA-Z/_]+|[^a-zA-Z/_]+)', s): + if ' ' in m: + m = '"%s"' % m + result.append(m) + return ' '.join(result) + def append(self, data): + self.body.append(data) + class Summary: def __init__(self): self.body = [] @@ -181,6 +230,7 @@ class SConsDocHandler(xml.sax.handler.ContentHandler, self.collect = [] self.current_object = [] self.builders = {} + self.functions = {} self.tools = {} self.cvars = {} @@ -244,6 +294,19 @@ class SConsDocHandler(xml.sax.handler.ContentHandler, def end_builder(self): self.end_xxx() + def start_scons_function(self, attrs): + name = attrs.get('name') + try: + function = self.functions[name] + except KeyError: + function = Function(name, + attrs.get('global', "1"), + attrs.get('env', "1")) + self.functions[name] = function + self.begin_xxx(function) + def end_scons_function(self): + self.end_xxx() + def start_tool(self, attrs): name = attrs.get('name') try: @@ -266,6 +329,14 @@ class SConsDocHandler(xml.sax.handler.ContentHandler, def end_cvar(self): self.end_xxx() + def start_arguments(self, attrs): + arguments = Arguments() + self.current_object.arguments = arguments + self.begin_xxx(arguments) + self.begin_collecting(arguments) + def end_arguments(self): + self.end_xxx() + def start_summary(self, attrs): summary = Summary() self.current_object.summary = summary diff --git a/bin/import-test.py b/bin/import-test.py index e7d4db4..e0731d0 100644 --- a/bin/import-test.py +++ b/bin/import-test.py @@ -25,7 +25,7 @@ # """ triple-quotes will need to have their contents edited by hand. # -__revision__ = "bin/import-test.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "bin/import-test.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import sys diff --git a/bin/linecount.py b/bin/linecount.py index aa0a8aa..c087963 100644 --- a/bin/linecount.py +++ b/bin/linecount.py @@ -23,7 +23,7 @@ # interesting one for most purposes. # -__revision__ = "bin/linecount.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "bin/linecount.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/bin/restore.sh b/bin/restore.sh index 0eec02f..98ad1ed 100644 --- a/bin/restore.sh +++ b/bin/restore.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh # -# Simple hack script to restore __revision__, __COPYRIGHT_, 1.2.0.d20100117 +# Simple hack script to restore __revision__, __COPYRIGHT_, 1.2.0.d20100306 # and other similar variables to what gets checked in to source. This # comes in handy when people send in diffs based on the released source. # @@ -24,7 +24,7 @@ for i in `find $DIRS -name '*.py'`; do ed $i <<EOF g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation/p w -/^__revision__ = /s/= .*/= "bin/restore.sh 4629 2010/01/17 22:23:21 scons"/p +/^__revision__ = /s/= .*/= "bin/restore.sh 4691 2010/03/06 16:22:36 bdbaddog"/p w q EOF @@ -35,7 +35,7 @@ for i in `find $DIRS -name 'scons.bat'`; do ed $i <<EOF g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation/p w -/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh 4629 2010/01/17 22:23:21 scons/p +/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh 4691 2010/03/06 16:22:36 bdbaddog/p w q EOF @@ -44,15 +44,15 @@ done for i in `find $DIRS -name '__init__.py' -o -name 'scons.py' -o -name 'sconsign.py'`; do header $i ed $i <<EOF -/^__version__ = /s/= .*/= "1.2.0.d20100117"/p +/^__version__ = /s/= .*/= "1.2.0.d20100306"/p w -/^__build__ = /s/= .*/= "r4629"/p +/^__build__ = /s/= .*/= "r4691"/p w -/^__buildsys__ = /s/= .*/= "scons-dev"/p +/^__buildsys__ = /s/= .*/= "mvdog"/p w -/^__date__ = /s/= .*/= "2010/01/17 22:23:21"/p +/^__date__ = /s/= .*/= "2010/03/06 16:22:36"/p w -/^__developer__ = /s/= .*/= "scons"/p +/^__developer__ = /s/= .*/= "bdbaddog"/p w q EOF @@ -61,7 +61,7 @@ done for i in `find $DIRS -name 'setup.py'`; do header $i ed $i <<EOF -/^ *version = /s/= .*/= "1.2.0.d20100117",/p +/^ *version = /s/= .*/= "1.2.0.d20100306",/p w q EOF @@ -72,9 +72,9 @@ for i in `find $DIRS -name '*.txt'`; do ed $i <<EOF g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation/p w -/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh 4629 2010/01/17 22:23:21 scons/p +/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh 4691 2010/03/06 16:22:36 bdbaddog/p w -/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 1.2.0.d20100117/p +/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 1.2.0.d20100306/p w q EOF diff --git a/bin/scons-proc.py b/bin/scons-proc.py index cc3b085..41ff09a 100644 --- a/bin/scons-proc.py +++ b/bin/scons-proc.py @@ -2,8 +2,8 @@ # # Process a list of Python and/or XML files containing SCons documentation. # -# This script creates formatted lists of the Builders, Tools or -# construction variables documented in the specified XML files. +# This script creates formatted lists of the Builders, functions, Tools +# or construction variables documented in the specified XML files. # # Dependening on the options, the lists are output in either # DocBook-formatted generated XML files containing the summary text @@ -24,9 +24,11 @@ base_sys_path = [os.getcwd() + '/build/test-tar-gz/lib/scons'] + sys.path helpstr = """\ Usage: scons-proc.py [--man|--xml] - [-b file(s)] [-t file(s)] [-v file(s)] [infile ...] + [-b file(s)] [-f file(s)] [-t file(s)] [-v file(s)] + [infile ...] Options: -b file(s) dump builder information to the specified file(s) + -f file(s) dump function information to the specified file(s) -t file(s) dump tool information to the specified file(s) -v file(s) dump variable information to the specified file(s) --man print info in man page format, each -[btv] argument @@ -36,11 +38,12 @@ Options: """ opts, args = getopt.getopt(sys.argv[1:], - "b:ht:v:", + "b:f:ht:v:", ['builders=', 'help', 'man', 'xml', 'tools=', 'variables=']) buildersfiles = None +functionsfiles = None output_type = '--xml' toolsfiles = None variablesfiles = None @@ -48,6 +51,8 @@ variablesfiles = None for o, a in opts: if o in ['-b', '--builders']: buildersfiles = a + elif o in ['-f', '--functions']: + functionsfiles = a elif o in ['-h', '--help']: sys.stdout.write(helpstr) sys.exit(0) @@ -122,9 +127,7 @@ Link_Entities_Header = """\ class SCons_XML: def __init__(self, entries, **kw): - values = entries.values() - values.sort() - self.values = values + self.values = entries for k, v in kw.items(): setattr(self, k, v) def fopen(self, name): @@ -143,10 +146,10 @@ class SCons_XML_to_XML(SCons_XML): f = self.fopen(filename) for v in self.values: f.write('\n<varlistentry id="%s%s">\n' % - (self.prefix, self.idfunc(v.name))) - for term in self.termfunc(v.name): + (v.prefix, v.idfunc())) + for term in v.termfunc(): f.write('<term><%s>%s</%s></term>\n' % - (self.tag, term, self.tag)) + (v.tag, term, v.tag)) f.write('<listitem>\n') for chunk in v.summary.body: f.write(str(chunk)) @@ -163,44 +166,40 @@ class SCons_XML_to_XML(SCons_XML): f.write('</listitem>\n') f.write('</varlistentry>\n') def write_mod(self, filename): + description = self.values[0].description if not filename: return f = self.fopen(filename) f.write(Warning) f.write('\n') - f.write(Regular_Entities_Header % self.description) + f.write(Regular_Entities_Header % description) f.write('\n') for v in self.values: f.write('<!ENTITY %s%s "<%s>%s</%s>">\n' % - (self.prefix, self.idfunc(v.name), - self.tag, self.entityfunc(v.name), self.tag)) + (v.prefix, v.idfunc(), + v.tag, v.entityfunc(), v.tag)) f.write('\n') f.write(Warning) f.write('\n') - f.write(Link_Entities_Header % self.description) + f.write(Link_Entities_Header % description) f.write('\n') for v in self.values: f.write('<!ENTITY %slink-%s \'<link linkend="%s%s"><%s>%s</%s></link>\'>\n' % - (self.prefix, self.idfunc(v.name), - self.prefix, self.idfunc(v.name), - self.tag, self.entityfunc(v.name), self.tag)) + (v.prefix, v.idfunc(), + v.prefix, v.idfunc(), + v.tag, v.entityfunc(), v.tag)) f.write('\n') f.write(Warning) class SCons_XML_to_man(SCons_XML): - def mansep(self): - return ['\n'] - def initial_chunks(self, name): - return [name] def write(self, filename): if not filename: return f = self.fopen(filename) chunks = [] for v in self.values: - chunks.extend(self.mansep()) - for n in self.initial_chunks(v.name): - chunks.append('.IP %s\n' % n) + chunks.extend(v.mansep()) + chunks.extend(v.initial_chunks()) chunks.extend(map(str, v.summary.body)) body = ''.join(chunks) @@ -210,28 +209,128 @@ class SCons_XML_to_man(SCons_XML): body = string.replace(body, '<para>\n', '') body = string.replace(body, '<para>', '\n') body = string.replace(body, '</para>\n', '') - body = re.sub('\.EE\n\n+(?!\.IP)', '.EE\n.IP\n', body) + + body = string.replace(body, '<variablelist>\n', '.RS 10\n') + body = re.compile(r'<varlistentry>\n<term>([^<]*)</term>\n<listitem>\n').sub(r'.HP 6\n.B \1\n', body) + body = string.replace(body, '</listitem>\n', '') + body = string.replace(body, '</varlistentry>\n', '') + body = string.replace(body, '</variablelist>\n', '.RE\n') + + body = re.sub(r'\.EE\n\n+(?!\.IP)', '.EE\n.IP\n', body) + body = string.replace(body, '\n.IP\n\'\\"', '\n\n\'\\"') body = re.sub('&(scons|SConstruct|SConscript|jar);', r'\\fB\1\\fP', body) body = string.replace(body, '&Dir;', r'\fBDir\fP') body = string.replace(body, '⌖', r'\fItarget\fP') body = string.replace(body, '&source;', r'\fIsource\fP') body = re.sub('&b(-link)?-([^;]*);', r'\\fB\2\\fP()', body) body = re.sub('&cv(-link)?-([^;]*);', r'$\2', body) - body = re.sub(r'<(command|envar|filename|literal|option)>([^<]*)</\1>', + body = re.sub('&f(-link)?-([^;]*);', r'\\fB\2\\fP()', body) + body = re.sub(r'<(command|envar|filename|function|literal|option)>([^<]*)</\1>', r'\\fB\2\\fP', body) body = re.sub(r'<(classname|emphasis|varname)>([^<]*)</\1>', r'\\fI\2\\fP', body) + body = re.compile(r'^\\f([BI])([^\\]* [^\\]*)\\fP\s*$', re.M).sub(r'.\1 "\2"', body) body = re.compile(r'^\\f([BI])(.*)\\fP\s*$', re.M).sub(r'.\1 \2', body) - body = re.compile(r'^\\f([BI])(.*)\\fP(\S+)', re.M).sub(r'.\1R \2 \3', body) + body = re.compile(r'^\\f([BI])(.*)\\fP(\S+)$', re.M).sub(r'.\1R \2 \3', body) + body = re.compile(r'^(\S+)\\f([BI])(.*)\\fP$', re.M).sub(r'.R\2 \1 \3', body) body = string.replace(body, '<', '<') body = string.replace(body, '>', '>') body = re.sub(r'\\([^f])', r'\\\\\1', body) body = re.compile("^'\\\\\\\\", re.M).sub("'\\\\", body) + body = re.compile(r'^\.([BI]R?) --', re.M).sub(r'.\1 \-\-', body) body = re.compile(r'^\.([BI]R?) -', re.M).sub(r'.\1 \-', body) - body = re.compile(r'^\.([BI]R?) (\S+)\\\\(\S+)', re.M).sub(r'.\1 "\2\\\\\\\\\2"', body) + body = re.compile(r'^\.([BI]R?) (\S+)\\\\(\S+)$', re.M).sub(r'.\1 "\2\\\\\\\\\2"', body) body = re.compile(r'\\f([BI])-', re.M).sub(r'\\f\1\-', body) f.write(body) +class Proxy: + def __init__(self, subject): + """Wrap an object as a Proxy object""" + self.__subject = subject + + def __getattr__(self, name): + """Retrieve an attribute from the wrapped object. If the named + attribute doesn't exist, AttributeError is raised""" + return getattr(self.__subject, name) + + def get(self): + """Retrieve the entire wrapped object""" + return self.__subject + + def __cmp__(self, other): + if issubclass(other.__class__, self.__subject.__class__): + return cmp(self.__subject, other) + return cmp(self.__dict__, other.__dict__) + +class Builder(Proxy): + description = 'builder' + prefix = 'b-' + tag = 'function' + def idfunc(self): + return self.name + def termfunc(self): + return ['%s()' % self.name, 'env.%s()' % self.name] + def entityfunc(self): + return self.name + def mansep(self): + return ['\n', "'\\" + '"'*69 + '\n'] + def initial_chunks(self): + return [ '.IP %s\n' % t for t in self.termfunc() ] + +class Function(Proxy): + description = 'function' + prefix = 'f-' + tag = 'function' + def idfunc(self): + return self.name + def termfunc(self): + return ['%s()' % self.name, 'env.%s()' % self.name] + def entityfunc(self): + return self.name + def mansep(self): + return ['\n', "'\\" + '"'*69 + '\n'] + def initial_chunks(self): + try: + x = self.arguments + except AttributeError: + x = '()' + result = [] + if self.global_signature != "0": + result.append('.TP\n.RI %s%s\n' % (self.name, x)) + if self.env_signature != "0": + result.append('.TP\n.IR env .%s%s\n' % (self.name, x)) + return result + +class Tool(Proxy): + description = 'tool' + prefix = 't-' + tag = 'literal' + def idfunc(self): + return string.replace(self.name, '+', 'X') + def termfunc(self): + return [self.name] + def entityfunc(self): + return self.name + def mansep(self): + return ['\n'] + def initial_chunks(self): + return ['.IP %s\n' % self.name] + +class Variable(Proxy): + description = 'construction variable' + prefix = 'cv-' + tag = 'envar' + def idfunc(self): + return self.name + def termfunc(self): + return [self.name] + def entityfunc(self): + return '$' + self.name + def mansep(self): + return ['\n'] + def initial_chunks(self): + return ['.IP %s\n' % self.name] + if output_type == '--man': processor_class = SCons_XML_to_man elif output_type == '--xml': @@ -241,39 +340,19 @@ else: sys.exit(1) if buildersfiles: - g = processor_class(h.builders, - description = 'builder', - prefix = 'b-', - tag = 'function', - idfunc = lambda x: x, - termfunc = lambda x: [x+'()', 'env.'+x+'()'], - entityfunc = lambda x: x) - - g.mansep = lambda: ['\n', "'\\" + '"'*69 + '\n'] - g.initial_chunks = lambda n: [n+'()', 'env.'+n+'()'] - + g = processor_class([ Builder(b) for b in sorted(h.builders.values()) ]) g.write(buildersfiles) -if toolsfiles: - g = processor_class(h.tools, - description = 'tool', - prefix = 't-', - tag = 'literal', - idfunc = lambda x: string.replace(x, '+', 'X'), - termfunc = lambda x: [x], - entityfunc = lambda x: x) +if functionsfiles: + g = processor_class([ Function(b) for b in sorted(h.functions.values()) ]) + g.write(functionsfiles) +if toolsfiles: + g = processor_class([ Tool(t) for t in sorted(h.tools.values()) ]) g.write(toolsfiles) if variablesfiles: - g = processor_class(h.cvars, - description = 'construction variable', - prefix = 'cv-', - tag = 'envar', - idfunc = lambda x: x, - termfunc = lambda x: [x], - entityfunc = lambda x: '$'+x) - + g = processor_class([ Variable(v) for v in sorted(h.cvars.values()) ]) g.write(variablesfiles) # Local Variables: diff --git a/doc/man/scons-time.1 b/doc/man/scons-time.1 index 36b3eb6..7d86cc0 100644 --- a/doc/man/scons-time.1 +++ b/doc/man/scons-time.1 @@ -19,7 +19,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. .\" -.\" doc/man/scons-time.1 4629 2010/01/17 22:23:21 scons +.\" doc/man/scons-time.1 4691 2010/03/06 16:22:36 bdbaddog .\" .\" ES - Example Start - indents and turns off line fill .de ES @@ -98,7 +98,7 @@ [\fB--which=\fIWHICH\fR] [\fIARGUMENTS\fR] .. -.TH SCONS-TIME 1 "January 2010" +.TH SCONS-TIME 1 "March 2010" .SH NAME scons-time \- generate and display SCons timing information '\"========================================================================== diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 5d0f15d..a5ad799 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -19,9 +19,9 @@ .\" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION .\" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. .\" -.\" doc/man/scons.1 4629 2010/01/17 22:23:21 scons +.\" doc/man/scons.1 4691 2010/03/06 16:22:36 bdbaddog .\" -.TH SCONS 1 "January 2010" +.TH SCONS 1 "March 2010" .\" ES - Example Start - indents and turns off line fill .rm ES .de ES @@ -8292,7 +8292,7 @@ multi-stage builder. .IP single_source Specifies that this builder expects exactly one source file per call. Giving -more than one source files without target files results in implicitely calling +more than one source file without target files results in implicitely calling the builder multiple times (once for each source given). Giving multiple source files together with target files results in a UserError exception. diff --git a/doc/man/sconsign.1 b/doc/man/sconsign.1 index 51d7326..b7be093 100644 --- a/doc/man/sconsign.1 +++ b/doc/man/sconsign.1 @@ -19,7 +19,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. .\" -.\" doc/man/sconsign.1 4629 2010/01/17 22:23:21 scons +.\" doc/man/sconsign.1 4691 2010/03/06 16:22:36 bdbaddog .\" .\" ES - Example Start - indents and turns off line fill .de ES @@ -31,7 +31,7 @@ .RE .fi .. -.TH SCONSIGN 1 "January 2010" +.TH SCONSIGN 1 "March 2010" .SH NAME sconsign \- print SCons .sconsign file information .SH SYNOPSIS diff --git a/doc/user/build-install.in b/doc/user/build-install.in index 0894e08..ff6ca3e 100644 --- a/doc/user/build-install.in +++ b/doc/user/build-install.in @@ -209,7 +209,7 @@ </para> <screen> - # <userinput>rpm -Uvh scons-1.2.0.d20100117-1.noarch.rpm</userinput> + # <userinput>rpm -Uvh scons-1.2.0.d20100306-1.noarch.rpm</userinput> </screen> <para> @@ -271,7 +271,7 @@ &SCons; provides a Windows installer that makes installation extremely easy. - Download the <filename>scons-1.2.0.d20100117.win32.exe</filename> + Download the <filename>scons-1.2.0.d20100306.win32.exe</filename> file from the &SCons; download page at <ulink url="http://www.scons.org/download.php">http://www.scons.org/download.php</ulink>. Then all you need to do is execute the file @@ -381,8 +381,8 @@ <para> The first step is to download either the - <filename>scons-1.2.0.d20100117.tar.gz</filename> - or <filename>scons-1.2.0.d20100117.zip</filename>, + <filename>scons-1.2.0.d20100306.tar.gz</filename> + or <filename>scons-1.2.0.d20100306.zip</filename>, which are available from the SCons download page at <ulink url="http://www.scons.org/download.html">http://www.scons.org/download.html</ulink>. @@ -395,7 +395,7 @@ on Linux or UNIX, or <application>WinZip</application> on Windows. This will create a directory called - <filename>scons-1.2.0.d20100117</filename>, + <filename>scons-1.2.0.d20100306</filename>, usually in your local directory. Then change your working directory to that directory and install &SCons; by executing the following commands: @@ -403,7 +403,7 @@ </para> <screen> - # <userinput>cd scons-1.2.0.d20100117</userinput> + # <userinput>cd scons-1.2.0.d20100306</userinput> # <userinput>python setup.py install</userinput> </screen> @@ -471,9 +471,9 @@ This will install the &SCons; build engine in the - <filename>/usr/lib/scons-1.2.0.d20100117</filename> + <filename>/usr/lib/scons-1.2.0.d20100306</filename> or - <filename>C:\Python25\scons-1.2.0.d20100117</filename> + <filename>C:\Python25\scons-1.2.0.d20100306</filename> directory, for example. </para> @@ -530,7 +530,7 @@ relative to the specified prefix. Adding <option>--version-lib</option> to the above example would install the build engine in - <filename>/opt/scons/lib/scons-1.2.0.d20100117</filename>. + <filename>/opt/scons/lib/scons-1.2.0.d20100306</filename>. </para> diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml index 0894e08..ff6ca3e 100644 --- a/doc/user/build-install.xml +++ b/doc/user/build-install.xml @@ -209,7 +209,7 @@ </para> <screen> - # <userinput>rpm -Uvh scons-1.2.0.d20100117-1.noarch.rpm</userinput> + # <userinput>rpm -Uvh scons-1.2.0.d20100306-1.noarch.rpm</userinput> </screen> <para> @@ -271,7 +271,7 @@ &SCons; provides a Windows installer that makes installation extremely easy. - Download the <filename>scons-1.2.0.d20100117.win32.exe</filename> + Download the <filename>scons-1.2.0.d20100306.win32.exe</filename> file from the &SCons; download page at <ulink url="http://www.scons.org/download.php">http://www.scons.org/download.php</ulink>. Then all you need to do is execute the file @@ -381,8 +381,8 @@ <para> The first step is to download either the - <filename>scons-1.2.0.d20100117.tar.gz</filename> - or <filename>scons-1.2.0.d20100117.zip</filename>, + <filename>scons-1.2.0.d20100306.tar.gz</filename> + or <filename>scons-1.2.0.d20100306.zip</filename>, which are available from the SCons download page at <ulink url="http://www.scons.org/download.html">http://www.scons.org/download.html</ulink>. @@ -395,7 +395,7 @@ on Linux or UNIX, or <application>WinZip</application> on Windows. This will create a directory called - <filename>scons-1.2.0.d20100117</filename>, + <filename>scons-1.2.0.d20100306</filename>, usually in your local directory. Then change your working directory to that directory and install &SCons; by executing the following commands: @@ -403,7 +403,7 @@ </para> <screen> - # <userinput>cd scons-1.2.0.d20100117</userinput> + # <userinput>cd scons-1.2.0.d20100306</userinput> # <userinput>python setup.py install</userinput> </screen> @@ -471,9 +471,9 @@ This will install the &SCons; build engine in the - <filename>/usr/lib/scons-1.2.0.d20100117</filename> + <filename>/usr/lib/scons-1.2.0.d20100306</filename> or - <filename>C:\Python25\scons-1.2.0.d20100117</filename> + <filename>C:\Python25\scons-1.2.0.d20100306</filename> directory, for example. </para> @@ -530,7 +530,7 @@ relative to the specified prefix. Adding <option>--version-lib</option> to the above example would install the build engine in - <filename>/opt/scons/lib/scons-1.2.0.d20100117</filename>. + <filename>/opt/scons/lib/scons-1.2.0.d20100306</filename>. </para> diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml index 428aa69..96d0846 100644 --- a/doc/user/troubleshoot.xml +++ b/doc/user/troubleshoot.xml @@ -286,7 +286,7 @@ 'DSUFFIXES': ['.d'], 'Dir': <SCons.Defaults.Variable_Method_Caller instance at 0x700000>, 'Dirs': <SCons.Defaults.Variable_Method_Caller instance at 0x700000>, - 'ENV': {'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'}, + 'ENV': { 'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'}, 'ESCAPE': <function escape at 0x700000>, 'File': <SCons.Defaults.Variable_Method_Caller instance at 0x700000>, 'HOST_ARCH': None, @@ -489,7 +489,7 @@ <screen> % <userinput>scons</userinput> scons: Reading SConscript files ... - {'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'} + { 'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin'} scons: done reading SConscript files. scons: Building targets ... scons: `.' is up to date. diff --git a/src/CHANGES.txt b/src/CHANGES.txt index c515eac..d345aec 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -1,5 +1,5 @@ # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation -# src/CHANGES.txt 4629 2010/01/17 22:23:21 scons +# src/CHANGES.txt 4691 2010/03/06 16:22:36 bdbaddog SCons - a software construction tool @@ -8,6 +8,44 @@ +RELEASE 1.2.0.d20100306 - Sat, 06 Mar 2010 16:18:33 -0800 + + From Luca Falavigna: + + - Fix typos in the man page. + + From Gottfried Ganssauge: + + - Support execution when SCons is installed via easy_install. + + From Steven Knight: + + - Make the messages for Configure checks of compilers consistent. + + - Issue an error message if a BUILDERS entry is not a Builder + object or a callable wrapper. + + From Rob Managan: + + - Update tex builder to handle the case where a \input{foo} + command tries to work with a directory named foo instead of the + file foo.tex. The builder now ignores a directory and continues + searching to find the correct file. Thanks to Lennart Sauerbeck + for the test case and initial patch + + Also allow the \include of files in subdirectories when variantDir + is used with duplicate=0. Previously latex would crash since + the directory in which the .aux file is written was not created. + Thanks to Stefan Hepp for finding this and part of the solution. + + From James Teh: + - Patches to fix some issues using MS SDK V7.0 + + From William Deegan: + - Lots of testing and minor patches to handle mixed MS VC and SDK + installations, as well as having only the SDK installed. + + RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800 From Jim Randall: diff --git a/src/README.txt b/src/README.txt index f2034b2..ee00097 100644 --- a/src/README.txt +++ b/src/README.txt @@ -1,10 +1,10 @@ # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation -# src/README.txt 4629 2010/01/17 22:23:21 scons +# src/README.txt 4691 2010/03/06 16:22:36 bdbaddog SCons - a software construction tool - Version 1.2.0.d20100117 + Version 1.2.0.d20100306 This is SCons, a tool for building software (and other files). SCons is @@ -60,12 +60,12 @@ In this case, your options are: -- (Recommended.) Install from a pre-packaged SCons package that does not require distutils: - Red Hat Linux scons-1.2.0.d20100117-1.noarch.rpm + Red Hat Linux scons-1.2.0.d20100306-1.noarch.rpm - Debian GNU/Linux scons_1.2.0.d20100117-1_all.deb + Debian GNU/Linux scons_1.2.0.d20100306-1_all.deb (or use apt-get) - Windows scons-1.2.0.d20100117.win32.exe + Windows scons-1.2.0.d20100306.win32.exe -- (Optional.) Download the latest distutils package from the following URL: @@ -88,7 +88,7 @@ provided Python-standard setup script as follows: By default, the above command will do the following: - -- Install the version-numbered "scons-1.2.0.d20100117" and "sconsign-1.2.0.d20100117" + -- Install the version-numbered "scons-1.2.0.d20100306" and "sconsign-1.2.0.d20100306" scripts in the default system script directory (/usr/bin or C:\Python*\Scripts, for example). This can be disabled by specifying the "--no-version-script" option on the command @@ -102,17 +102,17 @@ By default, the above command will do the following: making it the default on your system. On UNIX or Linux systems, you can have the "scons" and "sconsign" - scripts be hard links or symbolic links to the "scons-1.2.0.d20100117" and - "sconsign-1.2.0.d20100117" scripts by specifying the "--hardlink-scons" + scripts be hard links or symbolic links to the "scons-1.2.0.d20100306" and + "sconsign-1.2.0.d20100306" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. - -- Install "scons-1.2.0.d20100117.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-1.2.0.d20100306.bat" and "scons.bat" wrapper scripts in the Python prefix directory on Windows (C:\Python*, for example). This can be disabled by specifying the "--no-install-bat" option on the command line. On UNIX or Linux systems, the "--install-bat" option may be - specified to have "scons-1.2.0.d20100117.bat" and "scons.bat" files + specified to have "scons-1.2.0.d20100306.bat" and "scons.bat" files installed in the default system script directory, which is useful if you want to install SCons in a shared file system directory that can be used to execute SCons from both UNIX/Linux and @@ -120,7 +120,7 @@ By default, the above command will do the following: -- Install the SCons build engine (a Python module) in an appropriate version-numbered SCons library directory - (/usr/lib/scons-1.2.0.d20100117 or C:\Python*\scons-1.2.0.d20100117, for example). + (/usr/lib/scons-1.2.0.d20100306 or C:\Python*\scons-1.2.0.d20100306, for example). See below for more options related to installing the build engine library. diff --git a/src/RELEASE.txt b/src/RELEASE.txt index dfd563b..77ba79a 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,5 +1,5 @@ # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation -# src/RELEASE.txt 4629 2010/01/17 22:23:21 scons +# src/RELEASE.txt 4691 2010/03/06 16:22:36 bdbaddog SCons - a software construction tool @@ -20,7 +20,7 @@ more effectively, please sign up for the scons-users mailing list at: -RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800 +RELEASE 1.2.0.d20100306 - Sat, 06 Mar 2010 16:18:33 -0800 Please consult the CHANGES.txt file for a list of specific changes since last release. @@ -78,6 +78,15 @@ RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800 set TARGET_ARCH to "x86" or "x86_64" (various synonyms are accepted). + In addition, MSVC_USE_SCRIPT can be used to bypass the + above autodetection; setting it to the path of a Visual + Studio .bat file (e.g. vcvars.bat) will cause SCons to + run that bat file and extract the relevant variables + from the result (typically %INCLUDE%, %LIB%, and %PATH%). + Setting MSVC_USE_SCRIPT to None bypasses the Visual Studio + autodetection entirely; use this if you are importing + the shell env and running SCons in a Visual Studio cmd window. + Note that if you use MSVS_VERSION to build Visual Studio projects from your SConstructs, MSVS_VERSION must be set to the same version as MSVC_VERSION. diff --git a/src/engine/README.txt b/src/engine/README.txt index 2bc4ee6..4bf559c 100644 --- a/src/engine/README.txt +++ b/src/engine/README.txt @@ -5,12 +5,12 @@ ### A SEPARATE BUILD ENGINE PACKAGE IN THE FUTURE. ### # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation -# src/engine/README.txt 4629 2010/01/17 22:23:21 scons +# src/engine/README.txt 4691 2010/03/06 16:22:36 bdbaddog SCons - a software construction tool - Version 1.2.0.d20100117 + Version 1.2.0.d20100306 This is an alpha release of the SCons build engine, a Python extension diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index 367bf46..633c718 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Action.py 4691 2010/03/06 16:22:36 bdbaddog" import cPickle import dis diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index 627186c..2766d13 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/ActionTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/ActionTests.py 4691 2010/03/06 16:22:36 bdbaddog" # Define a null function and a null class for use as builder actions. # Where these are defined in the file seems to affect their byte-code diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index fb41ae4..bf35b1e 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -98,7 +98,7 @@ There are the following methods for internal use within this module: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Builder.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Builder.py 4691 2010/03/06 16:22:36 bdbaddog" import UserDict import UserList @@ -861,6 +861,16 @@ class CompositeBuilder(SCons.Util.Proxy): self.cmdgen.add_action(suffix, action) self.set_src_suffix(self.cmdgen.src_suffixes()) +def is_a_Builder(obj): + """"Returns True iff the specified obj is one of our Builder classes. + + The test is complicated a bit by the fact that CompositeBuilder + is a proxy, not a subclass of BuilderBase. + """ + return (isinstance(obj, BuilderBase) + or isinstance(obj, CompositeBuilder) + or callable(obj)) + # Local Variables: # tab-width:4 # indent-tabs-mode:nil diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py index 338d0b5..67a6c07 100644 --- a/src/engine/SCons/BuilderTests.py +++ b/src/engine/SCons/BuilderTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/BuilderTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/BuilderTests.py 4691 2010/03/06 16:22:36 bdbaddog" # Define a null function for use as a builder action. # Where this is defined in the file seems to affect its diff --git a/src/engine/SCons/CacheDir.py b/src/engine/SCons/CacheDir.py index f114421..05091d5 100644 --- a/src/engine/SCons/CacheDir.py +++ b/src/engine/SCons/CacheDir.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/CacheDir.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/CacheDir.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ CacheDir support diff --git a/src/engine/SCons/CacheDirTests.py b/src/engine/SCons/CacheDirTests.py index 5b087ff..4b03587 100644 --- a/src/engine/SCons/CacheDirTests.py +++ b/src/engine/SCons/CacheDirTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/CacheDirTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/CacheDirTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import shutil diff --git a/src/engine/SCons/Debug.py b/src/engine/SCons/Debug.py index eaacfed..9f550a1 100644 --- a/src/engine/SCons/Debug.py +++ b/src/engine/SCons/Debug.py @@ -29,7 +29,7 @@ needed by most users. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Debug.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Debug.py 4691 2010/03/06 16:22:36 bdbaddog" import os import string diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index db65182..b21af3b 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -32,7 +32,7 @@ from distutils.msvccompiler. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Defaults.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Defaults.py 4691 2010/03/06 16:22:36 bdbaddog" diff --git a/src/engine/SCons/DefaultsTests.py b/src/engine/SCons/DefaultsTests.py index 9c7e1a1..cea5420 100644 --- a/src/engine/SCons/DefaultsTests.py +++ b/src/engine/SCons/DefaultsTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/DefaultsTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/DefaultsTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 23b0719..d3455e0 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -32,7 +32,7 @@ Environment # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Environment.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Environment.py 4691 2010/03/06 16:22:36 bdbaddog" import copy @@ -152,6 +152,9 @@ def _set_BUILDERS(env, key, value): except KeyError: bd = BuilderDict(kwbd, env) env._dict[key] = bd + for k, v in value.items(): + if not SCons.Builder.is_a_Builder(v): + raise SCons.Errors.UserError('%s is not a Builder.' % repr(v)) bd.update(value) def _del_SCANNERS(env, key): diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 475e60f..1c831a8 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/EnvironmentTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/EnvironmentTests.py 4691 2010/03/06 16:22:36 bdbaddog" import copy import os @@ -82,7 +82,7 @@ def diff_dict(d1, d2): called_it = {} built_it = {} -class Builder: +class Builder(SCons.Builder.BuilderBase): """A dummy Builder class for testing purposes. "Building" a target is simply setting a value in the dictionary. """ @@ -1628,9 +1628,11 @@ def exists(env): assert env3['X'] == {'x1': 8, 'x2': 9}, env3['X'] assert env3['Y'] == {'y1': 10}, env3['Y'] - env4 = self.TestEnvironment(BUILDERS = {'z1' : 11}) - env4.Append(BUILDERS = {'z2' : 12}) - assert env4['BUILDERS'] == {'z1' : 11, 'z2' : 12}, env4['BUILDERS'] + z1 = Builder() + z2 = Builder() + env4 = self.TestEnvironment(BUILDERS = {'z1' : z1}) + env4.Append(BUILDERS = {'z2' : z2}) + assert env4['BUILDERS'] == {'z1' : z1, 'z2' : z2}, env4['BUILDERS'] assert hasattr(env4, 'z1') assert hasattr(env4, 'z2') @@ -1778,10 +1780,10 @@ def exists(env): assert not env1.Dictionary('ZZZ').has_key(5) # - env1 = self.TestEnvironment(BUILDERS = {'b1' : 1}) + env1 = self.TestEnvironment(BUILDERS = {'b1' : Builder()}) assert hasattr(env1, 'b1'), "env1.b1 was not set" assert env1.b1.object == env1, "b1.object doesn't point to env1" - env2 = env1.Clone(BUILDERS = {'b2' : 2}) + env2 = env1.Clone(BUILDERS = {'b2' : Builder()}) assert env2 is env2 assert env2 == env2 assert hasattr(env1, 'b1'), "b1 was mistakenly cleared from env1" @@ -2281,9 +2283,11 @@ f5: \ assert env3['X'] == {'x1': 8, 'x2' : 9}, env3['X'] assert env3['Y'] == {'y1': 10}, env3['Y'] - env4 = self.TestEnvironment(BUILDERS = {'z1' : 11}) - env4.Prepend(BUILDERS = {'z2' : 12}) - assert env4['BUILDERS'] == {'z1' : 11, 'z2' : 12}, env4['BUILDERS'] + z1 = Builder() + z2 = Builder() + env4 = self.TestEnvironment(BUILDERS = {'z1' : z1}) + env4.Prepend(BUILDERS = {'z2' : z2}) + assert env4['BUILDERS'] == {'z1' : z1, 'z2' : z2}, env4['BUILDERS'] assert hasattr(env4, 'z1') assert hasattr(env4, 'z2') @@ -2399,9 +2403,11 @@ f5: \ env2 = self.TestEnvironment(AAA = 'a', BBB = 'bbb', CCC = 'ccc') assert env1 == env2, diff_env(env1, env2) - env3 = self.TestEnvironment(BUILDERS = {'b1' : 1}) + b1 = Builder() + b2 = Builder() + env3 = self.TestEnvironment(BUILDERS = {'b1' : b1}) assert hasattr(env3, 'b1'), "b1 was not set" - env3.Replace(BUILDERS = {'b2' : 2}) + env3.Replace(BUILDERS = {'b2' : b2}) assert not hasattr(env3, 'b1'), "b1 was not cleared" assert hasattr(env3, 'b2'), "b2 was not set" diff --git a/src/engine/SCons/Errors.py b/src/engine/SCons/Errors.py index b704dec..9cff821 100644 --- a/src/engine/SCons/Errors.py +++ b/src/engine/SCons/Errors.py @@ -28,7 +28,7 @@ and user errors in SCons. """ -__revision__ = "src/engine/SCons/Errors.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Errors.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/ErrorsTests.py b/src/engine/SCons/ErrorsTests.py index 2ba76fb..a69beea 100644 --- a/src/engine/SCons/ErrorsTests.py +++ b/src/engine/SCons/ErrorsTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/ErrorsTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/ErrorsTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py index 4e98347..0230457 100644 --- a/src/engine/SCons/Executor.py +++ b/src/engine/SCons/Executor.py @@ -28,7 +28,7 @@ Nodes. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Executor.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Executor.py 4691 2010/03/06 16:22:36 bdbaddog" import string import UserList diff --git a/src/engine/SCons/ExecutorTests.py b/src/engine/SCons/ExecutorTests.py index f9141c5..508ba80 100644 --- a/src/engine/SCons/ExecutorTests.py +++ b/src/engine/SCons/ExecutorTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/ExecutorTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/ExecutorTests.py 4691 2010/03/06 16:22:36 bdbaddog" import string import sys diff --git a/src/engine/SCons/Job.py b/src/engine/SCons/Job.py index 8d772c3..24f4ce7 100644 --- a/src/engine/SCons/Job.py +++ b/src/engine/SCons/Job.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Job.py 4691 2010/03/06 16:22:36 bdbaddog" import os import signal diff --git a/src/engine/SCons/JobTests.py b/src/engine/SCons/JobTests.py index 785d29c..1689d38 100644 --- a/src/engine/SCons/JobTests.py +++ b/src/engine/SCons/JobTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/JobTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/JobTests.py 4691 2010/03/06 16:22:36 bdbaddog" import unittest import random diff --git a/src/engine/SCons/Memoize.py b/src/engine/SCons/Memoize.py index 5ad17a2..0e57cff 100644 --- a/src/engine/SCons/Memoize.py +++ b/src/engine/SCons/Memoize.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Memoize.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Memoize.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Memoizer diff --git a/src/engine/SCons/MemoizeTests.py b/src/engine/SCons/MemoizeTests.py index d4c7d70..8e3f6b1 100644 --- a/src/engine/SCons/MemoizeTests.py +++ b/src/engine/SCons/MemoizeTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/MemoizeTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/MemoizeTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Node/Alias.py b/src/engine/SCons/Node/Alias.py index 57596eb..0ea72a6 100644 --- a/src/engine/SCons/Node/Alias.py +++ b/src/engine/SCons/Node/Alias.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/Alias.py 4691 2010/03/06 16:22:36 bdbaddog" import string import UserDict diff --git a/src/engine/SCons/Node/AliasTests.py b/src/engine/SCons/Node/AliasTests.py index adf6fa9..b737433 100644 --- a/src/engine/SCons/Node/AliasTests.py +++ b/src/engine/SCons/Node/AliasTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/AliasTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/AliasTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 40c887f..95ac9b0 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -33,7 +33,7 @@ that can be used by scripts or modules looking for the canonical default. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/FS.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/FS.py 4691 2010/03/06 16:22:36 bdbaddog" from itertools import izip import cStringIO diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index e630862..2e9879a 100644 --- a/src/engine/SCons/Node/FSTests.py +++ b/src/engine/SCons/Node/FSTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/FSTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/FSTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py index 1a0dcc6..fb8b9ac 100644 --- a/src/engine/SCons/Node/NodeTests.py +++ b/src/engine/SCons/Node/NodeTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/NodeTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/NodeTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import re diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py index 2e42b6c..8266cf1 100644 --- a/src/engine/SCons/Node/Python.py +++ b/src/engine/SCons/Node/Python.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/Python.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Node diff --git a/src/engine/SCons/Node/PythonTests.py b/src/engine/SCons/Node/PythonTests.py index e815cbd..d2f4419 100644 --- a/src/engine/SCons/Node/PythonTests.py +++ b/src/engine/SCons/Node/PythonTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/PythonTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/PythonTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index 2ffadc2..5c54429 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -42,7 +42,7 @@ be able to depend on any other type of "thing." # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Node/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Node/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import copy from itertools import chain, izip diff --git a/src/engine/SCons/Options/BoolOption.py b/src/engine/SCons/Options/BoolOption.py index 26cb245..549e9b0 100644 --- a/src/engine/SCons/Options/BoolOption.py +++ b/src/engine/SCons/Options/BoolOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/BoolOption.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Options/BoolOption.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/src/engine/SCons/Options/EnumOption.py b/src/engine/SCons/Options/EnumOption.py index 44b5ed1..6c93cff 100644 --- a/src/engine/SCons/Options/EnumOption.py +++ b/src/engine/SCons/Options/EnumOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/EnumOption.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Options/EnumOption.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/src/engine/SCons/Options/ListOption.py b/src/engine/SCons/Options/ListOption.py index 373b8d6..cfe4324 100644 --- a/src/engine/SCons/Options/ListOption.py +++ b/src/engine/SCons/Options/ListOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/ListOption.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Options/ListOption.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/src/engine/SCons/Options/PackageOption.py b/src/engine/SCons/Options/PackageOption.py index 16f59ef..3fc2dcc 100644 --- a/src/engine/SCons/Options/PackageOption.py +++ b/src/engine/SCons/Options/PackageOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PackageOption.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Options/PackageOption.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/src/engine/SCons/Options/PathOption.py b/src/engine/SCons/Options/PathOption.py index 1513570..c324132 100644 --- a/src/engine/SCons/Options/PathOption.py +++ b/src/engine/SCons/Options/PathOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PathOption.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Options/PathOption.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/src/engine/SCons/Options/__init__.py b/src/engine/SCons/Options/__init__.py index 50d9e96..2bde07e 100644 --- a/src/engine/SCons/Options/__init__.py +++ b/src/engine/SCons/Options/__init__.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Options/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/src/engine/SCons/PathList.py b/src/engine/SCons/PathList.py index fb299e3..ec99a3e 100644 --- a/src/engine/SCons/PathList.py +++ b/src/engine/SCons/PathList.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/PathList.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/PathList.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """SCons.PathList diff --git a/src/engine/SCons/PathListTests.py b/src/engine/SCons/PathListTests.py index 4ece1fd..6b6e7f5 100644 --- a/src/engine/SCons/PathListTests.py +++ b/src/engine/SCons/PathListTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/PathListTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/PathListTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Platform/PlatformTests.py b/src/engine/SCons/Platform/PlatformTests.py index 672cf5f..657337f 100644 --- a/src/engine/SCons/Platform/PlatformTests.py +++ b/src/engine/SCons/Platform/PlatformTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/PlatformTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/PlatformTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Platform/__init__.py b/src/engine/SCons/Platform/__init__.py index 6e98827..6be4c26 100644 --- a/src/engine/SCons/Platform/__init__.py +++ b/src/engine/SCons/Platform/__init__.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.compat diff --git a/src/engine/SCons/Platform/aix.py b/src/engine/SCons/Platform/aix.py index f11370f..434ddec 100644 --- a/src/engine/SCons/Platform/aix.py +++ b/src/engine/SCons/Platform/aix.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/aix.py 4691 2010/03/06 16:22:36 bdbaddog" import os import string diff --git a/src/engine/SCons/Platform/cygwin.py b/src/engine/SCons/Platform/cygwin.py index 2dc5709..bd69d5e 100644 --- a/src/engine/SCons/Platform/cygwin.py +++ b/src/engine/SCons/Platform/cygwin.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/cygwin.py 4691 2010/03/06 16:22:36 bdbaddog" import posix from SCons.Platform import TempFileMunge diff --git a/src/engine/SCons/Platform/darwin.py b/src/engine/SCons/Platform/darwin.py index b2d020d..1eb79e3 100644 --- a/src/engine/SCons/Platform/darwin.py +++ b/src/engine/SCons/Platform/darwin.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/darwin.py 4691 2010/03/06 16:22:36 bdbaddog" import posix diff --git a/src/engine/SCons/Platform/hpux.py b/src/engine/SCons/Platform/hpux.py index 102c885..8122198 100644 --- a/src/engine/SCons/Platform/hpux.py +++ b/src/engine/SCons/Platform/hpux.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/hpux.py 4691 2010/03/06 16:22:36 bdbaddog" import posix diff --git a/src/engine/SCons/Platform/irix.py b/src/engine/SCons/Platform/irix.py index a6e2456..b3b237f 100644 --- a/src/engine/SCons/Platform/irix.py +++ b/src/engine/SCons/Platform/irix.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/irix.py 4691 2010/03/06 16:22:36 bdbaddog" import posix diff --git a/src/engine/SCons/Platform/os2.py b/src/engine/SCons/Platform/os2.py index d043a39..b0f0cde 100644 --- a/src/engine/SCons/Platform/os2.py +++ b/src/engine/SCons/Platform/os2.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/os2.py 4691 2010/03/06 16:22:36 bdbaddog" import win32 def generate(env): diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py index 203db88..9b1a43f 100644 --- a/src/engine/SCons/Platform/posix.py +++ b/src/engine/SCons/Platform/posix.py @@ -30,7 +30,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/posix.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/posix.py 4691 2010/03/06 16:22:36 bdbaddog" import errno import os diff --git a/src/engine/SCons/Platform/sunos.py b/src/engine/SCons/Platform/sunos.py index 54458d3..1eb418d 100644 --- a/src/engine/SCons/Platform/sunos.py +++ b/src/engine/SCons/Platform/sunos.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/sunos.py 4691 2010/03/06 16:22:36 bdbaddog" import posix diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index 649795a..4d129f9 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Platform/win32.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py index 58dcdc2..3875d1a 100644 --- a/src/engine/SCons/SConf.py +++ b/src/engine/SCons/SConf.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/SConf.py 4691 2010/03/06 16:22:36 bdbaddog" import os import re diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py index 1ad3298..ba9eb02 100644 --- a/src/engine/SCons/SConfTests.py +++ b/src/engine/SCons/SConfTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/SConfTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/SConfTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import re @@ -168,7 +168,8 @@ class SConfTestCase(unittest.TestCase): sconf = self.SConf.SConf(self.scons_env, conf_dir=self.test.workpath('config.tests'), log_file=self.test.workpath('config.log')) - class MyBuilder: + import SCons.Builder + class MyBuilder(SCons.Builder.BuilderBase): def __init__(self): self.prefix = '' self.suffix = '' diff --git a/src/engine/SCons/SConsign.py b/src/engine/SCons/SConsign.py index 6f1e984..dc52c8c 100644 --- a/src/engine/SCons/SConsign.py +++ b/src/engine/SCons/SConsign.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/SConsign.py 4691 2010/03/06 16:22:36 bdbaddog" import cPickle import os diff --git a/src/engine/SCons/SConsignTests.py b/src/engine/SCons/SConsignTests.py index f2490f1..f160dfc 100644 --- a/src/engine/SCons/SConsignTests.py +++ b/src/engine/SCons/SConsignTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/SConsignTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/SConsignTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import sys diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py index 453310d..235b2e7 100644 --- a/src/engine/SCons/Scanner/C.py +++ b/src/engine/SCons/Scanner/C.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/C.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/src/engine/SCons/Scanner/CTests.py b/src/engine/SCons/Scanner/CTests.py index 4b8235f..d780f09 100644 --- a/src/engine/SCons/Scanner/CTests.py +++ b/src/engine/SCons/Scanner/CTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/CTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/CTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Scanner/D.py b/src/engine/SCons/Scanner/D.py index e1cb350..b324e6a 100644 --- a/src/engine/SCons/Scanner/D.py +++ b/src/engine/SCons/Scanner/D.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/D.py 4691 2010/03/06 16:22:36 bdbaddog" import re import string diff --git a/src/engine/SCons/Scanner/Dir.py b/src/engine/SCons/Scanner/Dir.py index c2ba897..93d4fd4 100644 --- a/src/engine/SCons/Scanner/Dir.py +++ b/src/engine/SCons/Scanner/Dir.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/Dir.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/Dir.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/src/engine/SCons/Scanner/DirTests.py b/src/engine/SCons/Scanner/DirTests.py index 44b0857..2d680d7 100644 --- a/src/engine/SCons/Scanner/DirTests.py +++ b/src/engine/SCons/Scanner/DirTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/DirTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/DirTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py index 5b31e24..d03b60b 100644 --- a/src/engine/SCons/Scanner/Fortran.py +++ b/src/engine/SCons/Scanner/Fortran.py @@ -27,7 +27,7 @@ This module implements the dependency scanner for Fortran code. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/Fortran.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/Fortran.py 4691 2010/03/06 16:22:36 bdbaddog" import re import string diff --git a/src/engine/SCons/Scanner/FortranTests.py b/src/engine/SCons/Scanner/FortranTests.py index 6abcf62..9c72f10 100644 --- a/src/engine/SCons/Scanner/FortranTests.py +++ b/src/engine/SCons/Scanner/FortranTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/FortranTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/FortranTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Scanner/IDL.py b/src/engine/SCons/Scanner/IDL.py index 22afd95..7285f93 100644 --- a/src/engine/SCons/Scanner/IDL.py +++ b/src/engine/SCons/Scanner/IDL.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/IDL.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/src/engine/SCons/Scanner/IDLTests.py b/src/engine/SCons/Scanner/IDLTests.py index 8e382e0..a3360f0 100644 --- a/src/engine/SCons/Scanner/IDLTests.py +++ b/src/engine/SCons/Scanner/IDLTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/IDLTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/IDLTests.py 4691 2010/03/06 16:22:36 bdbaddog" import TestCmd import SCons.Scanner.IDL diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py index a3395f1..4a28ebe 100644 --- a/src/engine/SCons/Scanner/LaTeX.py +++ b/src/engine/SCons/Scanner/LaTeX.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/LaTeX.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Scanner/LaTeXTests.py b/src/engine/SCons/Scanner/LaTeXTests.py index 138ffb9..6c9ff4c 100644 --- a/src/engine/SCons/Scanner/LaTeXTests.py +++ b/src/engine/SCons/Scanner/LaTeXTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/LaTeXTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/LaTeXTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Scanner/Prog.py b/src/engine/SCons/Scanner/Prog.py index 37bf2a0..abbc8f3 100644 --- a/src/engine/SCons/Scanner/Prog.py +++ b/src/engine/SCons/Scanner/Prog.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/Prog.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/Prog.py 4691 2010/03/06 16:22:36 bdbaddog" import string diff --git a/src/engine/SCons/Scanner/ProgTests.py b/src/engine/SCons/Scanner/ProgTests.py index ad5a5a1..806e741 100644 --- a/src/engine/SCons/Scanner/ProgTests.py +++ b/src/engine/SCons/Scanner/ProgTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/ProgTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/ProgTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Scanner/RC.py b/src/engine/SCons/Scanner/RC.py index a1bdf77..feb6ce5 100644 --- a/src/engine/SCons/Scanner/RC.py +++ b/src/engine/SCons/Scanner/RC.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/RC.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/src/engine/SCons/Scanner/RCTests.py b/src/engine/SCons/Scanner/RCTests.py index 599bdf5..7fc3945 100644 --- a/src/engine/SCons/Scanner/RCTests.py +++ b/src/engine/SCons/Scanner/RCTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/RCTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/RCTests.py 4691 2010/03/06 16:22:36 bdbaddog" import TestCmd import SCons.Scanner.RC diff --git a/src/engine/SCons/Scanner/ScannerTests.py b/src/engine/SCons/Scanner/ScannerTests.py index c382263..8c1178c 100644 --- a/src/engine/SCons/Scanner/ScannerTests.py +++ b/src/engine/SCons/Scanner/ScannerTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Scanner/ScannerTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/ScannerTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py index 83ca110..5e8eb47 100644 --- a/src/engine/SCons/Scanner/__init__.py +++ b/src/engine/SCons/Scanner/__init__.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Scanner/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import re import string @@ -92,7 +92,9 @@ class Base: argument = _null, skeys = _null, path_function = None, - node_class = SCons.Node.FS.Entry, + # Node.FS.Base so that, by default, it's okay for a + # scanner to return a Dir, File or Entry. + node_class = SCons.Node.FS.Base, node_factory = None, scan_check = None, recursive = None): diff --git a/src/engine/SCons/Script/Interactive.py b/src/engine/SCons/Script/Interactive.py index 63fa884..a90c50e 100644 --- a/src/engine/SCons/Script/Interactive.py +++ b/src/engine/SCons/Script/Interactive.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/Interactive.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/Interactive.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ SCons interactive mode diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index e53993d..600fb77 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -34,7 +34,7 @@ it goes here. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/Main.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/Main.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Script/MainTests.py b/src/engine/SCons/Script/MainTests.py index db229f4..4f0a847 100644 --- a/src/engine/SCons/Script/MainTests.py +++ b/src/engine/SCons/Script/MainTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/MainTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/MainTests.py 4691 2010/03/06 16:22:36 bdbaddog" import unittest import SCons.Errors diff --git a/src/engine/SCons/Script/SConsOptions.py b/src/engine/SCons/Script/SConsOptions.py index 458589e..47b3915 100644 --- a/src/engine/SCons/Script/SConsOptions.py +++ b/src/engine/SCons/Script/SConsOptions.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/SConsOptions.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/SConsOptions.py 4691 2010/03/06 16:22:36 bdbaddog" import optparse import re diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 18f1ff1..b2e7220 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -28,7 +28,7 @@ files. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/SConscript.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/SConscript.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons import SCons.Action diff --git a/src/engine/SCons/Script/SConscriptTests.py b/src/engine/SCons/Script/SConscriptTests.py index 1817583..857e665 100644 --- a/src/engine/SCons/Script/SConscriptTests.py +++ b/src/engine/SCons/Script/SConscriptTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/SConscriptTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/SConscriptTests.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Script.SConscript diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 2b6f5fc..0c687c3 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -34,7 +34,7 @@ it goes here. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Script/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Script/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import time start_time = time.time() diff --git a/src/engine/SCons/Sig.py b/src/engine/SCons/Sig.py index c2adeb0..ab0d9b0 100644 --- a/src/engine/SCons/Sig.py +++ b/src/engine/SCons/Sig.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Sig.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Sig.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Place-holder for the old SCons.Sig module hierarchy diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py index e37c9d7..fd6b319 100644 --- a/src/engine/SCons/Subst.py +++ b/src/engine/SCons/Subst.py @@ -27,7 +27,7 @@ SCons string substitution. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Subst.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Subst.py 4691 2010/03/06 16:22:36 bdbaddog" import re import string diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py index b87f82b..588c9a8 100644 --- a/src/engine/SCons/SubstTests.py +++ b/src/engine/SCons/SubstTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/SubstTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/SubstTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py index 7998cf5..1da3f0a 100644 --- a/src/engine/SCons/Taskmaster.py +++ b/src/engine/SCons/Taskmaster.py @@ -48,7 +48,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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Taskmaster.py 4691 2010/03/06 16:22:36 bdbaddog" from itertools import chain import operator @@ -359,7 +359,8 @@ class Task: for t in self.targets: t.disambiguate().set_state(NODE_EXECUTING) for s in t.side_effects: - s.set_state(NODE_EXECUTING) + # add disambiguate here to mirror the call on targets above + s.disambiguate().set_state(NODE_EXECUTING) def make_ready_current(self): """ @@ -390,7 +391,8 @@ class Task: for t in self.targets: t.set_state(NODE_EXECUTING) for s in t.side_effects: - s.set_state(NODE_EXECUTING) + # add disambiguate here to mirror the call on targets in first loop above + s.disambiguate().set_state(NODE_EXECUTING) else: for t in self.targets: # We must invoke visited() to ensure that the node diff --git a/src/engine/SCons/TaskmasterTests.py b/src/engine/SCons/TaskmasterTests.py index feedbc4..fd0903d 100644 --- a/src/engine/SCons/TaskmasterTests.py +++ b/src/engine/SCons/TaskmasterTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/TaskmasterTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/TaskmasterTests.py 4691 2010/03/06 16:22:36 bdbaddog" import copy import sys diff --git a/src/engine/SCons/Tool/386asm.py b/src/engine/SCons/Tool/386asm.py index bb38853..ce3dfed 100644 --- a/src/engine/SCons/Tool/386asm.py +++ b/src/engine/SCons/Tool/386asm.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/386asm.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Tool.PharLapCommon import addPharLapPaths import SCons.Util diff --git a/src/engine/SCons/Tool/BitKeeper.py b/src/engine/SCons/Tool/BitKeeper.py index 041b9a2..e6b6f18 100644 --- a/src/engine/SCons/Tool/BitKeeper.py +++ b/src/engine/SCons/Tool/BitKeeper.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/BitKeeper.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Builder diff --git a/src/engine/SCons/Tool/CVS.py b/src/engine/SCons/Tool/CVS.py index b7418a1..21569b6 100644 --- a/src/engine/SCons/Tool/CVS.py +++ b/src/engine/SCons/Tool/CVS.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/CVS.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/CVS.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Builder diff --git a/src/engine/SCons/Tool/FortranCommon.py b/src/engine/SCons/Tool/FortranCommon.py index a0afc60..24029e6 100644 --- a/src/engine/SCons/Tool/FortranCommon.py +++ b/src/engine/SCons/Tool/FortranCommon.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/FortranCommon.py 4691 2010/03/06 16:22:36 bdbaddog" import re import string diff --git a/src/engine/SCons/Tool/JavaCommon.py b/src/engine/SCons/Tool/JavaCommon.py index 2919cdd..dff2772 100644 --- a/src/engine/SCons/Tool/JavaCommon.py +++ b/src/engine/SCons/Tool/JavaCommon.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/JavaCommon.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/JavaCommonTests.py b/src/engine/SCons/Tool/JavaCommonTests.py index 58cca97..8128f11 100644 --- a/src/engine/SCons/Tool/JavaCommonTests.py +++ b/src/engine/SCons/Tool/JavaCommonTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/JavaCommonTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/JavaCommonTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import sys diff --git a/src/engine/SCons/Tool/MSCommon/__init__.py b/src/engine/SCons/Tool/MSCommon/__init__.py index 7a23c87..b6cd6a0 100644 --- a/src/engine/SCons/Tool/MSCommon/__init__.py +++ b/src/engine/SCons/Tool/MSCommon/__init__.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ Common functions for Microsoft Visual Studio and Visual C/C++. diff --git a/src/engine/SCons/Tool/MSCommon/arch.py b/src/engine/SCons/Tool/MSCommon/arch.py index 25ec1b9..3093455 100644 --- a/src/engine/SCons/Tool/MSCommon/arch.py +++ b/src/engine/SCons/Tool/MSCommon/arch.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/arch.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/arch.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Module to define supported Windows chip architectures. """ diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py index d7d3b79..aeea37b 100644 --- a/src/engine/SCons/Tool/MSCommon/common.py +++ b/src/engine/SCons/Tool/MSCommon/common.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/common.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/common.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ Common helper functions for working with the Microsoft tool chain. diff --git a/src/engine/SCons/Tool/MSCommon/netframework.py b/src/engine/SCons/Tool/MSCommon/netframework.py index b52e597..1185717 100644 --- a/src/engine/SCons/Tool/MSCommon/netframework.py +++ b/src/engine/SCons/Tool/MSCommon/netframework.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/netframework.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/netframework.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ """ diff --git a/src/engine/SCons/Tool/MSCommon/sdk.py b/src/engine/SCons/Tool/MSCommon/sdk.py index f458dc0..24b85d6 100644 --- a/src/engine/SCons/Tool/MSCommon/sdk.py +++ b/src/engine/SCons/Tool/MSCommon/sdk.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Module to detect the Platform/Windows SDK @@ -102,6 +102,25 @@ class SDKDefinition: sdk_dir = self.find_sdk_dir() self._sdk_dir = sdk_dir return sdk_dir + + def get_sdk_vc_script(self,host_arch, target_arch): + """ Return the script to initialize the VC compiler installed by SDK + """ + + if (host_arch == 'amd64' and target_arch == 'x86'): + # No cross tools needed compiling 32 bits on 64 bit machine + host_arch=target_arch + + arch_string=target_arch + if (host_arch != target_arch): + arch_string='%s_%s'%(host_arch,target_arch) + + debug("sdk.py: get_sdk_vc_script():arch_string:%s host_arch:%s target_arch:%s"%(arch_string, + host_arch, + target_arch)) + file=self.vc_setup_scripts.get(arch_string,None) + debug("sdk.py: get_sdk_vc_script():file:%s"%file) + return file class WindowsSDK(SDKDefinition): """ @@ -121,6 +140,27 @@ class PlatformSDK(SDKDefinition): apply(SDKDefinition.__init__, (self,)+args, kw) self.hkey_data = self.uuid +# +# The list of VC initialization scripts installed by the SDK +# These should be tried if the vcvarsall.bat TARGET_ARCH fails +preSDK61VCSetupScripts = { 'x86' : r'bin\vcvars32.bat', + 'amd64' : r'bin\vcvarsamd64.bat', + 'x86_amd64': r'bin\vcvarsx86_amd64.bat', + 'x86_ia64' : r'bin\vcvarsx86_ia64.bat', + 'ia64' : r'bin\vcvarsia64.bat'} + +SDK61VCSetupScripts = {'x86' : r'bin\vcvars32.bat', + 'amd64' : r'bin\amd64\vcvarsamd64.bat', + 'x86_amd64': r'bin\x86_amd64\vcvarsx86_amd64.bat', + 'x86_ia64' : r'bin\x86_ia64\vcvarsx86_ia64.bat', + 'ia64' : r'bin\ia64\vcvarsia64.bat'} + +SDK70VCSetupScripts = { 'x86' : r'bin\vcvars32.bat', + 'amd64' : r'bin\vcvars64.bat', + 'x86_amd64': r'bin\vcvarsx86_amd64.bat', + 'x86_ia64' : r'bin\vcvarsx86_ia64.bat', + 'ia64' : r'bin\vcvarsia64.bat'} + # The list of support SDKs which we know how to detect. # # The first SDK found in the list is the one used by default if there @@ -129,6 +169,16 @@ class PlatformSDK(SDKDefinition): # # If you update this list, update the documentation in Tool/mssdk.xml. SupportedSDKList = [ + WindowsSDK('7.0', + sanity_check_file=r'bin\SetEnv.Cmd', + include_subdir='include', + lib_subdir={ + 'x86' : ['lib'], + 'x86_64' : [r'lib\x64'], + 'ia64' : [r'lib\ia64'], + }, + vc_setup_scripts = SDK70VCSetupScripts, + ), WindowsSDK('6.1', sanity_check_file=r'bin\SetEnv.Cmd', include_subdir='include', @@ -137,6 +187,7 @@ SupportedSDKList = [ 'x86_64' : [r'lib\x64'], 'ia64' : [r'lib\ia64'], }, + vc_setup_scripts = SDK61VCSetupScripts, ), WindowsSDK('6.0A', @@ -147,22 +198,26 @@ SupportedSDKList = [ 'x86_64' : [r'lib\x64'], 'ia64' : [r'lib\ia64'], }, + vc_setup_scripts = preSDK61VCSetupScripts, ), WindowsSDK('6.0', sanity_check_file=r'bin\gacutil.exe', include_subdir='include', lib_subdir='lib', + vc_setup_scripts = preSDK61VCSetupScripts, ), PlatformSDK('2003R2', sanity_check_file=r'SetEnv.Cmd', - uuid="D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1" + uuid="D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1", + vc_setup_scripts = preSDK61VCSetupScripts, ), PlatformSDK('2003R1', sanity_check_file=r'SetEnv.Cmd', uuid="8F9E5EF3-A9A5-491B-A889-C58EFFECE8B3", + vc_setup_scripts = preSDK61VCSetupScripts, ), ] @@ -186,9 +241,9 @@ def get_installed_sdks(): InstalledSDKList = [] InstalledSDKMap = {} for sdk in SupportedSDKList: - debug('trying to find SDK %s' % sdk.version) + debug('MSCommon/sdk.py: trying to find SDK %s' % sdk.version) if sdk.get_sdk_dir(): - debug('found SDK %s' % sdk.version) + debug('MSCommon/sdk.py:found SDK %s' % sdk.version) InstalledSDKList.append(sdk) InstalledSDKMap[sdk.version] = sdk return InstalledSDKList @@ -203,6 +258,7 @@ SDKEnvironmentUpdates = {} def set_sdk_by_directory(env, sdk_dir): global SDKEnvironmentUpdates + debug('set_sdk_by_directory: Using dir:%s'%sdk_dir) try: env_tuple_list = SDKEnvironmentUpdates[sdk_dir] except KeyError: @@ -264,12 +320,13 @@ def get_default_sdk(): return InstalledSDKList[0] def mssdk_setup_env(env): - debug('msvs_setup_env()') + debug('mssdk_setup_env()') if env.has_key('MSSDK_DIR'): sdk_dir = env['MSSDK_DIR'] if sdk_dir is None: return sdk_dir = env.subst(sdk_dir) + debug('mssdk_setup_env: Using MSSDK_DIR:%s'%sdk_dir) elif env.has_key('MSSDK_VERSION'): sdk_version = env['MSSDK_VERSION'] if sdk_version is None: @@ -278,6 +335,7 @@ def mssdk_setup_env(env): sdk_version = env.subst(sdk_version) mssdk = get_sdk_by_version(sdk_version) sdk_dir = mssdk.get_sdk_dir() + debug('mssdk_setup_env: Using MSSDK_VERSION:%s'%sdk_dir) elif env.has_key('MSVS_VERSION'): msvs_version = env['MSVS_VERSION'] debug('Getting MSVS_VERSION from env:%s'%msvs_version) @@ -298,11 +356,13 @@ def mssdk_setup_env(env): if not mssdk: return sdk_dir = mssdk.get_sdk_dir() + debug('mssdk_setup_env: Using MSVS_VERSION:%s'%sdk_dir) else: mssdk = get_default_sdk() if not mssdk: return sdk_dir = mssdk.get_sdk_dir() + debug('mssdk_setup_env: not using any env values. sdk_dir:%s'%sdk_dir) set_sdk_by_directory(env, sdk_dir) diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index a190b8e..f2f2a01 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Module for Visual C/C++ detection and configuration. """ @@ -45,6 +45,11 @@ import common debug = common.debug +import sdk + +get_installed_sdks = sdk.get_installed_sdks + + class VisualCException(Exception): pass @@ -198,10 +203,16 @@ def find_vc_pdir(msvc_version): raise MissingConfiguration("registry dir %s not found on the filesystem" % comps) return None -def find_batch_file(msvc_version): +def find_batch_file(env,msvc_version): + """ + Find the location of the batch script which should set up the compiler + for any TARGET_ARCH whose compilers were installed by Visual Studio/VCExpress + """ pdir = find_vc_pdir(msvc_version) if pdir is None: raise NoVersionFound("No version of Visual Studio found") + + debug('vc.py: find_batch_file() pdir:%s'%pdir) vernum = float(msvc_version) if 7 <= vernum < 8: @@ -213,11 +224,22 @@ def find_batch_file(msvc_version): else: # >= 8 batfilename = os.path.join(pdir, "vcvarsall.bat") - if os.path.exists(batfilename): - return batfilename - else: + if not os.path.exists(batfilename): debug("Not found: %s" % batfilename) - return None + batfilename = None + + installed_sdks=get_installed_sdks() + (host_arch,target_arch)=get_host_target(env) + 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) + else: + debug("vc.py:find_batch_file() not found:%s"%sdk_bat_file_path) + else: + return (batfilename,None) __INSTALLED_VCS_RUN = None @@ -319,7 +341,8 @@ def msvc_setup_env(env): env['MSVS'] = {} try: - script = find_batch_file(version) + (vc_script,sdk_script) = find_batch_file(env,version) + debug('vc.py:msvc_setup_env() vc_script:%s sdk_script:%s'%(vc_script,sdk_script)) except VisualCException, e: msg = str(e) debug('Caught exception while looking for batch file (%s)' % msg) @@ -329,7 +352,8 @@ def msvc_setup_env(env): warn_msg = warn_msg % (version, cached_get_installed_vcs()) SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg) return None - + + debug('vc.py:msvc_setup_env() vc_script:%s sdk_script:%s'%(vc_script,sdk_script)) use_script = env.get('MSVC_USE_SCRIPT', True) if SCons.Util.is_String(use_script): debug('use_script 1 %s\n' % repr(use_script)) @@ -342,13 +366,24 @@ def msvc_setup_env(env): (host_target, version) SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg) arg = _HOST_TARGET_ARCH_TO_BAT_ARCH[host_target] - debug('use_script 2 %s, args:%s\n' % (repr(script), arg)) - try: - d = script_env(script, args=arg) - except BatchFileExecutionError, e: - msg = "MSVC error while executing %s with args %s (error was %s)" % \ - (script, arg, str(e)) - raise SCons.Errors.UserError(msg) + debug('use_script 2 %s, args:%s\n' % (repr(vc_script), arg)) + if vc_script: + try: + d = script_env(vc_script, args=arg) + except BatchFileExecutionError, e: + debug('use_script 3: failed running VC script %s: %s: Error:%s'%(repr(vc_script),arg,e)) + vc_script=None + if not vc_script and sdk_script: + debug('use_script 4: trying sdk script: %s'%(sdk_script)) + try: + d = script_env(sdk_script,args=[]) + except BatchFileExecutionError,e: + debug('use_script 5: failed running SDK script %s: Error:%s'%(repr(sdk_script),e)) + return None + elif not vc_script and not sdk_script: + debug('use_script 6: Neither VC script nor SDK script found') + return None + else: debug('MSVC_USE_SCRIPT set to False') warn_msg = "MSVC_USE_SCRIPT set to False, assuming environment " \ @@ -357,6 +392,7 @@ def msvc_setup_env(env): return None for k, v in d.items(): + debug('vc.py:msvc_setup_env() env:%s -> %s'%(k,v)) env.PrependENVPath(k, v, delete_existing=True) def msvc_exists(version=None): diff --git a/src/engine/SCons/Tool/MSCommon/vc.py.bak b/src/engine/SCons/Tool/MSCommon/vc.py.bak index 711fffa..7690e5d 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py.bak +++ b/src/engine/SCons/Tool/MSCommon/vc.py.bak @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py.bak 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py.bak 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Module for Visual C/C++ detection and configuration. """ diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py index 5be29c1..204a32f 100644 --- a/src/engine/SCons/Tool/MSCommon/vs.py +++ b/src/engine/SCons/Tool/MSCommon/vs.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """Module to detect Visual Studio and/or Visual C/C++ """ diff --git a/src/engine/SCons/Tool/Perforce.py b/src/engine/SCons/Tool/Perforce.py index 0ea9a31..7d17964 100644 --- a/src/engine/SCons/Tool/Perforce.py +++ b/src/engine/SCons/Tool/Perforce.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/Perforce.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/Perforce.py 4691 2010/03/06 16:22:36 bdbaddog" import os diff --git a/src/engine/SCons/Tool/PharLapCommon.py b/src/engine/SCons/Tool/PharLapCommon.py index 42f95ef..2e6b9a1 100644 --- a/src/engine/SCons/Tool/PharLapCommon.py +++ b/src/engine/SCons/Tool/PharLapCommon.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/PharLapCommon.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/PharLapCommonTests.py b/src/engine/SCons/Tool/PharLapCommonTests.py index 9307e53..1be1871 100644 --- a/src/engine/SCons/Tool/PharLapCommonTests.py +++ b/src/engine/SCons/Tool/PharLapCommonTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/PharLapCommonTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/PharLapCommonTests.py 4691 2010/03/06 16:22:36 bdbaddog" import unittest import os.path diff --git a/src/engine/SCons/Tool/RCS.py b/src/engine/SCons/Tool/RCS.py index 6a4a8da..67132c3 100644 --- a/src/engine/SCons/Tool/RCS.py +++ b/src/engine/SCons/Tool/RCS.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/RCS.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/RCS.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Builder diff --git a/src/engine/SCons/Tool/SCCS.py b/src/engine/SCons/Tool/SCCS.py index b4d9936..1a8a1e1 100644 --- a/src/engine/SCons/Tool/SCCS.py +++ b/src/engine/SCons/Tool/SCCS.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/SCCS.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/SCCS.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Builder diff --git a/src/engine/SCons/Tool/Subversion.py b/src/engine/SCons/Tool/Subversion.py index 603d9a0..e9f9510 100644 --- a/src/engine/SCons/Tool/Subversion.py +++ b/src/engine/SCons/Tool/Subversion.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/Subversion.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/Subversion.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Tool/ToolTests.py b/src/engine/SCons/Tool/ToolTests.py index d2158bc..cf5e72a 100644 --- a/src/engine/SCons/Tool/ToolTests.py +++ b/src/engine/SCons/Tool/ToolTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/ToolTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/ToolTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 7cb7c30..0b08ac7 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -36,7 +36,7 @@ tool definition. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import imp import sys diff --git a/src/engine/SCons/Tool/aixc++.py b/src/engine/SCons/Tool/aixc++.py index 59979d7..bbf7b69 100644 --- a/src/engine/SCons/Tool/aixc++.py +++ b/src/engine/SCons/Tool/aixc++.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/aixc++.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Tool/aixcc.py b/src/engine/SCons/Tool/aixcc.py index a674863..e191a9e 100644 --- a/src/engine/SCons/Tool/aixcc.py +++ b/src/engine/SCons/Tool/aixcc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/aixcc.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Tool/aixf77.py b/src/engine/SCons/Tool/aixf77.py index 3a6a6c9..f06143f 100644 --- a/src/engine/SCons/Tool/aixf77.py +++ b/src/engine/SCons/Tool/aixf77.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/aixf77.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Tool/aixlink.py b/src/engine/SCons/Tool/aixlink.py index 7b877f4..ee11ec2 100644 --- a/src/engine/SCons/Tool/aixlink.py +++ b/src/engine/SCons/Tool/aixlink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/aixlink.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/applelink.py b/src/engine/SCons/Tool/applelink.py index dc6b926..5e712be 100644 --- a/src/engine/SCons/Tool/applelink.py +++ b/src/engine/SCons/Tool/applelink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/applelink.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/applelink.xml b/src/engine/SCons/Tool/applelink.xml index 64439d2..ef7574a 100644 --- a/src/engine/SCons/Tool/applelink.xml +++ b/src/engine/SCons/Tool/applelink.xml @@ -32,7 +32,7 @@ On Mac OS X with gcc, general user-supplied frameworks options to be added at the end of a command line building a loadable module. -(This has been largely superceded by +(This has been largely superseded by the &cv-link-FRAMEWORKPATH;, &cv-link-FRAMEWORKPATHPREFIX;, &cv-link-FRAMEWORKPREFIX; and &cv-link-FRAMEWORKS; variables described above.) diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py index 7fa446e..a7ebe3e 100644 --- a/src/engine/SCons/Tool/ar.py +++ b/src/engine/SCons/Tool/ar.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/ar.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/as.py b/src/engine/SCons/Tool/as.py index 05ee301..4a42959 100644 --- a/src/engine/SCons/Tool/as.py +++ b/src/engine/SCons/Tool/as.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/as.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/bcc32.py b/src/engine/SCons/Tool/bcc32.py index c5b9286..7f61e7a 100644 --- a/src/engine/SCons/Tool/bcc32.py +++ b/src/engine/SCons/Tool/bcc32.py @@ -27,7 +27,7 @@ XXX # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/bcc32.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/bcc32.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/c++.py b/src/engine/SCons/Tool/c++.py index 80de002..f0097f2 100644 --- a/src/engine/SCons/Tool/c++.py +++ b/src/engine/SCons/Tool/c++.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/c++.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py index 2ee9757..470a9f7 100644 --- a/src/engine/SCons/Tool/cc.py +++ b/src/engine/SCons/Tool/cc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/cc.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Tool import SCons.Defaults diff --git a/src/engine/SCons/Tool/cvf.py b/src/engine/SCons/Tool/cvf.py index 8dc3955..f495fa5 100644 --- a/src/engine/SCons/Tool/cvf.py +++ b/src/engine/SCons/Tool/cvf.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/cvf.py 4691 2010/03/06 16:22:36 bdbaddog" import fortran diff --git a/src/engine/SCons/Tool/default.py b/src/engine/SCons/Tool/default.py index ac94f80..8409487 100644 --- a/src/engine/SCons/Tool/default.py +++ b/src/engine/SCons/Tool/default.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/default.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Tool diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py index a4be5ab..58cc0b6 100644 --- a/src/engine/SCons/Tool/dmd.py +++ b/src/engine/SCons/Tool/dmd.py @@ -54,7 +54,7 @@ Lib tool variables: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/dmd.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/dmd.py 4691 2010/03/06 16:22:36 bdbaddog" import os import string diff --git a/src/engine/SCons/Tool/dvi.py b/src/engine/SCons/Tool/dvi.py index 79f7294..ad4bf5e 100644 --- a/src/engine/SCons/Tool/dvi.py +++ b/src/engine/SCons/Tool/dvi.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/dvi.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Builder import SCons.Tool diff --git a/src/engine/SCons/Tool/dvipdf.py b/src/engine/SCons/Tool/dvipdf.py index 22af5e4..c9d8644 100644 --- a/src/engine/SCons/Tool/dvipdf.py +++ b/src/engine/SCons/Tool/dvipdf.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/dvipdf.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/dvipdf.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Defaults diff --git a/src/engine/SCons/Tool/dvips.py b/src/engine/SCons/Tool/dvips.py index 442e78e..2a39808 100644 --- a/src/engine/SCons/Tool/dvips.py +++ b/src/engine/SCons/Tool/dvips.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/dvips.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Builder diff --git a/src/engine/SCons/Tool/f77.py b/src/engine/SCons/Tool/f77.py index f08922f..5140c47 100644 --- a/src/engine/SCons/Tool/f77.py +++ b/src/engine/SCons/Tool/f77.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/f77.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Scanner.Fortran diff --git a/src/engine/SCons/Tool/f90.py b/src/engine/SCons/Tool/f90.py index c1adb7d..c25ff14 100644 --- a/src/engine/SCons/Tool/f90.py +++ b/src/engine/SCons/Tool/f90.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/f90.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Scanner.Fortran diff --git a/src/engine/SCons/Tool/f95.py b/src/engine/SCons/Tool/f95.py index 9a879f1..20e5ba1 100644 --- a/src/engine/SCons/Tool/f95.py +++ b/src/engine/SCons/Tool/f95.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/f95.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/filesystem.py b/src/engine/SCons/Tool/filesystem.py index ed7ac12..6186c94 100644 --- a/src/engine/SCons/Tool/filesystem.py +++ b/src/engine/SCons/Tool/filesystem.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/filesystem.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons from SCons.Tool.install import copyFunc diff --git a/src/engine/SCons/Tool/fortran.py b/src/engine/SCons/Tool/fortran.py index 542aeeb..aef5361 100644 --- a/src/engine/SCons/Tool/fortran.py +++ b/src/engine/SCons/Tool/fortran.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/fortran.py 4691 2010/03/06 16:22:36 bdbaddog" import re import string diff --git a/src/engine/SCons/Tool/fortran.xml b/src/engine/SCons/Tool/fortran.xml index d378cdc..02e0cb8 100644 --- a/src/engine/SCons/Tool/fortran.xml +++ b/src/engine/SCons/Tool/fortran.xml @@ -230,7 +230,7 @@ construction variables are included on this command line. <summary> The string displayed when a Fortran source file is compiled to an object file -after first running the file throught the C preprocessor. +after first running the file through the C preprocessor. If this is not set, then &cv-link-FORTRANPPCOM; (the command line) is displayed. </summary> @@ -295,7 +295,7 @@ are included on this command line. <summary> The string displayed when a Fortran source file is compiled to a shared-library object file -after first running the file throught the C preprocessor. +after first running the file through the C preprocessor. If this is not set, then &cv-link-SHFORTRANPPCOM; (the command line) is displayed. </summary> diff --git a/src/engine/SCons/Tool/g++.py b/src/engine/SCons/Tool/g++.py index 4a1ab73..55835be 100644 --- a/src/engine/SCons/Tool/g++.py +++ b/src/engine/SCons/Tool/g++.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/g++.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import re diff --git a/src/engine/SCons/Tool/g77.py b/src/engine/SCons/Tool/g77.py index d7e4adc..faf4221 100644 --- a/src/engine/SCons/Tool/g77.py +++ b/src/engine/SCons/Tool/g77.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/g77.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util from SCons.Tool.FortranCommon import add_all_to_env, add_f77_to_env diff --git a/src/engine/SCons/Tool/gas.py b/src/engine/SCons/Tool/gas.py index 733193d..9d2d583 100644 --- a/src/engine/SCons/Tool/gas.py +++ b/src/engine/SCons/Tool/gas.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/gas.py 4691 2010/03/06 16:22:36 bdbaddog" as_module = __import__('as', globals(), locals(), []) diff --git a/src/engine/SCons/Tool/gcc.py b/src/engine/SCons/Tool/gcc.py index e5a1d14..c6b0914 100644 --- a/src/engine/SCons/Tool/gcc.py +++ b/src/engine/SCons/Tool/gcc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/gcc.py 4691 2010/03/06 16:22:36 bdbaddog" import cc import os diff --git a/src/engine/SCons/Tool/gfortran.py b/src/engine/SCons/Tool/gfortran.py index 05d1afd..f63f34d 100644 --- a/src/engine/SCons/Tool/gfortran.py +++ b/src/engine/SCons/Tool/gfortran.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/gfortran.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py index bf25c2a..63f556d 100644 --- a/src/engine/SCons/Tool/gnulink.py +++ b/src/engine/SCons/Tool/gnulink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/gnulink.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/gs.py b/src/engine/SCons/Tool/gs.py index 7d4e329..19b2d06 100644 --- a/src/engine/SCons/Tool/gs.py +++ b/src/engine/SCons/Tool/gs.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/gs.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/gs.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Platform diff --git a/src/engine/SCons/Tool/hpc++.py b/src/engine/SCons/Tool/hpc++.py index 8472d35..ce09c43 100644 --- a/src/engine/SCons/Tool/hpc++.py +++ b/src/engine/SCons/Tool/hpc++.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/hpc++.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Tool/hpcc.py b/src/engine/SCons/Tool/hpcc.py index 227f7e0..a1bf575 100644 --- a/src/engine/SCons/Tool/hpcc.py +++ b/src/engine/SCons/Tool/hpcc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/hpcc.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/hplink.py b/src/engine/SCons/Tool/hplink.py index 4e28558..e186de9 100644 --- a/src/engine/SCons/Tool/hplink.py +++ b/src/engine/SCons/Tool/hplink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/hplink.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/icc.py b/src/engine/SCons/Tool/icc.py index 1d68201..b05440d 100644 --- a/src/engine/SCons/Tool/icc.py +++ b/src/engine/SCons/Tool/icc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/icc.py 4691 2010/03/06 16:22:36 bdbaddog" import cc diff --git a/src/engine/SCons/Tool/icl.py b/src/engine/SCons/Tool/icl.py index eb04d2b..3c87f88 100644 --- a/src/engine/SCons/Tool/icl.py +++ b/src/engine/SCons/Tool/icl.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/icl.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Tool.intelc diff --git a/src/engine/SCons/Tool/ifl.py b/src/engine/SCons/Tool/ifl.py index 56ebb4f..5060307 100644 --- a/src/engine/SCons/Tool/ifl.py +++ b/src/engine/SCons/Tool/ifl.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/ifl.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults from SCons.Scanner.Fortran import FortranScan diff --git a/src/engine/SCons/Tool/ifort.py b/src/engine/SCons/Tool/ifort.py index da791e4..df334ee 100644 --- a/src/engine/SCons/Tool/ifort.py +++ b/src/engine/SCons/Tool/ifort.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/ifort.py 4691 2010/03/06 16:22:36 bdbaddog" import string diff --git a/src/engine/SCons/Tool/ilink.py b/src/engine/SCons/Tool/ilink.py index a32c9e4..124d875 100644 --- a/src/engine/SCons/Tool/ilink.py +++ b/src/engine/SCons/Tool/ilink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/ilink.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/ilink32.py b/src/engine/SCons/Tool/ilink32.py index a72db38..46f1b7a 100644 --- a/src/engine/SCons/Tool/ilink32.py +++ b/src/engine/SCons/Tool/ilink32.py @@ -27,7 +27,7 @@ XXX # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/ilink32.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/ilink32.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Tool import SCons.Tool.bcc32 diff --git a/src/engine/SCons/Tool/install.py b/src/engine/SCons/Tool/install.py index 92bbf97..aff8e05 100644 --- a/src/engine/SCons/Tool/install.py +++ b/src/engine/SCons/Tool/install.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/install.py 4691 2010/03/06 16:22:36 bdbaddog" import os import shutil diff --git a/src/engine/SCons/Tool/intelc.py b/src/engine/SCons/Tool/intelc.py index ab103e3..5215db0 100644 --- a/src/engine/SCons/Tool/intelc.py +++ b/src/engine/SCons/Tool/intelc.py @@ -32,7 +32,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/intelc.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/intelc.py 4691 2010/03/06 16:22:36 bdbaddog" import math, sys, os.path, glob, string, re diff --git a/src/engine/SCons/Tool/ipkg.py b/src/engine/SCons/Tool/ipkg.py index da64a99..2d80b6f 100644 --- a/src/engine/SCons/Tool/ipkg.py +++ b/src/engine/SCons/Tool/ipkg.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/ipkg.py 4691 2010/03/06 16:22:36 bdbaddog" import os import string diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py index 3e950be..ee03b3c 100644 --- a/src/engine/SCons/Tool/jar.py +++ b/src/engine/SCons/Tool/jar.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/jar.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Subst import SCons.Util diff --git a/src/engine/SCons/Tool/javac.py b/src/engine/SCons/Tool/javac.py index a41a727..3906496 100644 --- a/src/engine/SCons/Tool/javac.py +++ b/src/engine/SCons/Tool/javac.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/javac.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/javac.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/javah.py b/src/engine/SCons/Tool/javah.py index 5fe1847..baa58da 100644 --- a/src/engine/SCons/Tool/javah.py +++ b/src/engine/SCons/Tool/javah.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/javah.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Tool/latex.py b/src/engine/SCons/Tool/latex.py index b6020ab..ec7b4d0 100644 --- a/src/engine/SCons/Tool/latex.py +++ b/src/engine/SCons/Tool/latex.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/latex.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Defaults diff --git a/src/engine/SCons/Tool/latex.xml b/src/engine/SCons/Tool/latex.xml index 44da828..d53e118 100644 --- a/src/engine/SCons/Tool/latex.xml +++ b/src/engine/SCons/Tool/latex.xml @@ -62,7 +62,7 @@ by re-running LaTeX up to three times. <cvar name="TEXINPUTS"> <summary> -List of directories that the LaTeX programm will search +List of directories that the LaTeX program will search for include directories. The LaTeX implicit dependency scanner will search these directories for \include and \import files. diff --git a/src/engine/SCons/Tool/lex.py b/src/engine/SCons/Tool/lex.py index fe28fe2..37abc55 100644 --- a/src/engine/SCons/Tool/lex.py +++ b/src/engine/SCons/Tool/lex.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/lex.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index 3687be3..993a414 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/link.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/link.xml b/src/engine/SCons/Tool/link.xml index 9e28712..f4e4922 100644 --- a/src/engine/SCons/Tool/link.xml +++ b/src/engine/SCons/Tool/link.xml @@ -136,7 +136,7 @@ The linker for programs that use shared libraries. <cvar name="SHLINKCOM"> <summary> -The command line used to link programs using shared libaries. +The command line used to link programs using shared libraries. </summary> </cvar> diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py index 00da49d..c309bdc 100644 --- a/src/engine/SCons/Tool/linkloc.py +++ b/src/engine/SCons/Tool/linkloc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/linkloc.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import re diff --git a/src/engine/SCons/Tool/m4.py b/src/engine/SCons/Tool/m4.py index 36ed160..5ba4697 100644 --- a/src/engine/SCons/Tool/m4.py +++ b/src/engine/SCons/Tool/m4.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/m4.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Builder diff --git a/src/engine/SCons/Tool/masm.py b/src/engine/SCons/Tool/masm.py index edea8b9..0daffbd 100644 --- a/src/engine/SCons/Tool/masm.py +++ b/src/engine/SCons/Tool/masm.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/masm.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/midl.py b/src/engine/SCons/Tool/midl.py index 9129e98..8793a1b 100644 --- a/src/engine/SCons/Tool/midl.py +++ b/src/engine/SCons/Tool/midl.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/midl.py 4691 2010/03/06 16:22:36 bdbaddog" import string diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index ac67de3..b089ccc 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/mingw.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/mslib.py b/src/engine/SCons/Tool/mslib.py index ee23565..4184c64 100644 --- a/src/engine/SCons/Tool/mslib.py +++ b/src/engine/SCons/Tool/mslib.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/mslib.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index 81f0f32..75f3592 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/mslink.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Tool/mssdk.py b/src/engine/SCons/Tool/mssdk.py index 9a27e53..832b7b1 100644 --- a/src/engine/SCons/Tool/mssdk.py +++ b/src/engine/SCons/Tool/mssdk.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/mssdk.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/mssdk.py 4691 2010/03/06 16:22:36 bdbaddog" """engine.SCons.Tool.mssdk diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index 9f29ab2..af5b2aa 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/msvc.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import re diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml index 556036d..9456730 100644 --- a/src/engine/SCons/Tool/msvc.xml +++ b/src/engine/SCons/Tool/msvc.xml @@ -288,6 +288,20 @@ value (e.g. "XXX") to see the valid values on your system. </summary> </cvar> +<cvar name="MSVC_USE_SCRIPT"> +<summary> +Use a batch script to set up Microsoft Visual Studio compiler + +&cv-MSVC_USE_SCRIPT; overrides &cv-MSVC_VERSION; and &cv-TARGET_ARCH;. +If set to the name of a Visual Studio .bat file (e.g. vcvars.bat), +SCons will run that bat file and extract the relevant variables from +the result (typically %INCLUDE%, %LIB%, and %PATH%). Setting +MSVC_USE_SCRIPT to None bypasses the Visual Studio autodetection +entirely; use this if you are running SCons in a Visual Studio cmd +window and importing the shell's environment variables. +</summary> +</cvar> + <cvar name="HOST_ARCH"> <summary> Sets the host architecture for Visual Studio compiler. If not set, @@ -314,10 +328,16 @@ constructor; setting it later has no effect. This is currently only used on Windows, but in the future it will be used on other OSes as well. -Valid values for Windows are 'x86', 'i386' (for 32 bits); -'amd64', 'emt64', 'x86_64' (64 bits); -and 'ia64' (Itanium). +Valid values for Windows are +<literal>x86</literal>, +<literal>i386</literal> +(for 32 bits); +<literal>amd64</literal>, +<literal>emt64</literal>, +<literal>x86_64</literal> +(for 64 bits); +and <literal>ia64</literal> (Itanium). For example, if you want to compile 64-bit binaries, you would set -TARGET_ARCH='x86_64' in your SCons environment. +<literal>TARGET_ARCH='x86_64'</literal> in your SCons environment. </summary> </cvar> diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index ffdbd03..444868a 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/msvs.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/msvs.py 4691 2010/03/06 16:22:36 bdbaddog" import base64 import hashlib diff --git a/src/engine/SCons/Tool/msvsTests.py b/src/engine/SCons/Tool/msvsTests.py index c32b6f7..5cb83cb 100644 --- a/src/engine/SCons/Tool/msvsTests.py +++ b/src/engine/SCons/Tool/msvsTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/msvsTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/msvsTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import string diff --git a/src/engine/SCons/Tool/mwcc.py b/src/engine/SCons/Tool/mwcc.py index f3c48a4..a8b64d1 100644 --- a/src/engine/SCons/Tool/mwcc.py +++ b/src/engine/SCons/Tool/mwcc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/mwcc.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/mwld.py b/src/engine/SCons/Tool/mwld.py index 70beb5b..0ce6300 100644 --- a/src/engine/SCons/Tool/mwld.py +++ b/src/engine/SCons/Tool/mwld.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/mwld.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Tool diff --git a/src/engine/SCons/Tool/nasm.py b/src/engine/SCons/Tool/nasm.py index 1d7f94b..8a76eb0 100644 --- a/src/engine/SCons/Tool/nasm.py +++ b/src/engine/SCons/Tool/nasm.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/nasm.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/packaging/__init__.py b/src/engine/SCons/Tool/packaging/__init__.py index 5005032..2d1dba4 100644 --- a/src/engine/SCons/Tool/packaging/__init__.py +++ b/src/engine/SCons/Tool/packaging/__init__.py @@ -26,7 +26,7 @@ SCons Packaging Tool. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/packaging/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Environment from SCons.Variables import * diff --git a/src/engine/SCons/Tool/packaging/ipk.py b/src/engine/SCons/Tool/packaging/ipk.py index c11cc38..c57a59a 100644 --- a/src/engine/SCons/Tool/packaging/ipk.py +++ b/src/engine/SCons/Tool/packaging/ipk.py @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/packaging/ipk.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/ipk.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Builder import SCons.Node.FS diff --git a/src/engine/SCons/Tool/packaging/msi.py b/src/engine/SCons/Tool/packaging/msi.py index 6e04c64..2acb08c 100644 --- a/src/engine/SCons/Tool/packaging/msi.py +++ b/src/engine/SCons/Tool/packaging/msi.py @@ -26,7 +26,7 @@ The msi packager. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/packaging/msi.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/msi.py 4691 2010/03/06 16:22:36 bdbaddog" import os import SCons diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py index 2f2be60..db4e924 100644 --- a/src/engine/SCons/Tool/packaging/rpm.py +++ b/src/engine/SCons/Tool/packaging/rpm.py @@ -26,7 +26,7 @@ The rpm packager. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/packaging/rpm.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/rpm.py 4691 2010/03/06 16:22:36 bdbaddog" import os import string diff --git a/src/engine/SCons/Tool/packaging/src_tarbz2.py b/src/engine/SCons/Tool/packaging/src_tarbz2.py index 3bb8880..ae8181b 100644 --- a/src/engine/SCons/Tool/packaging/src_tarbz2.py +++ b/src/engine/SCons/Tool/packaging/src_tarbz2.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/src_tarbz2.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Tool.packaging import putintopackageroot diff --git a/src/engine/SCons/Tool/packaging/src_targz.py b/src/engine/SCons/Tool/packaging/src_targz.py index 544537c..4c6c061 100644 --- a/src/engine/SCons/Tool/packaging/src_targz.py +++ b/src/engine/SCons/Tool/packaging/src_targz.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/src_targz.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Tool.packaging import putintopackageroot diff --git a/src/engine/SCons/Tool/packaging/src_zip.py b/src/engine/SCons/Tool/packaging/src_zip.py index 5a3bb01..4665a8e 100644 --- a/src/engine/SCons/Tool/packaging/src_zip.py +++ b/src/engine/SCons/Tool/packaging/src_zip.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/src_zip.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Tool.packaging import putintopackageroot diff --git a/src/engine/SCons/Tool/packaging/tarbz2.py b/src/engine/SCons/Tool/packaging/tarbz2.py index 9888660..fad2786 100644 --- a/src/engine/SCons/Tool/packaging/tarbz2.py +++ b/src/engine/SCons/Tool/packaging/tarbz2.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/tarbz2.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot diff --git a/src/engine/SCons/Tool/packaging/targz.py b/src/engine/SCons/Tool/packaging/targz.py index 853e438..8295d77 100644 --- a/src/engine/SCons/Tool/packaging/targz.py +++ b/src/engine/SCons/Tool/packaging/targz.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/targz.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot diff --git a/src/engine/SCons/Tool/packaging/zip.py b/src/engine/SCons/Tool/packaging/zip.py index 8592127..67182ed 100644 --- a/src/engine/SCons/Tool/packaging/zip.py +++ b/src/engine/SCons/Tool/packaging/zip.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/packaging/zip.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot diff --git a/src/engine/SCons/Tool/pdf.py b/src/engine/SCons/Tool/pdf.py index d3a7da4..ca4bb4f 100644 --- a/src/engine/SCons/Tool/pdf.py +++ b/src/engine/SCons/Tool/pdf.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/pdf.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Builder import SCons.Tool diff --git a/src/engine/SCons/Tool/pdflatex.py b/src/engine/SCons/Tool/pdflatex.py index 28e10ae..191bb62 100644 --- a/src/engine/SCons/Tool/pdflatex.py +++ b/src/engine/SCons/Tool/pdflatex.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/pdflatex.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Util diff --git a/src/engine/SCons/Tool/pdftex.py b/src/engine/SCons/Tool/pdftex.py index 5589072..e519b7b 100644 --- a/src/engine/SCons/Tool/pdftex.py +++ b/src/engine/SCons/Tool/pdftex.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/pdftex.py 4691 2010/03/06 16:22:36 bdbaddog" import os import SCons.Action diff --git a/src/engine/SCons/Tool/qt.py b/src/engine/SCons/Tool/qt.py index 388dca8..89381a4 100644 --- a/src/engine/SCons/Tool/qt.py +++ b/src/engine/SCons/Tool/qt.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/qt.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import re diff --git a/src/engine/SCons/Tool/qt.xml b/src/engine/SCons/Tool/qt.xml index ddff4cb..1231c8d 100644 --- a/src/engine/SCons/Tool/qt.xml +++ b/src/engine/SCons/Tool/qt.xml @@ -132,7 +132,7 @@ builder method. <cvar name="QT_AUTOSCAN"> <summary> -Turn off scanning for mocable files. Use the Moc Builder to explicitely +Turn off scanning for mocable files. Use the Moc Builder to explicitly specify files to run moc on. </summary> </cvar> diff --git a/src/engine/SCons/Tool/rmic.py b/src/engine/SCons/Tool/rmic.py index c974bc0..5cf8d0d 100644 --- a/src/engine/SCons/Tool/rmic.py +++ b/src/engine/SCons/Tool/rmic.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/rmic.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Tool/rpcgen.py b/src/engine/SCons/Tool/rpcgen.py index 456f1be..d4821dc 100644 --- a/src/engine/SCons/Tool/rpcgen.py +++ b/src/engine/SCons/Tool/rpcgen.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/rpcgen.py 4691 2010/03/06 16:22:36 bdbaddog" from SCons.Builder import Builder import SCons.Util diff --git a/src/engine/SCons/Tool/rpm.py b/src/engine/SCons/Tool/rpm.py index bc2f9f4..c846b4c 100644 --- a/src/engine/SCons/Tool/rpm.py +++ b/src/engine/SCons/Tool/rpm.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/rpm.py 4691 2010/03/06 16:22:36 bdbaddog" import os import re diff --git a/src/engine/SCons/Tool/sgiar.py b/src/engine/SCons/Tool/sgiar.py index 1bfd9ad..f16c378 100644 --- a/src/engine/SCons/Tool/sgiar.py +++ b/src/engine/SCons/Tool/sgiar.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sgiar.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/sgic++.py b/src/engine/SCons/Tool/sgic++.py index 9c9056f..cf9f0bb 100644 --- a/src/engine/SCons/Tool/sgic++.py +++ b/src/engine/SCons/Tool/sgic++.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sgic++.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/sgicc.py b/src/engine/SCons/Tool/sgicc.py index 1f49e8b..1c80c42 100644 --- a/src/engine/SCons/Tool/sgicc.py +++ b/src/engine/SCons/Tool/sgicc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sgicc.py 4691 2010/03/06 16:22:36 bdbaddog" import cc diff --git a/src/engine/SCons/Tool/sgilink.py b/src/engine/SCons/Tool/sgilink.py index b57cd0b..bad2f0e 100644 --- a/src/engine/SCons/Tool/sgilink.py +++ b/src/engine/SCons/Tool/sgilink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sgilink.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/sunar.py b/src/engine/SCons/Tool/sunar.py index d713d77..71dc728 100644 --- a/src/engine/SCons/Tool/sunar.py +++ b/src/engine/SCons/Tool/sunar.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sunar.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/src/engine/SCons/Tool/sunc++.py b/src/engine/SCons/Tool/sunc++.py index 7aa1085..46e8c57 100644 --- a/src/engine/SCons/Tool/sunc++.py +++ b/src/engine/SCons/Tool/sunc++.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sunc++.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons diff --git a/src/engine/SCons/Tool/suncc.py b/src/engine/SCons/Tool/suncc.py index 83590b9..56fac21 100644 --- a/src/engine/SCons/Tool/suncc.py +++ b/src/engine/SCons/Tool/suncc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/suncc.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/sunf77.py b/src/engine/SCons/Tool/sunf77.py index 8bc3628..11f9d84 100644 --- a/src/engine/SCons/Tool/sunf77.py +++ b/src/engine/SCons/Tool/sunf77.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sunf77.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/sunf90.py b/src/engine/SCons/Tool/sunf90.py index 9fae048..fa47ce6 100644 --- a/src/engine/SCons/Tool/sunf90.py +++ b/src/engine/SCons/Tool/sunf90.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sunf90.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/sunf95.py b/src/engine/SCons/Tool/sunf95.py index d2c4a23..6b05145 100644 --- a/src/engine/SCons/Tool/sunf95.py +++ b/src/engine/SCons/Tool/sunf95.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sunf95.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Util diff --git a/src/engine/SCons/Tool/sunlink.py b/src/engine/SCons/Tool/sunlink.py index 3b1310f..f2da070 100644 --- a/src/engine/SCons/Tool/sunlink.py +++ b/src/engine/SCons/Tool/sunlink.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/sunlink.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 3fe2353..ff1f288 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/swig.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import re diff --git a/src/engine/SCons/Tool/tar.py b/src/engine/SCons/Tool/tar.py index 402a750..329dff7 100644 --- a/src/engine/SCons/Tool/tar.py +++ b/src/engine/SCons/Tool/tar.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/tar.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Action import SCons.Builder diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py index 763a7a1..8f07f00 100644 --- a/src/engine/SCons/Tool/tex.py +++ b/src/engine/SCons/Tool/tex.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/tex.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import re diff --git a/src/engine/SCons/Tool/textfile.py b/src/engine/SCons/Tool/textfile.py index 95d798b..1e4d79d 100644 --- a/src/engine/SCons/Tool/textfile.py +++ b/src/engine/SCons/Tool/textfile.py @@ -44,7 +44,7 @@ Textfile/Substfile builder for SCons. is unpredictible whether the expansion will occur. """ -__revision__ = "src/engine/SCons/Tool/textfile.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/textfile.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons diff --git a/src/engine/SCons/Tool/tlib.py b/src/engine/SCons/Tool/tlib.py index 31bb3e2..aa403ea 100644 --- a/src/engine/SCons/Tool/tlib.py +++ b/src/engine/SCons/Tool/tlib.py @@ -27,7 +27,7 @@ XXX # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/tlib.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/tlib.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Tool import SCons.Tool.bcc32 diff --git a/src/engine/SCons/Tool/wix.py b/src/engine/SCons/Tool/wix.py index 59e7ce7..c4d7223 100644 --- a/src/engine/SCons/Tool/wix.py +++ b/src/engine/SCons/Tool/wix.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/wix.py 4691 2010/03/06 16:22:36 bdbaddog" import SCons.Builder import SCons.Action diff --git a/src/engine/SCons/Tool/yacc.py b/src/engine/SCons/Tool/yacc.py index 2e22538..cde30ea 100644 --- a/src/engine/SCons/Tool/yacc.py +++ b/src/engine/SCons/Tool/yacc.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/yacc.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Tool/zip.py b/src/engine/SCons/Tool/zip.py index 6ec6d3f..61f4dc2 100644 --- a/src/engine/SCons/Tool/zip.py +++ b/src/engine/SCons/Tool/zip.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Tool/zip.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index ab69445..b50cdbb 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -27,7 +27,7 @@ Various utility functions go here. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Util.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Util.py 4691 2010/03/06 16:22:36 bdbaddog" import copy import os diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py index 253c0c1..f5993f3 100644 --- a/src/engine/SCons/UtilTests.py +++ b/src/engine/SCons/UtilTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/UtilTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/UtilTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path diff --git a/src/engine/SCons/Variables/BoolVariable.py b/src/engine/SCons/Variables/BoolVariable.py index 166d836..cef26af 100644 --- a/src/engine/SCons/Variables/BoolVariable.py +++ b/src/engine/SCons/Variables/BoolVariable.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/BoolVariable.py 4691 2010/03/06 16:22:36 bdbaddog" __all__ = ['BoolVariable',] diff --git a/src/engine/SCons/Variables/BoolVariableTests.py b/src/engine/SCons/Variables/BoolVariableTests.py index 1864d9e..2ad6bbf 100644 --- a/src/engine/SCons/Variables/BoolVariableTests.py +++ b/src/engine/SCons/Variables/BoolVariableTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/BoolVariableTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/BoolVariableTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Variables/EnumVariable.py b/src/engine/SCons/Variables/EnumVariable.py index 3e432dc..906238c 100644 --- a/src/engine/SCons/Variables/EnumVariable.py +++ b/src/engine/SCons/Variables/EnumVariable.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/EnumVariable.py 4691 2010/03/06 16:22:36 bdbaddog" __all__ = ['EnumVariable',] diff --git a/src/engine/SCons/Variables/EnumVariableTests.py b/src/engine/SCons/Variables/EnumVariableTests.py index 053a4f6..66b106c 100644 --- a/src/engine/SCons/Variables/EnumVariableTests.py +++ b/src/engine/SCons/Variables/EnumVariableTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/EnumVariableTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/EnumVariableTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Variables/ListVariable.py b/src/engine/SCons/Variables/ListVariable.py index 659a785..b888c3f 100644 --- a/src/engine/SCons/Variables/ListVariable.py +++ b/src/engine/SCons/Variables/ListVariable.py @@ -47,7 +47,7 @@ Usage example: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/ListVariable.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/ListVariable.py 4691 2010/03/06 16:22:36 bdbaddog" # Know Bug: This should behave like a Set-Type, but does not really, # since elements can occur twice. diff --git a/src/engine/SCons/Variables/ListVariableTests.py b/src/engine/SCons/Variables/ListVariableTests.py index 2279a90..8465699 100644 --- a/src/engine/SCons/Variables/ListVariableTests.py +++ b/src/engine/SCons/Variables/ListVariableTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/ListVariableTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/ListVariableTests.py 4691 2010/03/06 16:22:36 bdbaddog" import copy import sys diff --git a/src/engine/SCons/Variables/PackageVariable.py b/src/engine/SCons/Variables/PackageVariable.py index 4b4853d..cb1ee58 100644 --- a/src/engine/SCons/Variables/PackageVariable.py +++ b/src/engine/SCons/Variables/PackageVariable.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/PackageVariable.py 4691 2010/03/06 16:22:36 bdbaddog" __all__ = ['PackageVariable',] diff --git a/src/engine/SCons/Variables/PackageVariableTests.py b/src/engine/SCons/Variables/PackageVariableTests.py index 9100f3e..4e291ae 100644 --- a/src/engine/SCons/Variables/PackageVariableTests.py +++ b/src/engine/SCons/Variables/PackageVariableTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/PackageVariableTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/PackageVariableTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Variables/PathVariable.py b/src/engine/SCons/Variables/PathVariable.py index 7b6848c..9318588 100644 --- a/src/engine/SCons/Variables/PathVariable.py +++ b/src/engine/SCons/Variables/PathVariable.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/PathVariable.py 4691 2010/03/06 16:22:36 bdbaddog" __all__ = ['PathVariable',] diff --git a/src/engine/SCons/Variables/PathVariableTests.py b/src/engine/SCons/Variables/PathVariableTests.py index e958dcf..04b9e0f 100644 --- a/src/engine/SCons/Variables/PathVariableTests.py +++ b/src/engine/SCons/Variables/PathVariableTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/PathVariableTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/PathVariableTests.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import sys diff --git a/src/engine/SCons/Variables/VariablesTests.py b/src/engine/SCons/Variables/VariablesTests.py index e3c0470..9bba800 100644 --- a/src/engine/SCons/Variables/VariablesTests.py +++ b/src/engine/SCons/Variables/VariablesTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/VariablesTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/VariablesTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py index 96391ae..c3bdc6f 100644 --- a/src/engine/SCons/Variables/__init__.py +++ b/src/engine/SCons/Variables/__init__.py @@ -27,7 +27,7 @@ customizable variables to an SCons build. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/__init__.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Variables/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import string diff --git a/src/engine/SCons/Warnings.py b/src/engine/SCons/Warnings.py index ef97126..786265f 100644 --- a/src/engine/SCons/Warnings.py +++ b/src/engine/SCons/Warnings.py @@ -27,7 +27,7 @@ This file implements the warnings framework for SCons. """ -__revision__ = "src/engine/SCons/Warnings.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/Warnings.py 4691 2010/03/06 16:22:36 bdbaddog" import string import sys diff --git a/src/engine/SCons/WarningsTests.py b/src/engine/SCons/WarningsTests.py index 74f4399..e7f9e06 100644 --- a/src/engine/SCons/WarningsTests.py +++ b/src/engine/SCons/WarningsTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/WarningsTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/WarningsTests.py 4691 2010/03/06 16:22:36 bdbaddog" import sys import unittest diff --git a/src/engine/SCons/__init__.py b/src/engine/SCons/__init__.py index 0a3028a..9c0898d 100644 --- a/src/engine/SCons/__init__.py +++ b/src/engine/SCons/__init__.py @@ -27,17 +27,17 @@ 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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" -__version__ = "1.2.0.d20100117" +__version__ = "1.2.0.d20100306" -__build__ = "r4629" +__build__ = "r4691" -__buildsys__ = "scons-dev" +__buildsys__ = "mvdog" -__date__ = "2010/01/17 22:23:21" +__date__ = "2010/03/06 16:22:36" -__developer__ = "scons" +__developer__ = "bdbaddog" # make sure compatibility is always in place import SCons.compat diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py index 1d321d5..87c75e4 100644 --- a/src/engine/SCons/compat/__init__.py +++ b/src/engine/SCons/compat/__init__.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/compat/__init__.py 4691 2010/03/06 16:22:36 bdbaddog" def import_as(module, name): """ diff --git a/src/engine/SCons/compat/_scons_UserString.py b/src/engine/SCons/compat/_scons_UserString.py index 2f4adde..9c96bdc 100644 --- a/src/engine/SCons/compat/_scons_UserString.py +++ b/src/engine/SCons/compat/_scons_UserString.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/compat/_scons_UserString.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/compat/_scons_UserString.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ A user-defined wrapper around string objects diff --git a/src/engine/SCons/compat/_scons_hashlib.py b/src/engine/SCons/compat/_scons_hashlib.py index 6f62388..d00f177 100644 --- a/src/engine/SCons/compat/_scons_hashlib.py +++ b/src/engine/SCons/compat/_scons_hashlib.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/compat/_scons_hashlib.py 4691 2010/03/06 16:22:36 bdbaddog" import md5 import string diff --git a/src/engine/SCons/compat/_scons_itertools.py b/src/engine/SCons/compat/_scons_itertools.py index d715cf6..4c66894 100644 --- a/src/engine/SCons/compat/_scons_itertools.py +++ b/src/engine/SCons/compat/_scons_itertools.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/compat/_scons_itertools.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/compat/_scons_itertools.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ Implementations of itertools functions for Python versions that don't diff --git a/src/engine/SCons/compat/_scons_platform.py b/src/engine/SCons/compat/_scons_platform.py index 70bf4a6..8af807e 100644 --- a/src/engine/SCons/compat/_scons_platform.py +++ b/src/engine/SCons/compat/_scons_platform.py @@ -29,7 +29,7 @@ functionality. It only wraps the portions of platform functionality used by SCons. """ -__revision__ = "src/engine/SCons/compat/_scons_platform.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/compat/_scons_platform.py 4691 2010/03/06 16:22:36 bdbaddog" ### Portable uname() interface diff --git a/src/engine/SCons/compat/_scons_subprocess.py b/src/engine/SCons/compat/_scons_subprocess.py index 4968825..ccd403a 100644 --- a/src/engine/SCons/compat/_scons_subprocess.py +++ b/src/engine/SCons/compat/_scons_subprocess.py @@ -381,7 +381,21 @@ if mswindows: # can't import it. pass import msvcrt - if 0: # <-- change this to use pywin32 instead of the _subprocess driver + try: + # Try to get _subprocess + from _subprocess import * + class STARTUPINFO: + dwFlags = 0 + hStdInput = None + hStdOutput = None + hStdError = None + wShowWindow = 0 + class pywintypes: + error = IOError + except ImportError: + # If not there, then drop back to requiring pywin32 + # TODO: Should this be wrapped in try as well? To notify user to install + # pywin32 ? With URL to it? import pywintypes from win32api import GetStdHandle, STD_INPUT_HANDLE, \ STD_OUTPUT_HANDLE, STD_ERROR_HANDLE @@ -393,20 +407,8 @@ if mswindows: GetExitCodeProcess, STARTF_USESTDHANDLES, \ STARTF_USESHOWWINDOW, CREATE_NEW_CONSOLE from win32event import WaitForSingleObject, INFINITE, WAIT_OBJECT_0 - else: - # SCons: don't die on Python versions that don't have _subprocess. - try: - from _subprocess import * - except ImportError: - pass - class STARTUPINFO: - dwFlags = 0 - hStdInput = None - hStdOutput = None - hStdError = None - wShowWindow = 0 - class pywintypes: - error = IOError + + else: import select import errno diff --git a/src/engine/SCons/compat/builtins.py b/src/engine/SCons/compat/builtins.py index cc0bc46..2c1fa32 100644 --- a/src/engine/SCons/compat/builtins.py +++ b/src/engine/SCons/compat/builtins.py @@ -55,7 +55,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/builtins.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/compat/builtins.py 4691 2010/03/06 16:22:36 bdbaddog" import __builtin__ diff --git a/src/engine/SCons/cpp.py b/src/engine/SCons/cpp.py index 93886d8..faf8c27 100644 --- a/src/engine/SCons/cpp.py +++ b/src/engine/SCons/cpp.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/cpp.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/cpp.py 4691 2010/03/06 16:22:36 bdbaddog" __doc__ = """ SCons C Pre-Processor module diff --git a/src/engine/SCons/cppTests.py b/src/engine/SCons/cppTests.py index c322833..0f5763e 100644 --- a/src/engine/SCons/cppTests.py +++ b/src/engine/SCons/cppTests.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/cppTests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/cppTests.py 4691 2010/03/06 16:22:36 bdbaddog" import string import sys diff --git a/src/engine/SCons/exitfuncs.py b/src/engine/SCons/exitfuncs.py index befc9e2..6a78cfe 100644 --- a/src/engine/SCons/exitfuncs.py +++ b/src/engine/SCons/exitfuncs.py @@ -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 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/SCons/exitfuncs.py 4691 2010/03/06 16:22:36 bdbaddog" diff --git a/src/engine/setup.py b/src/engine/setup.py index 1e9443e..1a5ace6 100644 --- a/src/engine/setup.py +++ b/src/engine/setup.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/setup.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/engine/setup.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path @@ -37,7 +37,7 @@ if head: # May come in handy to allow this setup.py to switch-hit between # python-scons and python2-scons. #head, package = os.path.split(os.getcwd()) -#suffix = "-1.2.0.d20100117" +#suffix = "-1.2.0.d20100306" #if package[-len(suffix):] == suffix: # package = package[:-len(suffix)] @@ -51,7 +51,7 @@ ver = { } setup(name = package, - version = "1.2.0.d20100117", + version = "1.2.0.d20100306", description = "SCons Python %s extension modules" % ver[package], long_description = """SCons is an Open Source software construction tool--that is, a build tool; an improved substitute for the classic Make utility; a better way to build diff --git a/src/script/README.txt b/src/script/README.txt index d841b26..49f0f3c 100644 --- a/src/script/README.txt +++ b/src/script/README.txt @@ -5,12 +5,12 @@ ### A SEPARATE SCRIPT PACKAGE IN THE FUTURE. ### # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation -# src/script/README.txt 4629 2010/01/17 22:23:21 scons +# src/script/README.txt 4691 2010/03/06 16:22:36 bdbaddog SCons - a software construction tool - Version 1.2.0.d20100117 + Version 1.2.0.d20100306 This is an alpha release of SCons, a tool for building software (and diff --git a/src/script/scons-post-install.py b/src/script/scons-post-install.py index 53ea180..f62b0d8 100644 --- a/src/script/scons-post-install.py +++ b/src/script/scons-post-install.py @@ -31,7 +31,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/script/scons-post-install.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/script/scons-post-install.py 4691 2010/03/06 16:22:36 bdbaddog" import os.path import sys diff --git a/src/script/scons-time.py b/src/script/scons-time.py index 969cfa6..a6e2142 100644 --- a/src/script/scons-time.py +++ b/src/script/scons-time.py @@ -33,7 +33,7 @@ from __future__ import nested_scopes -__revision__ = "src/script/scons-time.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/script/scons-time.py 4691 2010/03/06 16:22:36 bdbaddog" import getopt import glob diff --git a/src/script/scons.bat b/src/script/scons.bat index 69fa8f1..df01d9d 100644 --- a/src/script/scons.bat +++ b/src/script/scons.bat @@ -1,11 +1,11 @@ @REM Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-@REM src/script/scons.bat 4629 2010/01/17 22:23:21 scons
+@REM src/script/scons.bat 4691 2010/03/06 16:22:36 bdbaddog
@echo off
set SCONS_ERRORLEVEL=
if "%OS%" == "Windows_NT" goto WinNT
@REM for 9x/Me you better not have more than 9 args
-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-1.2.0.d20100117'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100117'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-1.2.0.d20100306'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100306'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
@REM no way to set exit status of this script for 9x/Me
goto endscons
@@ -17,7 +17,7 @@ goto endscons setlocal
@REM ensure the script will be executed with the Python it was installed for
set path=%~dp0;%~dp0..;%path%
-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-1.2.0.d20100117'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100117'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-1.2.0.d20100306'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-1.2.0.d20100306'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %*
endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL%
if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto returncode
diff --git a/src/script/scons.py b/src/script/scons.py index 219dd73..a8438d8 100644 --- a/src/script/scons.py +++ b/src/script/scons.py @@ -24,17 +24,17 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/script/scons.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/script/scons.py 4691 2010/03/06 16:22:36 bdbaddog" -__version__ = "1.2.0.d20100117" +__version__ = "1.2.0.d20100306" -__build__ = "r4629" +__build__ = "r4691" -__buildsys__ = "scons-dev" +__buildsys__ = "mvdog" -__date__ = "2010/01/17 22:23:21" +__date__ = "2010/03/06 16:22:36" -__developer__ = "scons" +__developer__ = "bdbaddog" import os import os.path @@ -160,6 +160,19 @@ else: # Check /usr/libfoo/scons*. prefs.append(libpath) + try: + import pkg_resources + except ImportError: + pass + else: + # when running from an egg add the egg's directory + try: + d = pkg_resources.get_distribution('scons') + except pkg_resources.DistributionNotFound: + pass + else: + prefs.append(d.location) + # Look first for 'scons-__version__' in all of our preference libs, # then for 'scons'. libs.extend(map(lambda x: os.path.join(x, scons_version), prefs)) diff --git a/src/script/sconsign.py b/src/script/sconsign.py index dcaad40..b461c54 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -24,17 +24,17 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/script/sconsign.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/script/sconsign.py 4691 2010/03/06 16:22:36 bdbaddog" -__version__ = "1.2.0.d20100117" +__version__ = "1.2.0.d20100306" -__build__ = "r4629" +__build__ = "r4691" -__buildsys__ = "scons-dev" +__buildsys__ = "mvdog" -__date__ = "2010/01/17 22:23:21" +__date__ = "2010/03/06 16:22:36" -__developer__ = "scons" +__developer__ = "bdbaddog" import os import os.path @@ -148,6 +148,19 @@ else: # Check /usr/libfoo/scons*. prefs.append(libpath) + try: + import pkg_resources + except ImportError: + pass + else: + # when running from an egg add the egg's directory + try: + d = pkg_resources.get_distribution('scons') + except pkg_resources.DistributionNotFound: + pass + else: + prefs.append(d.location) + # Look first for 'scons-__version__' in all of our preference libs, # then for 'scons'. libs.extend(map(lambda x: os.path.join(x, scons_version), prefs)) diff --git a/src/script/setup.py b/src/script/setup.py index e204473..15adc61 100644 --- a/src/script/setup.py +++ b/src/script/setup.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/script/setup.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/script/setup.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path @@ -36,7 +36,7 @@ if head: from distutils.core import setup setup(name = "scons-script", - version = "1.2.0.d20100117", + version = "1.2.0.d20100306", description = "an Open Source software construction tool script", long_description = """SCons is an Open Source software construction tool--that is, a build tool; an improved substitute for the classic Make utility; a better way to build diff --git a/src/setup.py b/src/setup.py index e54fd3a..cb3be66 100644 --- a/src/setup.py +++ b/src/setup.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/setup.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/setup.py 4691 2010/03/06 16:22:36 bdbaddog" import os import os.path @@ -29,7 +29,7 @@ import stat import string import sys -Version = "1.2.0.d20100117" +Version = "1.2.0.d20100306" man_pages = [ 'scons.1', diff --git a/src/test_aegistests.py b/src/test_aegistests.py index 25b3934..1bcf2fb 100644 --- a/src/test_aegistests.py +++ b/src/test_aegistests.py @@ -22,7 +22,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/test_aegistests.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/test_aegistests.py 4691 2010/03/06 16:22:36 bdbaddog" """ Verify that we have proper Copyright notices on all the right files diff --git a/src/test_files.py b/src/test_files.py index b0714f2..7b83805 100644 --- a/src/test_files.py +++ b/src/test_files.py @@ -22,7 +22,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/test_files.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/test_files.py 4691 2010/03/06 16:22:36 bdbaddog" """ Verify that we have certain important files in our distribution diff --git a/src/test_interrupts.py b/src/test_interrupts.py index ea97b2f..d88ee45 100644 --- a/src/test_interrupts.py +++ b/src/test_interrupts.py @@ -22,7 +22,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/test_interrupts.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/test_interrupts.py 4691 2010/03/06 16:22:36 bdbaddog" """ Verify that the SCons source code contains only correct handling of diff --git a/src/test_pychecker.py b/src/test_pychecker.py index 414932c..596cfa2 100644 --- a/src/test_pychecker.py +++ b/src/test_pychecker.py @@ -22,7 +22,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/test_pychecker.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/test_pychecker.py 4691 2010/03/06 16:22:36 bdbaddog" """ Use pychecker to catch various Python coding errors. diff --git a/src/test_setup.py b/src/test_setup.py index b840250..bc7ba77 100644 --- a/src/test_setup.py +++ b/src/test_setup.py @@ -22,7 +22,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/test_setup.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/test_setup.py 4691 2010/03/06 16:22:36 bdbaddog" """ Test how the setup.py script installs SCons. diff --git a/src/test_strings.py b/src/test_strings.py index c048784..98da72f 100644 --- a/src/test_strings.py +++ b/src/test_strings.py @@ -22,7 +22,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/test_strings.py 4629 2010/01/17 22:23:21 scons" +__revision__ = "src/test_strings.py 4691 2010/03/06 16:22:36 bdbaddog" """ Verify that we have proper strings like Copyright notices on all the @@ -106,7 +106,7 @@ class Checker: class CheckUnexpandedStrings(Checker): expressions = [ re.compile('Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation'), - re.compile('src/test_strings.py 4629 2010/01/17 22:23:21 scons'), + re.compile('src/test_strings.py 4691 2010/03/06 16:22:36 bdbaddog'), ] def must_be_built(self): return None |