summaryrefslogtreecommitdiffstats
path: root/src/script
Commit message (Collapse)AuthorAgeFilesLines
* Enhance cpp scanner regex logic to detect if/elif expressions without ↵Tobias Herzog2019-01-181-0/+0
| | | | | | whitespaces correctly for example "#if(defined FOO)" or "#elif!(BAR)"
* Update scons.bat to first look for scons.py and then scons so that a ↵William Deegan2019-01-081-0/+2
| | | | universal python wheel can work on windows
* For sconsign, add a warning message if missing sigsMats Wichmann2018-12-011-3/+56
| | | | | | | | Rather than just silently moving on, emit warning messages if id count does not match signature count; summarize at the end if there were any warnings. Signed-off-by: Mats Wichmann <mats@linux.com>
* For PR #3238: suggestion to use a comprehensionMats Wichmann2018-12-011-3/+2
| | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* For PR #3238: use a try block for str/bytes problemMats Wichmann2018-12-011-1/+4
| | | | | | | | | The previous fix changed a failing line that printed something that could be bytes in Py3 to do a decode. But it turned out that value can be either str or bytes and the change failed the sconsign tests. Use a try block instead of unconditionally calling decode. Signed-off-by: Mats Wichmann <mats@linux.com>
* Some fixes to sconsignMats Wichmann2018-12-011-21/+47
| | | | | | | | | | | | | | | | | | | | | | | | Two locations which attempt to directly print an item tipped over on py3, so they now decode(). There seem to be cases where implicit dependencies do not have signatures, so instead of looping through the dep list and indexing into the signature list (IndexError), the two lists are now zipped, which means nothing is printed, but sconsign does not die (the zip technique is used in FS.py in the engine). Minor PEP8 changes: spaces around operators; shorter lines; two-blanks rule around classes/functions. Also unused args changed to _ to show it was intentional. Manpage updated slightly - the internal whichdb function explicitly looks for the .dblite suffix, so the claim that if it's not .dbm it is assumed to be dblite was not true. sconsign still will not work on a dblite file which is not suffixed .dblite, but that is an existing problem, not a newly introduced one. Signed-off-by: Mats Wichmann <mats@linux.com>
* Update and add show option to cache configMats Wichmann2018-10-291-46/+83
| | | | | | | | scons-configure-cache.py can now show the cache configuration, and some statistics (currently only a file count). Script passes pep8 now. Signed-off-by: Mats Wichmann <mats@linux.com>
* Get a little smarter about finding the scons engine.Mats Wichmann2018-10-122-90/+97
| | | | | | | | | | In the common script stanza, Previous version was generating some paths that were not useful. Make sure the path pulled from package info is not mangled into unsuability. General cleanup. Write error message to stderr instead of stdout in scons.py. Signed-off-by: Mats Wichmann <mats@linux.com>
* A few syntax cleanupsMats Wichmann2018-10-032-4/+4
| | | | | | | | | | | | | | | | | | | | | Suggested by PyCharm. Includes three "real" changes: 1. src/engine/SCons/Node/__init__.py has a print statement in a function which references 'self', but there is no 'self' defined (it is not a method in a class). Guessing it should have been 'node'. 2. src/engine/SCons/Environment.py makes a call using 'kwbd' which is not defined, looks like a copy-paste error and should be 'bd'. 3. src/engine/SCons/Tool/JavaCommon.py splits 'file', which is not defined, was evidently supposed to be 'fn'. These should be double-checked. The rest are purely syntax: whitespace, dropping trailing semicolons, using "is" to test for None, simplifying comparisons, normalizing docstring commenting ("always triple double quotes"), unneeded backslashes. Signed-off-by: Mats Wichmann <mats@linux.com>
* Do not add unnormalised entries to PATH in scons.batRay Donnelly2018-01-181-1/+3
|
* Apply fix for sconsign.py as wellChristian Sandberg2017-09-241-1/+1
|
* Fix usage on embedded PythonChristian Sandberg2017-09-241-1/+1
| | | | First entry in sys.path is not always the script directory.
* py2/3 fix version checking for valid versions of python to 2.7.x >=3.5.0: ↵William Deegan2017-06-231-5/+5
| | | | src/script/scons.py
* Remove ancient Aegis revision control system filesJane Doe2017-05-301-5/+0
|
* Dirty hack for failing test/sconsign/script/Configure.pyGaurav Juvekar2017-04-141-0/+5
|
* remove py3 checking codeWilliam Deegan2017-03-131-7/+1
|
* Merged in rodrigc/scons (pull request #409)William Deegan2017-03-131-5/+5
|\ | | | | | | Remove 'U' flag to open()
| * Remove 'U' flag to open() which is deprecated.Craig Rodrigues2017-03-111-2/+2
| |
| * Remove 'U' flag to open() which is deprecated.Craig Rodrigues2017-03-111-3/+3
| |
* | Merged in rodrigc/scons (pull request #410)William Deegan2017-03-132-2/+2
|\ \ | | | | | | | | | When iterating over dict.items(), we do not need a new list.
| * | When iterating over dict.items(), we do not need a new list.Craig Rodrigues2017-03-122-3/+3
| |/
* | Use print() function. Fixes py2/3.Craig Rodrigues2017-03-111-3/+5
|/
* use whichdb from dbm for py3, and whichdb from whichdb for py2William Deegan2017-03-111-8/+8
|
* fix binary/non-binary file writes where appropriate, previous all were ↵William Deegan2017-02-281-1/+1
| | | | binary. py2/3
* fix float formatting and change writting output from binary to non binary ↵William Deegan2017-02-281-2/+4
| | | | file for py2/3
* comment out code which checks for py3 and failsWilliam Deegan2017-02-281-5/+5
|
* manually merge packaging updates from 2.5.1William Deegan2016-11-031-0/+1
|
* Futurize stage 2 2to3 fixes only.William Blevins2016-09-202-140/+140
|
* 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
* Commit resolved conflicted merge.Russel Winder2016-04-102-2/+141
|\
| * Merged in techtonik/scons (pull request #308)William Deegan2016-04-091-2/+2
| |\ | | | | | | | | | Improve a few docs and messages
| | * script/scons.py - improve error message on missing engine filesanatoly techtonik2016-03-021-2/+2
| | |
| * | Add some error recovery, cleanup scons-configure-cacheThomas Tanner2016-03-191-18/+34
| | |
| * | Cleanup of code/comments and rename and rewrite of upgrade scriptThomas Tanner2016-03-192-78/+123
| | |
| * | improve behaviourThomas Tanner2016-03-121-7/+23
| | |
| * | Change the cache to use the first two characters of the md5 for the directoryThomas Tanner2016-01-301-0/+62
| |/ | | | | | | name (more smaller directories, because they tend to get huge otherwise)
* | Remove all the six stuff.Russel Winder2016-02-021-8/+2
| |
* | Some more print statements to functions.Russel Winder2016-01-011-1/+2
| |
* | Run futurize --stage1.Russel Winder2016-01-011-0/+2
| |
* | Post merge commit for safety. Building Fortran code works, but tests fail.Russel Winder2015-12-243-49/+37
|\ \ | |/
| * removed several pre-2.7 methods and imports, including some basic refactoringsDirk Baechle2015-12-102-46/+34
| |
| * Merged in dirkbaechle/scons : switch of core classes to slots, memoizer ↵Dirk Baechle2015-08-061-1/+1
| |\ | | | | | | | | | subsystem now uses decorators
| | * - switching Node class and NodeInfo/Binfo to using slotsDirk Baechle2015-02-261-1/+1
| | | | | | | | | | | | - memoizer subsystem now uses decorators instead of the metaclass approach
| * | Fix premature SyntaxError on Python 3anatoly techtonik2015-06-201-1/+1
| |/ | | | | | | This allows to show correct message for Python 3 users
* | Added six module as SCons.compat.six, for python3 port.Gary Oberbrunner2014-04-201-2/+2
| |
* | Additional ()s for print.Stefan Zimmermann2014-03-311-1/+1
| |
* | Merged with [default]Stefan Zimmermann2014-03-311-6/+13
|\ \ | |/
| * remove double reporting of source path per comment by Anatoly in pull feedbackWilliam Deegan2014-03-091-1/+1
| |
| * Updated comment to indicate new order of priority for loading SCons python ↵William Deegan2014-03-091-1/+1
| | | | | | | | packages
| * restore SCONS_LIB_DIR to primary choice for SCons logic, then source tree ↵William Deegan2014-03-091-4/+7
| | | | | | | | from which it was run.