SCons.git - SCons is an Open Source software construction tool

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \|	fixes for print()'s for win32	William Deegan	2016-05-13	2	-3/+7
\| \| \| \| \|
\| \| * \| \|	Restore deleted function _scons_file() in win32.py.	William Deegan	2016-05-13	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is causing most tests to fail in win32. See if this resolves.
\| \| * \| \|	fix error where IOError and OSError exceptions were falling through to the ↵	William Deegan	2016-05-12	1	-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 whitespace in generated dsp file to match expected in test harness. ↵	William Deegan	2016-05-12	1	-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 Deegan	2016-05-12	1	-132/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the past the the versioned shared library logic got mangled. Then 2to3 that file. Seems to e working now
\| \| * \| \|	Fixed usage of linknames which needed to be defined outside of the two ↵	William Deegan	2016-05-09	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	methods which share it's value and wasn't. Curious this only fails in python2.7 when __future__ is imported..
\| \| * \| \|	Add from future import print_function to fix broken tests under python2.7	William Deegan	2016-05-09	1	-1/+6
\| \| \| \| \|
\| \| * \| \|	py2/3 compatibility changes.	William Deegan	2016-05-09	1	-4/+18
\| \| \| \| \|
\| \| * \| \|	Commit resolved conflicted merge.	Russel Winder	2016-04-10	4	-15/+82
\| \| \|\ \ \
\| \| * \ \ \	Resolved conflicting merge.	Russel Winder	2016-03-01	3	-6/+84
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Remove all the six stuff.	Russel Winder	2016-02-02	6	-702/+11
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Commit merge from default.	Russel Winder	2016-02-02	1	-1/+3
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Resolving a batch of failing tests for python 2.7.	William Blevins	2016-01-24	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note: please evaluate python 3.X compliance.
\| \| * \| \| \| \| \|	Merge in from default.	Russel Winder	2016-01-15	1	-1/+1
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Commit resolved conflicting merge.	Russel Winder	2016-01-14	2	-8/+28
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Output changed so changed expected results.	Russel Winder	2016-01-10	1	-21/+21
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove relative import.	Russel Winder	2016-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Some more print statements to functions.	Russel Winder	2016-01-01	3	-8/+7
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Run futurize --stage1.	Russel Winder	2016-01-01	12	-116/+131
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Post merge commit for safety. Building Fortran code works, but tests fail.	Russel Winder	2015-12-24	135	-5033/+4890
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merged default branch into python3-port to keep it up to date.	Gary Oberbrunner	2014-08-23	40	-345/+1307
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hand-updated a few things to keep them python3-safe, and handled several merge conflicts.
\| \| * \| \| \| \| \| \| \| \| \|	Added six module as SCons.compat.six, for python3 port.	Gary Oberbrunner	2014-04-20	9	-42/+722
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Main: No __future__.print_function (would affect exec()'d code).	Stefan Zimmermann	2014-04-01	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Main: Use exec() with compile().	Stefan Zimmermann	2014-04-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Tool.gs: Changed relative pdf import to absolute.	Stefan Zimmermann	2014-03-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	engine.SCons: More bytes/str fixes.	Stefan Zimmermann	2014-03-31	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merged with [default]	Stefan Zimmermann	2014-03-31	162	-427/+570
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	fix some minor 2to3 issues on windows	Rocco Matano	2014-03-07	3	-13/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Some more six.PY2/PY3 usage.	Stefan Zimmermann	2014-01-08	1	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merged with [default]	Stefan Zimmermann	2014-03-31	31	-348/+749
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Another list(*.keys()) for item deletion loop.	Stefan Zimmermann	2013-12-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	ActionTests: No string.join(). b prefix for assert Action.get_contents().	Stefan Zimmermann	2013-12-27	1	-37/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	More __cmp__ to __eq__ (and __lt__). Resolved some UnboundLocalErrors after ↵	Stefan Zimmermann	2014-03-31	8	-28/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	except.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Use exec() with compile() to preserve script name.	Stefan Zimmermann	2013-12-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Environment.py: __cmp__ to __eq__. list(*.keys()) for item deletion loops.	Stefan Zimmermann	2013-12-27	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	copy_func: return 0 instead of return shutil.*	Stefan Zimmermann	2013-12-27	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Made former 2to3 changes Python 2.7 compatible (or removed unneeded changes).	Stefan Zimmermann	2014-03-31	64	-209/+253
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	fix for cpp scanner (maybe)	ndbecker2	2013-09-09	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(transplanted from c68b1a5da5ad47befc3a7e802d8ae23372f0e1a8)
\| \| * \| \| \| \| \| \| \| \| \| \| \|	minor cleanup	ndbecker2	2013-09-09	2	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(transplanted from 4feb1b15eb7a0c76cb020e09817c509a782d45b7)
\| \| * \| \| \| \| \| \| \| \| \| \| \|	2 minor issues	ndbecker2	2013-09-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(transplanted from 6711a6b819f61764bb82c0f32a251b91ec66a0b2)
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Manual python3 post-2to3 fixes from Neal Becker	Gary Oberbrunner	2013-09-22	17	-56/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.	Gary Oberbrunner	2013-09-22	120	-658/+667
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	merge from upstream	William Deegan	2016-05-23	2	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	regression tests for #319	Pawel Tomulik	2016-05-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	fixed issue with _xxxxxxVERSIONFLAGS	Pawel Tomulik	2016-05-11	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect syntax m,group() instead of m.group()..	William Deegan	2016-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate entry of "X_RPM_CONFLICTS" in dictionary. (It was there twice)	William Deegan	2016-05-08	1	-1/+0
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merged in techtonik/scons (pull request #308)	William Deegan	2016-04-09	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve a few docs and messages
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix formatting in SConf check example	anatoly techtonik	2016-03-02	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merged in thosrtanner/scons-cache-name (pull request #302)	William Deegan	2016-04-08	3	-11/+78
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change the cache to use 2-character directories rather than one. Also makes a lot more tests run on windows