summaryrefslogtreecommitdiffstats
path: root/src/engine
Commit message (Expand)AuthorAgeFilesLines
* Optimize implicit dependency scanAlexey Klimkin2016-05-261-10/+12
* merge python3 branch to defaultWilliam Deegan2016-05-23120-956/+1098
|\
| * Remove debug code to reenable python version specific tool module loading code.William Deegan2016-05-231-1/+1
| * use old tool loading code for py2, and new code (not quite working yet) for py3William Deegan2016-05-231-48/+53
| * Fixing StringIO usage.William Deegan2016-05-191-1/+1
| * minor improvement to Tool loading code for py2/3 compatWilliam Deegan2016-05-191-14/+15
| * Fix unicode type code to handle py2/3William Deegan2016-05-191-4/+8
| * fix for module loading to us importlib instead of imp (which no longer works ...William Deegan2016-05-191-20/+48
| * Fix py2/3 StringIO importWilliam Deegan2016-05-191-1/+6
| * fix incorrectly updated print formattingWilliam Deegan2016-05-151-1/+1
| * Fix re-raising exception so the syntax will work for both python3 and python2.Bill2016-05-141-2/+7
| * fixes for print()'s for win32William Deegan2016-05-132-3/+7
| * Restore deleted function _scons_file() in win32.py.William Deegan2016-05-131-0/+7
| * fix error where IOError and OSError exceptions were falling through to the wr...William Deegan2016-05-121-3/+7
| * fix whitespace in generated dsp file to match expected in test harness. Edit...William Deegan2016-05-121-5/+5
| * copy src/engine/SCons/Tool/__init__.py as the merge had issues at some point ...William Deegan2016-05-121-132/+43
| * Fixed usage of linknames which needed to be defined outside of the two method...William Deegan2016-05-091-1/+4
| * 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
| * Commit resolved conflicted merge.Russel Winder2016-04-104-15/+82
| |\
| * \ Resolved conflicting merge.Russel Winder2016-03-013-6/+84
| |\ \
| * | | Remove all the six stuff.Russel Winder2016-02-026-702/+11
| * | | Commit merge from default.Russel Winder2016-02-021-1/+3
| |\ \ \
| * | | | Resolving a batch of failing tests for python 2.7.William Blevins2016-01-241-4/+2
| * | | | Merge in from default.Russel Winder2016-01-151-1/+1
| |\ \ \ \
| * \ \ \ \ Commit resolved conflicting merge.Russel Winder2016-01-142-8/+28
| |\ \ \ \ \
| * | | | | | Output changed so changed expected results.Russel Winder2016-01-101-21/+21
| * | | | | | Remove relative import.Russel Winder2016-01-101-1/+1
| * | | | | | Some more print statements to functions.Russel Winder2016-01-013-8/+7
| * | | | | | Run futurize --stage1.Russel Winder2016-01-0112-116/+131
| * | | | | | Post merge commit for safety. Building Fortran code works, but tests fail.Russel Winder2015-12-24136-5033/+4891
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged default branch into python3-port to keep it up to date.Gary Oberbrunner2014-08-2341-345/+1310
| |\ \ \ \ \ \ \
| * | | | | | | | Added six module as SCons.compat.six, for python3 port.Gary Oberbrunner2014-04-209-42/+722
| * | | | | | | | Main: No __future__.print_function (would affect exec()'d code).Stefan Zimmermann2014-04-011-4/+6
| * | | | | | | | Main: Use exec() with compile().Stefan Zimmermann2014-04-011-1/+1
| * | | | | | | | Tool.gs: Changed relative pdf import to absolute.Stefan Zimmermann2014-03-311-1/+1
| * | | | | | | | engine.SCons: More bytes/str fixes.Stefan Zimmermann2014-03-313-3/+3
| * | | | | | | | Merged with [default]Stefan Zimmermann2014-03-31162-427/+570
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix some minor 2to3 issues on windowsRocco Matano2014-03-073-13/+16
| * | | | | | | | | Some more six.PY2/PY3 usage.Stefan Zimmermann2014-01-081-7/+4
| * | | | | | | | | Merged with [default]Stefan Zimmermann2014-03-3131-348/+749
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Another list(*.keys()) for item deletion loop.Stefan Zimmermann2013-12-271-1/+1
| * | | | | | | | | | ActionTests: No string.join(). b prefix for assert Action.get_contents().Stefan Zimmermann2013-12-271-37/+37
| * | | | | | | | | | More __cmp__ to __eq__ (and __lt__). Resolved some UnboundLocalErrors after e...Stefan Zimmermann2014-03-318-28/+37
| * | | | | | | | | | Use exec() with compile() to preserve script name.Stefan Zimmermann2013-12-271-2/+2
| * | | | | | | | | | Environment.py: __cmp__ to __eq__. list(*.keys()) for item deletion loops.Stefan Zimmermann2013-12-271-4/+4
| * | | | | | | | | | copy_func: return 0 instead of return shutil.*Stefan Zimmermann2013-12-271-3/+3
| * | | | | | | | | | Made former 2to3 changes Python 2.7 compatible (or removed unneeded changes).Stefan Zimmermann2014-03-3164-209/+253
| * | | | | | | | | | fix for cpp scanner (maybe)ndbecker22013-09-092-2/+4
| * | | | | | | | | | minor cleanupndbecker22013-09-092-7/+2