summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mergeWilliam Deegan2016-05-156-8/+24
|\
| * mergeWilliam Deegan2016-05-154-4/+16
| |\
| | * merge upstreamWilliam Deegan2016-05-154-4/+16
| | |\
| | | * Merged in williamblevins/scons_20150323/python3-port (pull request #330)William Deegan2016-05-154-4/+16
| | | |\ | | | | | | | | | | | | | | | Fixed Fortran tests which were throughing missing include directory warning.
| | | | * Fixed Fortran tests which were throughing missing include directory warning.William Blevins2016-05-154-4/+16
| | | | | | | | | | | | | | | | | | | | Warning added in gcc5.
| * | | | change to handle py3 changes to byte/string for open().write()William Deegan2016-05-151-1/+5
| |/ / /
| * | | mergeWilliam Deegan2016-05-151-1/+1
| |\ \ \ | | |/ /
| * | | Update logic to pull files from mercurialWilliam Deegan2016-05-151-3/+3
| | |/ | |/|
* | | revert some py3 changes which fail no py2 on windows and any platform/python ↵William Deegan2016-05-151-3/+13
| |/ |/| | | | | without dbm module installed. Revisit py3 issues after we get py2 working again
* | fix incorrectly updated print formattingWilliam Deegan2016-05-151-1/+1
|/
* Fix print()Bill2016-05-141-1/+1
|
* Fix print()Bill2016-05-141-1/+1
|
* Fix print()Bill2016-05-141-1/+1
|
* Fix re-raising exception so the syntax will work for both python3 and python2.Bill2016-05-141-2/+7
|
* fix default open mode for test.write() to be wb.. it was changed to just w ↵William Deegan2016-05-141-1/+1
| | | | when six was the plan. it causes many tests to fail on win32
* fixes for print()'s for win32William Deegan2016-05-135-7/+11
|
* Restore deleted function _scons_file() in win32.py.William Deegan2016-05-131-0/+7
| | | | | This is causing most tests to fail in win32. See if this resolves.
* Fixed print()'s.William Deegan2016-05-131-1/+1
|
* fix print statement in embedded string which generates SConstructWilliam Deegan2016-05-131-1/+1
|
* Seeems like EnvironmentError is not yielding the proper error output from ↵William Deegan2016-05-121-2/+2
| | | | SCons under __future__. py 3.5 EnvironmentError is an alias for OSError. Changing to OSError makes the test pass
* fix print() conversion on testWilliam Deegan2016-05-121-5/+8
|
* fix error where IOError and OSError exceptions were falling through to the ↵William Deegan2016-05-121-3/+7
| | | | wrong case in Errors.py/convert_to_BuildError().. EnvironmentError is now just an alias in Py3 and it looks like the future module is not properly handling the py3 alias'ing and breaking the py2 exception class hierarchy.
* fix broken test. 2to3 print changes broke some formatting. Changed output to ↵William Deegan2016-05-121-5/+8
| | | | generate same in a different way
* remove reference to six package.. unusedWilliam Deegan2016-05-121-1/+0
|
* fix whitespace in generated dsp file to match expected in test harness. ↵William Deegan2016-05-121-5/+5
| | | | Editor or 2to3 was chopping trailing space
* copy src/engine/SCons/Tool/__init__.py as the merge had issues at some point ↵William Deegan2016-05-121-132/+43
| | | | in the past the the versioned shared library logic got mangled. Then 2to3 that file. Seems to e working now
* Fixed print()'s. Still some remaining issues. Check later.William Deegan2016-05-091-2/+2
|
* Fixed print()'s. Still some remaining issues. Check later.William Deegan2016-05-091-8/+8
|
* Fixed print()'sWilliam Deegan2016-05-091-8/+8
|
* Fixed print()'sWilliam Deegan2016-05-091-2/+2
|
* Fixed print()'sWilliam Deegan2016-05-091-2/+2
|
* Fixed print()'sWilliam Deegan2016-05-091-2/+2
|
* Fixed print()'sWilliam Deegan2016-05-091-9/+9
|
* Fixed print()'sWilliam Deegan2016-05-091-3/+3
|
* Fixed print()'sWilliam Deegan2016-05-091-1/+1
|
* Fix typo in comment.William Deegan2016-05-091-1/+1
|
* Fixed embedded SConscript/SConstruct's usage of print. Had no parens.William Deegan2016-05-091-5/+5
|
* Fixed embedded SConscript/SConstruct's usage of print. Had no parens.William Deegan2016-05-091-2/+2
|
* Fixed embedded SConscript/SConstruct's usage of print. Had no parens.William Deegan2016-05-091-16/+16
|
* Fixed usage of linknames which needed to be defined outside of the two ↵William Deegan2016-05-091-1/+4
| | | | methods which share it's value and wasn't. Curious this only fails in python2.7 when __future__ is imported..
* Fix missing right parent in print () function in generated SConstruct.William Deegan2016-05-091-1/+2
|
* Add from future import print_function to fix broken tests under python2.7William Deegan2016-05-091-1/+6
|
* py2/3 compatibility changes.William Deegan2016-05-091-4/+18
|
* Guard checking for subprocess.mswindows by checking if on win32 platformWilliam Deegan2016-05-091-2/+2
|
* mergedWilliam Deegan2016-05-08463-8884/+11646
|\
| * Commit resolved conflicted merge.Russel Winder2016-04-1058-216/+494
| |\
| | * reset files to development modeWilliam Deegan2016-04-094-45/+48
| | |
| | * Merged in rel_2.5.0 (pull request #312)William Deegan2016-04-0916-152/+157
| | |\ | | | | | | | | | | | | Rel_2.5.0
| | | * updated copyright on manpage. TODO: fix update-release-files.sh to do this ↵William Deegan2016-04-091-2/+2
| | | | | | | | | | | | | | | | automatically
| | | * changes for 2.5.0 releaseWilliam Deegan2016-04-098-31/+31
| | | |
generated by cgit v0.12 at 2025-09-26 03:42:48 (GMT)