cournape [Thu, 19 Nov 2009 04:59:58 +0000 (04:59 +0000)]
ENH: raise an exception when we detect an error while executing the batch file.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4446
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:59:23 +0000 (04:59 +0000)]
BUG: fix get_installed_vcs such as most recent versions are the first ones.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4445
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:58:46 +0000 (04:58 +0000)]
BUG: do not set up the SDK for now - it messes up cross compilation.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4444
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:58:09 +0000 (04:58 +0000)]
ENH: start a new, simpler and more robust vc module.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4443
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:57:30 +0000 (04:57 +0000)]
BUG: fix cross-compilation from x86 -> x86_64 for VS 2008.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4442
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:56:55 +0000 (04:56 +0000)]
BUG: do not call msvs bat file in merge_default_version, only set up version.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4441
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:56:16 +0000 (04:56 +0000)]
ENH: use msvc env, not msvs to set up mslib and mslink paths.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4440
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:55:31 +0000 (04:55 +0000)]
ENH: add a wrapper around msvc_setup_env to guarantee the function is called only once.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4439
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:54:49 +0000 (04:54 +0000)]
BUG: fix arch argument to pass to batfile.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4438
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:54:08 +0000 (04:54 +0000)]
ENH: move user info gathering at the top of msvc_setup_env.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4437
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:53:31 +0000 (04:53 +0000)]
ENH: factor host/target handling in separate function.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4436
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:52:55 +0000 (04:52 +0000)]
ENH: bypass complicated VisualC logic, and use the .bat file to get correct arch settings instead.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4435
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:52:17 +0000 (04:52 +0000)]
ENH: script_env now takes an args argument to forward arguments to the executed script.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4434
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 19 Nov 2009 04:51:43 +0000 (04:51 +0000)]
ENH: refactor function to get msvc version.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4433
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 18 Nov 2009 04:55:03 +0000 (04:55 +0000)]
Fix name typo in 1.5.2 patch.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4402
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 18 Nov 2009 02:00:43 +0000 (02:00 +0000)]
Issue 2481: Fix the msvc_exists() call in Tool/msvc.py.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4401
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 15 Nov 2009 19:32:06 +0000 (19:32 +0000)]
Python 1.5 fix: "mname += ..." => "mname = mname + ..."
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4397
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 15 Nov 2009 18:03:52 +0000 (18:03 +0000)]
1.5 fix: use apply() instead of (*args, **kw).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4396
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 15 Nov 2009 16:18:17 +0000 (16:18 +0000)]
1.5.2 fix in compat/__init__.py: "flags |= ..." => "flags = flags | ..."
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4393
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Sun, 15 Nov 2009 14:32:02 +0000 (14:32 +0000)]
Apply patch submitted in issue #947 to fix race condition in
TempFileMunge by using mkstemp instead of mktemp. Includes
pre-Python-2.3 compat version of mkstemp. Thanks to Jim Randall.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4392
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sat, 14 Nov 2009 05:56:42 +0000 (05:56 +0000)]
Fix issue 2519 - add textfile to list of builders
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4389
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sat, 14 Nov 2009 00:47:32 +0000 (00:47 +0000)]
Fix bug 1944 - handle non-existant .i files when swig emitter is called. Make an educated guess on the generated module name based on the .i file name.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4388
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Thu, 12 Nov 2009 07:32:38 +0000 (07:32 +0000)]
Fix bug 2465 - bootstrap.py should now use the python it was invoked with instead of finding the same named executable via the PATH
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4384
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Wed, 11 Nov 2009 02:06:25 +0000 (02:06 +0000)]
Remove old news items.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4381
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 10 Nov 2009 06:49:02 +0000 (06:49 +0000)]
Add check for python 3.0.0 or higher and exit with message.
Resolve bug 2445
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4380
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Sat, 31 Oct 2009 07:20:44 +0000 (07:20 +0000)]
BUG: fix bootstrap on windows 64.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4379
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Wed, 14 Oct 2009 21:06:24 +0000 (21:06 +0000)]
MSVC: Add correct x86_64/x66_64 msvc bat file location for VC 9.0 (2008).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4378
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Sat, 26 Sep 2009 12:00:20 +0000 (12:00 +0000)]
Update CHANGES.txt for the small bug fixes I commited recently.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4377
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Wed, 23 Sep 2009 21:13:24 +0000 (21:13 +0000)]
Use Glob() instead of glob.glob()
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4376
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 20 Sep 2009 01:10:42 +0000 (01:10 +0000)]
Update project pages for tigris
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4375
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sat, 19 Sep 2009 21:58:11 +0000 (21:58 +0000)]
Update CHANGES.txt with David C's last contribution.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4368
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Fri, 18 Sep 2009 07:05:47 +0000 (07:05 +0000)]
BUG: do not add -fPIC on non-posix platform for ifort tool.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4367
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Fri, 18 Sep 2009 06:49:35 +0000 (06:49 +0000)]
Fix test failure in Repository/Java.py on OS X
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4366
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Fri, 18 Sep 2009 06:49:31 +0000 (06:49 +0000)]
Minor fixes found while debugging
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4365
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 17 Sep 2009 06:44:04 +0000 (06:44 +0000)]
BUG: fix TryRun with variant dir set.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4364
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Thu, 17 Sep 2009 06:43:33 +0000 (06:43 +0000)]
Add test case for configure failure.
TryRun fails to find the executable when VariantDir is set up from
SConscript/SConstruct.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4363
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Wed, 16 Sep 2009 17:44:46 +0000 (17:44 +0000)]
Fix tex code to handle broken nomenclature package. (Fixes test failure on centos5 slave).
Code by Rob Managan.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4362
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 15 Sep 2009 01:37:39 +0000 (01:37 +0000)]
Steven checked in some changes yesterday which fixed a great number of
failing tests by setting SCONSFLAGS='-warn=no-python-version' in def
run() in TestSCons.py yesterday, where previously it was done in def
__init__(...).
This fixed most of the broken tests, but broke some of the working tests.
I readded the logic to def __init__
In addition I've added an extra arg to the __init__ for TestSCons.py
ignore_python_version (which defaults to true).
For those tests which need to be able to see the deprecation and/or
test the functionality of the deprecation.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4361
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 13 Sep 2009 23:33:03 +0000 (23:33 +0000)]
Have TestSCons.py add --warn=no-python-version every invocation, not
just at TestSCons intialization.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4360
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 13 Sep 2009 23:32:26 +0000 (23:32 +0000)]
Revert r4356, the problem is in TestSCons.py, not the test script itself.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4359
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sun, 13 Sep 2009 22:51:45 +0000 (22:51 +0000)]
Remove last checkin.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4358
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sun, 13 Sep 2009 22:47:29 +0000 (22:47 +0000)]
Fix test to pass for deprecated python versions. Not what was expected deprecation errors aren't output when --debug=memoizer is on command line, but are when it's passed via SCONSFLAGS.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4357
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sat, 12 Sep 2009 04:57:46 +0000 (04:57 +0000)]
Add python version deprecated check to get this test to pass on python 2.3 (hopefully this doesn't break other versions)
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4356
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Fri, 11 Sep 2009 17:20:00 +0000 (17:20 +0000)]
Fix test logic to handle warning messages on deprecated python version (changed from 2.2 to 2.4)
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4355
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Wed, 9 Sep 2009 05:10:43 +0000 (05:10 +0000)]
BUG: fix regression failure after is_win64 fix.
Add a RegOpenKeyEx 'fake' function when registry is not available.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4354
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Wed, 9 Sep 2009 03:10:46 +0000 (03:10 +0000)]
BUG: fix issue 2294.
CheckCC and assimilate did not set did_show_result up, and this caused spurious
'error: no result' messages after the check was executed.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4353
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
cournape [Wed, 9 Sep 2009 02:36:45 +0000 (02:36 +0000)]
Fix win64 detection.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4352
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Sun, 6 Sep 2009 02:24:38 +0000 (02:24 +0000)]
Bump minimum version of python for 1.3 to 2.4
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4346
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Mon, 31 Aug 2009 16:19:39 +0000 (16:19 +0000)]
Add a test that the packages used are installed.
Otherwise skip the test.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4344
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Fri, 28 Aug 2009 21:51:42 +0000 (21:51 +0000)]
Use mailing list information at scons.org instead of tigris.org
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4343
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Thu, 27 Aug 2009 17:57:56 +0000 (17:57 +0000)]
Add copyright notice to Announcement.txt to satisfy the test_strings.py test
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4339
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Wed, 26 Aug 2009 01:23:12 +0000 (01:23 +0000)]
Blank Announement template
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4338
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Fri, 21 Aug 2009 21:31:26 +0000 (21:31 +0000)]
As I set up the test case for the glossary and nomencl packages
I found that when only one tool (say pdftex) is initialized
that some of the actions for bibtex... are not created.
Moved most common actions and environment settings to one routine
in tex.py that the other text tools (pdftex, pdflatex, latex) call.
Also fixed a typo in the nomenclature action setup. There was
a '$' that should not have been there.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4337
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Fri, 21 Aug 2009 19:36:41 +0000 (19:36 +0000)]
Add comment for glossaries/scronyms update
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4336
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Fri, 21 Aug 2009 17:54:18 +0000 (17:54 +0000)]
Add test for glossaries package. and patch tex.py
to support it
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4335
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Thu, 13 Aug 2009 05:24:06 +0000 (05:24 +0000)]
Move credit for one fix from Jason K to Benoit B.
Add credit for Jason K for HOST/TARGET OS/CPU separation.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4331
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 11 Aug 2009 00:31:41 +0000 (00:31 +0000)]
Added info on my checkins to CHANGES.txt for checkpoint release
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4327
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Mon, 10 Aug 2009 23:57:44 +0000 (23:57 +0000)]
Make a note of the Latex changes made recently
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4326
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Mon, 10 Aug 2009 20:19:25 +0000 (20:19 +0000)]
Update CHANGES.txt to include Jared Grubb's contribution
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4325
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Thu, 6 Aug 2009 19:01:36 +0000 (19:01 +0000)]
Move the definition of env['LATEXSUFFIXES'] from Defaults.py to the
various *tex.py generate functions.
This is to avoid adding LATEXSUFFIXES to the environment when
the tools are not loaded.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4323
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Wed, 5 Aug 2009 13:53:02 +0000 (13:53 +0000)]
Check that MSVC install dir returned by registry actually exists before using it. Also added some debug stmts to vc.py.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4321
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Tue, 4 Aug 2009 22:17:52 +0000 (22:17 +0000)]
Fix MSVC 7.1 IDE path (for MSVS detection code) in Tool/MSCommon/vs.py.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4320
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Mon, 3 Aug 2009 04:53:52 +0000 (04:53 +0000)]
Solaris test portability fixes.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4318
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 2 Aug 2009 21:10:14 +0000 (21:10 +0000)]
Don't die if we can't execute the Solaris packaging utilities, so the
sunc++.py module will import okay (for testing, etc.) on non-Solaris
systems.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4317
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 2 Aug 2009 15:54:22 +0000 (15:54 +0000)]
Add optional time stamping and elapsed time reporting to Trace().
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4316
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sun, 2 Aug 2009 15:54:05 +0000 (15:54 +0000)]
Speed up Solaris packaging checks for C++ by caching results and
grepping /var/sadm/install/contents for path names.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4315
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sat, 1 Aug 2009 15:05:35 +0000 (15:05 +0000)]
Use regular expression matching to allow our "do nothing script"
to execute in up to 0.002 seconds.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4314
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Sat, 25 Jul 2009 17:06:58 +0000 (17:06 +0000)]
Document build fixes.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4309
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Fri, 24 Jul 2009 16:30:08 +0000 (16:30 +0000)]
Update the Test{Cmd,Common}.py 0.36, with better diff reporting
(specifically of output matches using regular expressions).
Update tests for corresponding inteface changes.
Add use of diff_re() to test/sconsign/script/Configure.py
so we can get accurate information about its buildbot failure.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4307
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Wed, 22 Jul 2009 21:24:37 +0000 (21:24 +0000)]
Turns out that in my revamped TeX builder I was listing the .dvi or
.pdf output file as a sideeffect since it is listed as an output
file in the .fls file. This caused the message that there were two ways to
build the file.
In fixing it I have to exclude both the .dvi and .pdf target because some
test decks produce both... THat hsoudl rarely happen in practice but
It is better to handle that case.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4305
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 22 Jul 2009 13:19:07 +0000 (13:19 +0000)]
Fix formatting of a debug message that was preventing normal execution.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4302
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Wed, 22 Jul 2009 04:56:52 +0000 (04:56 +0000)]
Update tex builder to use the -recorder option.
This was prompted because MikTeX, used on Windows,
does not put the same information on files opened
into the log file. The -recorder option gives a .fls
file that is the same on all platforms.
We still use the .log file contents to find warnings
and errors that mean we need to rerun latex...
Also add message about errors so user does not have
to scroll up through all the latex output to find
if there was an error.
Update all tests to handle the new command line option.
Add one more test on grpahics conversion.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4301
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 21 Jul 2009 14:32:00 +0000 (14:32 +0000)]
When setting up SDK, just return if there's no installed Visual Studio
of the specified version.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4299
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 21 Jul 2009 14:27:46 +0000 (14:27 +0000)]
Fix an import error for a reference in the Configure() method.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4298
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Tue, 21 Jul 2009 14:24:00 +0000 (14:24 +0000)]
Fix execution of test/MSV[CS]/*.py tests on non-Windows systems by
not assuming that %PROCESSOR_ARCHITECTURE% will be defined, and not
assuming that we'll find any installed Windows SDKs.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4297
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
bdbaddog [Tue, 21 Jul 2009 00:48:33 +0000 (00:48 +0000)]
In addition to changed merged below, commented out for platform os2 use of msvc, mslib, mslink
as they cause test/import.py to fail.
I don't have an OS2 system to resolve the issues on.
Merged revisions 4065,4067-4068,4071-4072,4074,4076,4085,4111,4163,4222 via svnmerge from
http://scons.tigris.org/svn/scons/branches/vs_revamp
................
r4065 | stevenknight | 2009-03-02 16:48:05 -0800 (Mon, 02 Mar 2009) | 42 lines
Copy over changes by hand from branches/core (I was working in a
directory pointing to the wrong branch):
........
r4059 | stevenknight | 2009-03-02 06:54:13 -0800 (Mon, 02 Mar 2009) | 14 lines
Initial prototypes of modules for architecture support (MSCommon/arch.py)
and Visual C/C++ configuration distinct from (and in preference to)
the Visual Studio configuration, incorporating configuration info and
ideas from Jason Kenny's latest parts/tools/MSCommon work.
This has a lot of cut-and-paste right now and does NOT actually work.
In particular, there are no changes to the rest of the infrastructure
to actually call any of this new stuff. I'm checking these in so I can
sync on other systems for continued development.
The ultimate goal is for much of the current MSCommon/vs.py module's
logic to migrate to MSCommon/vc.py, since that's what we're actually
interested in configuring.
........
r4058 | stevenknight | 2009-03-02 06:49:35 -0800 (Mon, 02 Mar 2009) | 2 lines
Fix doc string.
........
r4056 | stevenknight | 2009-03-01 06:10:31 -0800 (Sun, 01 Mar 2009) | 4 lines
Change the sanity_check file for 6.1 per Jason's update.
Add an optional version string argument to detect_sdk().
Import directly from common, not SCons.Tool.MSCommon.common.
........
r4055 | stevenknight | 2009-02-28 05:29:03 -0800 (Sat, 28 Feb 2009) | 5 lines
Minor common.py enhancements:
Refactor is_win64() to cache its return value so we don't have to hit
registry every time we want to know if the OS is 64-bit.
Accept SCONS_MSCOMMON_DEBUG=- to mean print debug messages to stdout.
........
................
r4067 | stevenknight | 2009-03-06 04:59:21 -0800 (Fri, 06 Mar 2009) | 4 lines
Fix entries in batch_file_map, after a double-check with the original code.
Use a host_architecture of None in the map to indicate the "default"
entry if there isn't a specific .bat file for our current architecture.
................
r4068 | stevenknight | 2009-03-06 05:15:39 -0800 (Fri, 06 Mar 2009) | 2 lines
Add include_subdir and lib_subdir data to the SDK definitions.
................
r4071 | stevenknight | 2009-03-10 07:42:53 -0700 (Tue, 10 Mar 2009) | 4 lines
Capture basically working snapshot.
src/engine/SCons/Tool/msvsTests.py and test/IDL/midl.py still fail,
and code needs clean up.
................
r4072 | stevenknight | 2009-03-11 06:38:37 -0700 (Wed, 11 Mar 2009) | 2 lines
Fix path to Common7\Tools. Find vs*.bat files.
................
r4074 | stevenknight | 2009-03-13 17:11:55 -0700 (Fri, 13 Mar 2009) | 3 lines
Import SCons.Tool.MSCommon.vc so it works regardless of other sys.path
manipulation.
................
r4076 | stevenknight | 2009-03-19 08:08:48 -0700 (Thu, 19 Mar 2009) | 7 lines
Refactor SDK support:
* New mssdk_exists() and mssdk_setup_env() methods as the primary
public entry points.
* Call internal sdk.*() utility functions that just return information
(like the SDK structure) not handle the actual setting.
* Give the VisualStudio definitions explicit settings for the SDK version.
................
r4085 | bdbaddog | 2009-04-05 14:30:46 -0700 (Sun, 05 Apr 2009) | 3 lines
Fix "can't find module vc" issue when building on windows.
................
r4111 | stevenknight | 2009-04-19 07:47:47 -0700 (Sun, 19 Apr 2009) | 2 lines
Doc updates for how MSVS_VERSION is used.
................
r4163 | bdbaddog | 2009-04-29 17:32:43 -0700 (Wed, 29 Apr 2009) | 4 lines
Fix for bug 2405
Also refactored some logic from Defaults._defines() into Defaults.processDefines() which is then used by msvs.py
................
r4222 | bdbaddog | 2009-05-31 17:01:22 -0700 (Sun, 31 May 2009) | 8 lines
Added definition of HOST_OS|ARCH TARGET_OS|ARCH (For win32 only right now)
Migrated some logic to determine arch from Tools/MSCommon -> Platform/Win32.py
Fixed lots of minor issues with string values for directories, architectures, and registry keys
Switch to find VS installs by registry (was using VC install location previously)
Added but commented out that HOST_{OS|ARCH} and TARGET_{OS|ARCH} will become reserved var names in Environment()
Need to resolve issues that SCons is issuing messages when SCons itself sets these variables.
................
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4296
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
managan [Mon, 22 Jun 2009 23:09:00 +0000 (23:09 +0000)]
Fix typo I found
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4261
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
erluk [Sat, 13 Jun 2009 11:09:06 +0000 (11:09 +0000)]
- Merged r4228 (Bugfix for runtest.py) from branches/installer
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4235
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
erluk [Sat, 13 Jun 2009 11:06:22 +0000 (11:06 +0000)]
- Removed invalid svn:mergeinfo property
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4234
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
erluk [Fri, 12 Jun 2009 16:30:31 +0000 (16:30 +0000)]
- Changed the option--duplicate test to only test the number of hard links on systems that actually support it
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4232
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
pankrat [Sat, 30 May 2009 11:43:22 +0000 (11:43 +0000)]
fix minor unicode issue in UtilTests
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4218
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
davidwyde [Fri, 29 May 2009 06:25:57 +0000 (06:25 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-4215" from
http://scons.tigris.org/svn/scons/branches/java
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4216
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Fri, 29 May 2009 02:07:18 +0000 (02:07 +0000)]
Doc patch from issue 2282 (mention JAVAVERSION in users guide), thanks to Knut Arild Erstad.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4214
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Fri, 29 May 2009 01:41:22 +0000 (01:41 +0000)]
Fix issue #2419 by sorting the other return path from glob() in FS.py. Thanks to Jin Liu for the original analysis of the problem.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4213
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Fri, 29 May 2009 01:16:27 +0000 (01:16 +0000)]
Fix for issue 2088: Java version 5 is same as 1.5 and 6 is same as 1.6.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4212
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Fri, 22 May 2009 17:46:18 +0000 (17:46 +0000)]
Support Intel v11 compiler on Windows. Most of the code was already
fine; this just generalizes a check for whether it's really where the
registry says it is, to allow the new v11 location (Bin/<arch>/icl.exe).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4211
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
erluk [Wed, 20 May 2009 07:17:52 +0000 (07:17 +0000)]
- Initialized merge tracking from branches/installer via svn-1.5's merge command
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4210
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
arianepaola [Mon, 18 May 2009 06:35:08 +0000 (06:35 +0000)]
Initialized merge tracking via "svnmerge" with revisions "1-4203" from
http://scons.tigris.org/svn/scons/branches/jython
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4205
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Sun, 17 May 2009 15:54:14 +0000 (15:54 +0000)]
Issue 2229, fix, tests, doc
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4202
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Sun, 17 May 2009 15:54:08 +0000 (15:54 +0000)]
Remove duplicate test
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4201
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Sun, 17 May 2009 15:54:06 +0000 (15:54 +0000)]
typo
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4200
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
pankrat [Sun, 17 May 2009 10:22:30 +0000 (10:22 +0000)]
Issue 2415: Tolerate unicode strings when using intern()
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4199
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Thu, 14 May 2009 06:35:37 +0000 (06:35 +0000)]
Issue 2410: Fix crash when using one-character identifiers in C and C++ macros.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4198
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Wed, 13 May 2009 20:12:13 +0000 (20:12 +0000)]
Apply fix to Textfile/Substfile suggested by Gary Oberbrunner
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4197
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 13 May 2009 04:01:37 +0000 (04:01 +0000)]
svn:ignore bootstrap, results.qmr and bin/*.pyc.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4196
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 13 May 2009 04:01:16 +0000 (04:01 +0000)]
Fix packaging tests: exclude test/Fortran/.exclude_tests from the
search for expanded __COPYRIGHT__ strings in the *-src* packages.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4195
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 13 May 2009 04:01:15 +0000 (04:01 +0000)]
Add ipkg.py to the MANIFEST.in list and fix 1.5 fix
(string.split() instead of string methods).
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4194
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
stevenknight [Wed, 13 May 2009 04:01:13 +0000 (04:01 +0000)]
Rename bin/linecount to bin/linecount.py and provide finer-grained
(and more accurate) breakdowns of the tests.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4193
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
gregnoel [Tue, 12 May 2009 17:26:29 +0000 (17:26 +0000)]
Fix textfile.py breakaga on platforms with weird end-of-line conventions
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4192
fdb21ef1-2011-0410-befe-
b5e4ea1792b1
garyo [Tue, 12 May 2009 12:46:33 +0000 (12:46 +0000)]
Fix site_scons/site_init.py test failure on Windows by using 'type' instead of 'cat' if win32.
git-svn-id: http://scons.tigris.org/svn/scons/trunk@4191
fdb21ef1-2011-0410-befe-
b5e4ea1792b1