summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
* mergeWilliam Deegan2016-05-191-3/+13
|\
| * revert some py3 changes which fail no py2 on windows and any platform/python ...William Deegan2016-05-151-3/+13
* | 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-109-50/+275
|\
| * reset files to development modeWilliam Deegan2016-04-093-44/+47
| * changes for 2.5.0 releaseWilliam Deegan2016-04-093-3/+3
| * Updates to Changes, Release, AnnounceWilliam Deegan2016-04-093-86/+85
| * Merged in techtonik/scons (pull request #308)William Deegan2016-04-092-6/+6
| |\
| | * Fix formatting in SConf check exampleanatoly techtonik2016-03-021-4/+4
| | * script/scons.py - improve error message on missing engine filesanatoly techtonik2016-03-021-2/+2
| * | Merged in thosrtanner/scons-cache-name (pull request #302)William Deegan2016-04-086-11/+234
| |\ \ | | |/ | |/|
| | * Migrate stuff to the right placeThomas Tanner2016-03-202-8/+8
| | * Add some release notesThomas Tanner2016-03-191-0/+8
| | * oopaThomas Tanner2016-03-191-4/+2
| | * Add some error recovery, cleanup scons-configure-cacheThomas Tanner2016-03-192-24/+56
| | * Cleanup of code/comments and rename and rewrite of upgrade scriptThomas Tanner2016-03-195-100/+148
| | * Update to produce warning message.Thomas Tanner2016-03-133-6/+29
| | * improve behaviourThomas Tanner2016-03-123-17/+69
| | * Change the cache to use the first two characters of the md5 for the directoryThomas Tanner2016-01-303-2/+64
* | | Resolved conflicting merge.Russel Winder2016-03-014-6/+100
|\ \ \ | |/ /
| * | Merged in williamblevins/scons_20150323 (pull request #306)William Deegan2016-02-291-0/+11
| |\ \
| | * | Issue 2264: Updated CHANGES.txt to include Cross Language notes.William Blevins2016-02-221-1/+12
| * | | Merged in williamblevins/scons_20150323 (pull request #305)William Deegan2016-02-291-0/+1
| |\ \ \
| | * | | Issue 2959: Update CHANGES.txt information.William Blevins2016-02-191-0/+1
| | |/ /
| * | | Fix for bug # 2225. This undoes the changes to posix special escape character...William Deegan2016-02-291-0/+2
| * | | Fix for bug # 2225. This undoes the changes to posix special escape character...William Deegan2016-02-292-3/+23
| |/ /
| * | Merged in adarshsanjeev/scons (pull request #291)William Deegan2016-02-152-3/+63
| |\ \ | | |/ | |/|
| | * Updated documentationAdarsh Sanjeev2016-01-041-0/+2
| | * Changed as per reviewAdarsh Sanjeev2016-01-041-4/+12
| | * String support for Chmod addedAdarsh Sanjeev2016-01-031-3/+53
* | | Remove all the six stuff.Russel Winder2016-02-027-710/+13
* | | Commit merge from default.Russel Winder2016-02-022-1/+7
|\ \ \ | |/ /
| * | Minor nit fixes. Typos and better commentsWilliam Deegan2016-01-261-1/+1
| * | fix for tigris bug # 2622 - AlwaysBuild / MSVC regression - Make sure files m...William Deegan2016-01-162-1/+7