W. Trevor King [Fri, 23 Apr 2010 00:36:23 +0000 (20:36 -0400)]
Oops. Correct docstring for multi-line_include_options.py
W. Trevor King [Fri, 23 Apr 2010 00:29:06 +0000 (20:29 -0400)]
Added fix for text/TEX/multi-line_include_options.py.
By removing comments from the source file, we produce a "canonical"
form of the input TeX that LaTeX.cre, the input regexp, can handle.
W. Trevor King [Thu, 22 Apr 2010 23:58:14 +0000 (19:58 -0400)]
Add test/TEX/multi-line_include_options.py
The LaTeX scanner chokes when an inclusion's optional argument
(enclosed in square brackets: []) spans multiple lines.
An example of this in the wild is in Thomas Heim's epsdice LaTeX package:
\includegraphics[height=1.75ex,viewport= 3 4 38 39,%
clip=true]{\dicefile}%
In epsdice 2007/02/15, v. 2.1.
W. Trevor King [Sat, 17 Apr 2010 07:28:50 +0000 (03:28 -0400)]
Added fix for TeX includes with same name as subdirs.
W. Trevor King [Sat, 17 Apr 2010 07:22:49 +0000 (03:22 -0400)]
Use TeX over LaTeX to test includes with same name as subdirs.
Might as well keep things simple.
W. Trevor King [Sat, 17 Apr 2010 06:34:46 +0000 (02:34 -0400)]
Added test for TeX includes with same name as subdirs.
This is the same problem as Issue 1953:
error: DirNodeInfo instance has no attribute 'csig'
except in a less central location. I recycled John Gozde's CPPPATH
test for the new problem.
W. Trevor King [Sat, 17 Apr 2010 04:19:52 +0000 (00:19 -0400)]
Rework README to avoid broken "python script/scons.py" calls.
While it is nice to mention the whole SCONS_LIB_DIR bit, it seems
easier and less error prone to just stick to bootstrap.py. Maybe not
exactly what bootstrap.py was intended for, but certainly something it
is very good at. The new README layout (hopefully) makes this
more obvious.
I also added "-o test.log" to to the DEVELOPMENT WORKFLOW runtest.py
invocation, since it would be a shame to run that many tests, and then
have to run them all again if the failures scrolled up out of the
terminal and you weren't running xterm/screen/etc. with a history.
gregnoel [Fri, 16 Apr 2010 22:01:00 +0000 (22:01 +0000)]
scons.tigris.org/issues/show_bug.cgi?id=2345
Quiet the rest of the 'callable' warnings and fix the rest of the 'cmp
argument' warnings.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4789
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Fri, 16 Apr 2010 13:40:49 +0000 (13:40 +0000)]
Refactory bin/* utilities to use os.walk() instead of os.path.walk().
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4788
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Thu, 15 Apr 2010 19:21:08 +0000 (19:21 +0000)]
scons.tigris.org/issues/show_bug.cgi?id=2345
Fixes due to running the regression tests with the '-3' option to Python2.6,
which causes the run-time to look for potential compatibility problems with
Python 3.x. In some cases, all we can do is quiet the warning since we still
support Python versions that can't use the newer idiom. In other cases, we
fix the problem. This patch contains a mix of quieting and fixing, plus a
little lint.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4787
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 15 Apr 2010 01:06:53 +0000 (01:06 +0000)]
Refactor use of basestring to use exec() on attempted assignment of
basestring to an internal variable (which we thenuse in a common
is_basestring() utility function), to avoid triggering the basestring fixer.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4786
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Thu, 15 Apr 2010 00:02:59 +0000 (00:02 +0000)]
scons.tigris.org/issues/show_bug.cgi?id=2345
Apply the first part of the 'raise' fixer (the three-argument cases are not
converted and will need to wait until native support of with_traceback() is
available).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4785
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 14 Apr 2010 23:32:50 +0000 (23:32 +0000)]
Eliminate / replace remaining cPickle references in test scripts.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4784
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 14 Apr 2010 04:38:34 +0000 (04:38 +0000)]
Add a stub compat/_scon_dbm.py module and copy whichdb.whichdb() to
dbm.whichdb() if necessary.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4783
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 13 Apr 2010 07:42:22 +0000 (07:42 +0000)]
Avoid 3.0 fixer issues by not using module names as variable names.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4782
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Mon, 12 Apr 2010 01:50:52 +0000 (01:50 +0000)]
Issue 2336: Forward compatibility for use of the "builtins" module
instead of __builtin__.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4781
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 11 Apr 2010 18:56:18 +0000 (18:56 +0000)]
Towards issue 2336: Rename the compat/builtins.py module to
compat/_scons_builtings.py, to avoid the name conflict.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4780
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 11 Apr 2010 14:09:56 +0000 (14:09 +0000)]
Add compat "collections" module for pre-2.4 Python verseions. For now.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4779
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Fri, 9 Apr 2010 18:39:21 +0000 (18:39 +0000)]
Issue 2331: For forward compatibility, use "import pickle" and have
the SCons.compat layer import cPickle as pickle when it's available.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4778
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Fri, 9 Apr 2010 16:57:36 +0000 (16:57 +0000)]
Issue 2330: For forward compatibility, use "import profile" and have
the SCons.compat layer import cProfile as profile when it's available.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4777
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 8 Apr 2010 13:13:23 +0000 (13:13 +0000)]
Remove the deleted _scons_UserString.py file from the packaging manifest.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4776
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 7 Apr 2010 15:29:39 +0000 (15:29 +0000)]
Issue 2334: Use compatibility versions of collections.User{Dict,List,String}
instead of the deprecated User{Dict,List,String} modules. The two test
scripts that use User{List,String} fall back on ImportError by hand.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4775
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 7 Apr 2010 13:16:57 +0000 (13:16 +0000)]
Issue 2332: Convert from using StringIO.StringIO class to using the
forward-compatible io.StringIO class, with the addition of an "io"
compatibility module for Python versions before 2.6.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4774
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 6 Apr 2010 15:13:51 +0000 (15:13 +0000)]
Issue 2332 (preparation): refactor print statements so we can
transition to using the Python 2.6 io.StringIO class.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4773
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 6 Apr 2010 05:13:48 +0000 (05:13 +0000)]
Fix test for non-win32 platforms
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4772
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 6 Apr 2010 01:29:47 +0000 (01:29 +0000)]
Fix vc9.0 express issue, misspelling, and add testcase which would have exposed the issue.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4770
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 6 Apr 2010 00:11:35 +0000 (00:11 +0000)]
Issue 2331: use cPickle in preference to the pickle module.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4768
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Mon, 5 Apr 2010 05:06:48 +0000 (05:06 +0000)]
Fix XML in documentation, and in the bin/scons-doc.py script that generates
the User's Guide XML from the .in files' SGML.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4767
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Mon, 5 Apr 2010 00:56:32 +0000 (00:56 +0000)]
Adding 1.3.0.
d20100404
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4766
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sat, 3 Apr 2010 22:10:25 +0000 (22:10 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-4754" from
http://scons.tigris.org/svn/scons/checkpoint/trunk
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4756
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Fri, 2 Apr 2010 13:33:16 +0000 (13:33 +0000)]
Remove references to the removed _scons_sets15.py module.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4749
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Wed, 31 Mar 2010 06:40:58 +0000 (06:40 +0000)]
Revert revision 4742. How hard is it to understand "No bugfixes in 2.0"?
This fix should be in 2.0.1, which will mirror the changes in 1.3.1.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4747
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Wed, 31 Mar 2010 06:02:09 +0000 (06:02 +0000)]
A bit of a blind checkin, but there's no need to put the compatibility names
in the __builtin__ namespace, as this program only imports standard Python
modules, which shouldn't need any such names.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4746
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Wed, 31 Mar 2010 04:45:01 +0000 (04:45 +0000)]
Fix exception thrown when VC9.0Exp is used.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4742
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Tue, 30 Mar 2010 13:40:36 +0000 (13:40 +0000)]
Only one SCons file uses urllib, and only one routine from that module, so
use a simple hack to load that routine, no matter wheter it's Python 2.x or
Python 3.x. Tested with Python 2.5, 2.6, and 3.0.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4738
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 30 Mar 2010 13:32:51 +0000 (13:32 +0000)]
Remove the recently-removed _scons_sets15.py from MANIFEST.in.
Fix a typo in the SConstruct.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4737
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Tue, 30 Mar 2010 02:51:37 +0000 (02:51 +0000)]
Trivial man page fix; fixes issue #2585.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4736
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Mon, 29 Mar 2010 14:21:04 +0000 (14:21 +0000)]
scons.tigris.org/issues/show_bug.cgi?id=2345
The 'buffer' fixer simply replaces 'buffer( ... )' with 'memoryview( ... )',
which is incorrect for our cases, so these changes had to be done by hand and
a forward-compatibility class added.
The 'xrange' fixer was applied. Manual changes were minimal: a few case in
test strings and one use of 'range' as an identifer in the same scope as
where 'xrange' was converted to 'range'.
The "sets15" compat function, which provided backward compatibility for Python
versions prior to 2.2, was removed as no longer needed.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4735
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Mon, 29 Mar 2010 05:50:15 +0000 (05:50 +0000)]
scons.tigris.org/issues/show_bug.cgi?id=2345
Accumulated small fixers: renames, next, zip, and intern.
Files that were modified or added while developing on branches/pending didn't
have the fixers previously applied. This patchset picks up those.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4734
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Sat, 27 Mar 2010 07:39:52 +0000 (07:39 +0000)]
scons.tigris.org/issues/show_bug.cgi?id=2329
Applied a number of idiomatic changes.
Uses of the 'sort()' method were converted into calls of 'sorted()' when
possible and the sorted() expression was inserted into a subsequent statement
whenever that made sense.
The statement 'while 1:' was changed to 'while True:'.
Names from the 'types' module (e.g., 'types.FooType') were converted to the
equivalent build-in type (e.g., 'foo').
Comparisons between types were changed to use 'isinstance()'.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4733
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 25 Mar 2010 17:45:47 +0000 (17:45 +0000)]
Issue 2327: provide a compat sorted() function for pre-2.4 Python versions.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4732
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Thu, 25 Mar 2010 06:18:29 +0000 (06:18 +0000)]
scons.tigris.org/issues/show_bug.cgi?id=2341
Wrap a zip() expression in list().
http://scons.tigris.org/issues/show_bug.cgi?id=2342
Remove the 'L' from 'long' variables (no longer needed).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4731
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Thu, 25 Mar 2010 04:14:28 +0000 (04:14 +0000)]
Move 2.0 changes collected in branches/pending back to trunk for further
development. Note that this set of changes is NOT backward-compatible;
the trunk no longer works with Python 1.5.2, 2.0, or 2.1.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4729
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Thu, 25 Mar 2010 03:27:13 +0000 (03:27 +0000)]
Update tigris website with release 1.3.0 info
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4728
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Wed, 24 Mar 2010 03:52:50 +0000 (03:52 +0000)]
Merged r4724 (1.3.0 release changes) back into trunk.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4726
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Fri, 19 Mar 2010 17:35:08 +0000 (17:35 +0000)]
Prevent "Exp" in MSVC version name from causing problems.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4711
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Fri, 19 Mar 2010 06:48:38 +0000 (06:48 +0000)]
Fix for MSSDK initialiation
For the user in question who had VS 8.0 express installed, the vc version was being set to 8.0, and the the vs version was being set to the same, which was then being used to detect the vs version by an expected binary.
Since it though it had VS 8.0, the binary was the not there for VS8.0 Express, so it was bailing out on the initialization.
The fix is to have a VC8.0Exp as well as VC8.0 (also for VS9.0Exp).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4709
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 16 Mar 2010 06:26:00 +0000 (06:26 +0000)]
More VS/VC/SDK debug code.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4704
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Mon, 15 Mar 2010 15:43:06 +0000 (15:43 +0000)]
More doc infrastructure enhancements towards putting the function
documentation into DocBook:
* Strip trailing newlines after XML comments so lines left blank after
stripping comments don't get treated as paragraph separators.
* Recognize the lambda function and the ${TARGET,SOURCE}{,S} variables
when converting to man page format.
* Translate more strings into .RB and .RI lines.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4703
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Mon, 15 Mar 2010 01:42:02 +0000 (01:42 +0000)]
Add more debug output to Visual Studio/VC/ SDK initialization
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4702
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 11 Mar 2010 02:03:03 +0000 (02:03 +0000)]
Add DocBook entities for the env.*() forms of Builder and function calls.
Handle two additional flavors of <varlistentry>.
Translate the <application> tag into man page macros.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4701
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Mon, 8 Mar 2010 16:56:14 +0000 (16:56 +0000)]
Handle different signatures for global or env versions of functions
by the signature specification from the <scons_function> tag to
the <arguments> tag.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4699
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sun, 7 Mar 2010 23:15:55 +0000 (23:15 +0000)]
Add 1.2.0.
d20100306 checkpoint release
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4698
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 4 Mar 2010 02:16:32 +0000 (02:16 +0000)]
More enhancements for documenting functions:
* Add the support for global="0" and env="0" to SConsDoc.py.
* Remove unnecessary .IP lines before '\""" delimiters before the
next builder / tool / function entry.
* Add support for <variablelist> lists.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4690
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 3 Mar 2010 16:23:50 +0000 (16:23 +0000)]
More updates towards supporting function documentation:
* Convert \f[BI].*\fP strings containing white space to quoted .B lines.
* Anchor conversion of \f[BI] lines to .[BR] at end of line.
* Convert \f[BI] lines preceded by text to a .R[BI] line.
* Convert -- on .[BI]R? lines to \-\-.
* Support global="0" and env="0" options <scons_function> arguments for
when the function has no global form or construction environment form.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4689
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 23 Feb 2010 22:10:53 +0000 (22:10 +0000)]
Add support for documenting functions (with arbitrary calling signatures)
in our home-brew DocBook-based .xml files.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4686
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 23 Feb 2010 16:21:00 +0000 (16:21 +0000)]
Refactor the XMl processing of various entity types to make the code
more OO and extensible.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4685
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 21 Feb 2010 15:16:10 +0000 (15:16 +0000)]
Split the "live rpcgen" sub-test into its own test script.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4681
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 21 Feb 2010 14:57:09 +0000 (14:57 +0000)]
Issue 2051: Support execution when installed via easy_install.
(Gottfried Ganssauge)
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4680
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 18 Feb 2010 14:28:50 +0000 (14:28 +0000)]
Fix the test on all Python versions (failed on versions before 2.5 due
to some regex problem).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4678
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 17 Feb 2010 14:20:41 +0000 (14:20 +0000)]
Generate an error message if a BUILDERS entry is set to something that isn't
a Builder object, or known to generate a Builder object, or a callable.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4675
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 16 Feb 2010 16:36:14 +0000 (16:36 +0000)]
Move two Builder-related tests into the test/Builder/ subdirectory.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4674
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Fri, 12 Feb 2010 00:39:58 +0000 (00:39 +0000)]
Add documentation for MSVC_USE_SCRIPT.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4672
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Wed, 10 Feb 2010 06:43:05 +0000 (06:43 +0000)]
Update CHANGES to give some credit for patches
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4670
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Wed, 10 Feb 2010 06:37:51 +0000 (06:37 +0000)]
Mainly patch from James Teh
+ lots of additional debug output
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4669
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 9 Feb 2010 20:17:32 +0000 (20:17 +0000)]
MS win32 sdk issue, fixed requested arch to not request cross compile when building 32 bit on 64 bit host.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4668
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sun, 7 Feb 2010 00:31:10 +0000 (00:31 +0000)]
Fix the case where neither vc nor sdk script exist or, vc doesn't work and sdk doesn't exist.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4665
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Fri, 5 Feb 2010 20:42:07 +0000 (20:42 +0000)]
Gracefully handle not finding the VC and/or SDK setup batch scripts.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4660
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Fri, 5 Feb 2010 06:37:10 +0000 (06:37 +0000)]
Merged revisions 4645,4647-4651,4654-4656 via svnmerge from
http://scons.tigris.org/svn/scons/branches/pending
........
r4648 | managan | 2010-01-22 09:40:52 -0800 (Fri, 22 Jan 2010) | 9 lines
Added dismbiguate calls on a targets side effects in the
make_ready_all and make_ready_current routines of Taskmaster.py.
This fixes Stefan Hepp's problem with latex. Directories to
hold the side effect files were not created when using
variantDir with duplicate=0
Modifying subdir_variantdir_include2.py to run scons with an
explicit target to reveal this problem.
........
r4654 | stevenknight | 2010-01-27 07:41:01 -0800 (Wed, 27 Jan 2010) | 5 lines
Issue 2534: fix Scanners' default ability to return Dir nodes by
making the default node_class the real SCons.Node.FS.Base class,
not SCons.Node.FS.Entry (which is now, and has been for some time,
a subclass).
........
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4658
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Thu, 4 Feb 2010 07:31:43 +0000 (07:31 +0000)]
It should now handle picking up the SDK compilers when the VC vcvarsall.bat doesn't pick them.
Perhaps not for all flavors of the SDK, but for SDK 7.0.
Currently the following tests fail:
Failed the following 2 tests:
test\IDL\midl.py
test\Win32\scons-bat-error.py
We should add to the docs which combinations of VC and SDK we expect to work, and which have been tested.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4656
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Sat, 30 Jan 2010 22:50:45 +0000 (22:50 +0000)]
trivial typo in man page
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4655
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 27 Jan 2010 01:55:50 +0000 (01:55 +0000)]
Only escape the executable python string itself on the display line.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4651
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 26 Jan 2010 16:26:26 +0000 (16:26 +0000)]
Win32 portability in runtest.py tests after disabling QMTest by default.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4650
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 21 Jan 2010 21:12:50 +0000 (21:12 +0000)]
Back out post-2.0 code changes from trunk: r4643, r4642 r4640, r4637.
This change should itself be backed out before merge "pending"
back into trunk.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4647
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 21 Jan 2010 21:00:25 +0000 (21:00 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-4644" from
http://scons.tigris.org/svn/scons/branches/pending
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4645
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Wed, 20 Jan 2010 22:21:27 +0000 (22:21 +0000)]
Somehow I managed to lose this change in a comment
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4643
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Wed, 20 Jan 2010 21:35:42 +0000 (21:35 +0000)]
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.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4642
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Wed, 20 Jan 2010 00:10:57 +0000 (00:10 +0000)]
Fix spelling.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4641
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 19 Jan 2010 20:10:01 +0000 (20:10 +0000)]
Issue 2540: Make the messages printed when checking for compilers
consistent w.r.t. "... " at the end of the message.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4640
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 19 Jan 2010 19:33:40 +0000 (19:33 +0000)]
Issue 2537: fix typos in the man page. (Luca Faravigna)
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4639
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 19 Jan 2010 19:29:37 +0000 (19:29 +0000)]
Change the name of the 'help' statistic in the timings configurations
to 'startup'.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4638
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Tue, 19 Jan 2010 18:09:17 +0000 (18:09 +0000)]
Remove unneeded fluff from this test.
Add commented line that will reveal a failure.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4637
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 19 Jan 2010 07:06:10 +0000 (07:06 +0000)]
rebuilt docs
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4636
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 19 Jan 2010 05:59:03 +0000 (05:59 +0000)]
Merge back from checkpoint.
Need to regenerate the .xml files.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4635
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 19 Jan 2010 05:29:18 +0000 (05:29 +0000)]
Update with info on 1.2.
0d20100117 checkpoint release
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4634
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 17 Jan 2010 22:28:21 +0000 (22:28 +0000)]
Update next checkpoint version and datestamp
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4626
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sat, 16 Jan 2010 16:02:52 +0000 (16:02 +0000)]
Fix timestamp-related Decider() examples by using Object() instead of
Program(), to avoid the downstream "hello" executable sometimes not
getting re-linked if the example re-ran within a single second and
didn't change the hello.o timestamp.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4625
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sat, 16 Jan 2010 15:27:15 +0000 (15:27 +0000)]
Fix the Requires() examples by adding a sleep command to the
infrastructure and using it to force the SConstruct file(s) to generate
version.c files with new timestamps each run. Fix the description of
the example, since the verson.o file does get recompiled each run, but
the use of Requires() means the downstream hello executable doesn't get
relinked because of it.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4624
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sat, 16 Jan 2010 02:01:35 +0000 (02:01 +0000)]
Update a change of compilation order in the version.c examples.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4623
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Fri, 15 Jan 2010 16:45:40 +0000 (16:45 +0000)]
Rename the sconsoutput.py script to scons-doc.py, and refactor it to
support command-line option parsing and generating output on
streams other than sys.stdout.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4622
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 19:17:03 +0000 (19:17 +0000)]
Minor code cleanup, including restoring saved SCONSFLAGS correctly.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4621
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 19:00:05 +0000 (19:00 +0000)]
Capture updated troubleshooting output.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4620
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 18:48:24 +0000 (18:48 +0000)]
Massage file names in Python stack traces (which are often reported as
absolute paths) to a consistent relative path (bootstrap/...).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4619
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 18:36:23 +0000 (18:36 +0000)]
Python 1.5 fix (nested scopes).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4618
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 18:30:34 +0000 (18:30 +0000)]
Make the default SystemRoot a Windows-like "C:\\WINDOWS" instead of
"C:/WINDOWS", mainly so the output generated in the "Troubleshooting"
appendix of the User's Guide looks coherent.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4617
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 14:43:51 +0000 (14:43 +0000)]
Massage the output from examples for consistency with Python 2.6.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4616
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 07:02:42 +0000 (07:02 +0000)]
Fix use of varlist in CommandGeneratorAction, ListAction and LazyAction
by adding a .get_varlist() accessor method that lets those wrapping
classes fetch the varlist from their wrapped Action object(s).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4615
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Thu, 14 Jan 2010 01:51:20 +0000 (01:51 +0000)]
Fix a missed name change of TimeStamp => TimeStampDefault.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4614
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 13 Jan 2010 02:08:38 +0000 (02:08 +0000)]
Capture the previous output from "pkg-config x11" in a static
screen section. Ubuntu Karmic changed the X11 package config so
it no longer prints a -I option, and this is just an example anyway.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4613
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 12 Jan 2010 07:15:03 +0000 (07:15 +0000)]
Updates for changes to SCons error messages.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4612
fdb21ef1-2011-0410-befe-
b5e4ea1792b1