summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix botched checkin [skip appveyor]Mats Wichmann2020-11-272-52/+43
| | | | | | | Checked in the SCons/__init__.py instead of the changes to the sconsign manpage. Restoring the former and updating the latter. Signed-off-by: Mats Wichmann <mats@linux.com>
* Updated sconsign/SConsignFile docs [skip appveyor]Mats Wichmann2020-11-262-46/+62
| | | | | | | | | | | | | | The sconsign manpage had some considerably out of date claims, updated to current usage and defaults. The SConsignFile manpage/userguide entry was reworded, mainly to clarify that there's one setting (the presence of env.SConsignFile *might* suggest there could be per-env settings), but also fiddled the wording a fair bit. Use the same arg names as the actual function, since those are usable as kwargs (manpage used to use "file", function accepts "name"). Signed-off-by: Mats Wichmann <mats@linux.com>
* Merge pull request #3835 from mwichmann/classifierWilliam Deegan2020-11-242-1/+2
|\ | | | | Change Trove classification for SCons
| * Change Trove classification for SConsMats Wichmann2020-11-242-1/+2
|/ | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* Merge branch 'mwichmann-wix-win'William Deegan2020-11-242-3/+3
|\
| * Update CHANGES.txt working for the changeWilliam Deegan2020-11-241-2/+2
| |
| * Merge branch 'wix-win' of git://github.com/mwichmann/scons into ↵William Deegan2020-11-242-2/+2
| |\ |/ / | | | | mwichmann-wix-win
| * Move wix tool into windows tool sectionMats Wichmann2020-11-222-2/+2
| | | | | | | | | | | | | | | | | | The wix tool has a slightly expensive "exists" function, so its placement in the tool list as generic means non-Windows platforms also pay this cost. Moved to the win32 section for other_plat_tools as it's only available on Windows platforms. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge branch 'master' of github.com:SCons/sconsWilliam Deegan2020-11-242-9/+10
|\ \ | |/
| * Merge pull request #3830 from mwichmann/tracefixWilliam Deegan2020-11-212-9/+10
| |\ | | | | | | Fix Trace function
| | * Fix Trace functionMats Wichmann2020-11-212-9/+10
| |/ | | | | | | | | | | | | The (internal) Trace function had been left in an inconsistent state by an earlier change, with a variable name mismatch. Fixed. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge branch 'bentonj-vmw-compilation_db_use_filter'William Deegan2020-11-246-9/+137
|\ \ | |/ |/|
| * Change variable from COMPILATIONDB_USE_PATH_FILTER to COMPILATIONDB_PATH_FILTERWilliam Deegan2020-11-245-17/+22
| |\
| | * Add COMPILATIONDB_USE_PATH_FILTER for filtering compilation database.James Benton2020-11-236-7/+131
| | | | | | | | | | | | The filter is a fnmatch pattern matched against output file.
| * | Merge branch 'compilation_db_use_filter' of ↵William Deegan2020-11-216-9/+132
| |\ \ |/ / / | | | | | | git://github.com/bentonj-vmw/scons into bentonj-vmw-compilation_db_use_filter
| * | Add COMPILATIONDB_USE_PATH_FILTER for filtering compilation database.James Benton2020-10-276-9/+132
| |/ | | | | | | | | | | The filter is a fnmatch pattern matched against output file. Also rename target->output in docs to match the output of compilation_db.
* | Merge pull request #3827 from mwichmann/range-lenWilliam Deegan2020-11-202-10/+16
|\ \ | | | | | | Kill a couple of "for foo in range(len(bar))"
| * | [PR #3827] fix: don't iterate over object being modifiedMats Wichmann2020-11-182-1/+2
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Kill a couple of "for foo in range(len(bar))"Mats Wichmann2020-11-171-10/+15
| | | | | | | | | | | | | | | | | | | | | Usually these aren't needed; the ones in tex.py defintely weren't. Also one bit of code reformat. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Merge pull request #3829 from mwichmann/more-py2ismsWilliam Deegan2020-11-204-27/+6
|\ \ \ | |/ / |/| | Drop yet more py2 compatibility stuff
| * | One more unneeded try-import-fixupMats Wichmann2020-11-191-6/+2
| | | | | | | | | | | | | | | | | | gettext is always present now, so extra steps not needed. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Drop yet more py2 compatibility stuffMats Wichmann2020-11-193-21/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | A checker flagged the zip_longest/izip_longest workaround, that's no longer needed. Similar for the shutil.SameFileError piece, that's standard since 3.4 and doesn't need checking for. The checker also complained about return contents.decode('utf-8', error='backslashreplace') the correct kward is errors, not error - corrected. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3826 from mwichmann/removestarWilliam Deegan2020-11-1710-106/+124
|\ \ | | | | | | Remove some "star imports"
| * | Remove some "star imports"Mats Wichmann2020-11-1610-106/+124
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Usually, it's unit tests that do this, and it's not really crucial to kill those off, but checkers do complain, including sider if you touch anything in one of those files. In SCons/Environment,py, removed all SCons.Util prefixes, than turned the import of Util into a star import, running a tool on that then changes it to import only the used symbols from Util. Since there are lots, that ought to be a small performance win, since it doesn't have to do namespace lookups on SCons.Util. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3823 from mwichmann/templatesWilliam Deegan2020-11-114-87/+17
|\ \ | | | | | | Update templates
| * | Update templates [ci skip]Mats Wichmann2020-11-104-87/+17
|/ / | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3822 from mwichmann/runtest-faillogWilliam Deegan2020-11-0910-90/+149
|\ \ | | | | | | runtest now writes a log of fails
| * | [PR #3822] fix typo, reword commentMats Wichmann2020-11-082-5/+6
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | runtest now writes a log of failsMats Wichmann2020-11-0710-89/+147
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | failed_tests.log is created if there are any fails (on by default). --retry option added to rerun tests from that file, or use -f listfile to use a file of a different name. --faillog=FILE allows saving the fails to a non-default name (in case don't want to overwrite the existing one, perhaps); --no-faillog disables the writing of the log. Two unneeded tests relating to qmtest were dropped: fallback.py didn't really test anything, and noqmtest.py was a duplicate of simple/combined.py after the qmtest specifics had been stripped out. Added tests for the added three options (git thinks two were renames). Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3821 from mwichmann/runtest-argparseWilliam Deegan2020-11-072-331/+296
|\ \ | | | | | | Convert test runner to use argparse
| * | [PR #3851] fix cut-n-paste error in previous fixMats Wichmann2020-11-051-2/+4
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [PR #3821] fix editing errorMats Wichmann2020-11-051-2/+0
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [PR #3821] accomodate Py3.5 in pathlib useMats Wichmann2020-11-051-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | the resolve() method of a Path objects takes a "strict" argument which was not defined until Py3.6. But the older behavior was "strict", so just add a version check here. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Convert test runner to use argparseMats Wichmann2020-11-042-331/+288
|/ / | | | | | | | | | | | | | | | | | | | | | | Formerly used optparse + homegrown, with a comment stating migration should be done (argprse now has superseded optparse). Cleaned up a few stray bits that weren't used any longer. Collects the changes intended for os.environ into a local dict, which is then used to make a single update. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3814 from mwichmann/addmethod-cloneWilliam Deegan2020-10-275-130/+129
|\ \ | |/ |/| Fix/update global AddMethod
| * Fix a sider complaint in EnvironmentTests.pyMats Wichmann2020-10-261-1/+7
| | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * Merge branch 'master' into addmethod-cloneWilliam Deegan2020-10-2614-70/+72
| |\ | |/ |/|
* | Add custom up_to_date for TimeSCons to handle individual SConscript timing ↵William Deegan2020-10-161-1/+26
| | | | | | | | output during null build run
* | Merge pull request #3815 from mwichmann/more-py2-dropsWilliam Deegan2020-10-1413-55/+21
|\ \ | | | | | | Drop some more Py2 compat things
| * | [PR #3815] change per reveiw: drop unneeded try block in Python nodeMats Wichmann2020-10-132-8/+3
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | One more "drop py2"ism from test frameworkMats Wichmann2020-10-131-3/+3
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Drop some more Py2 compat thingsMats Wichmann2020-10-1312-47/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change exception type in a a couple of try block to what could go wrong, Py3 would not raise UniCodeDecodeError for these cases One try-import of StringIO module sconsign does not need a decode that was claimed as compat hack Remove some sys.version_info checks Use more modern way to get Python details in test frawmework AddMethod updated and RenameFunction dropped - it had become a one-liner and had no clients other than AddMethod (never exposed as public) Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Merge pull request #3816 from grossag/topic/grossag/testraceWilliam Deegan2020-10-132-14/+25
|\ \ \ | | | | | | | | Fix occasional test failures when running multiple jobs
| * | | Fix occasional test failures when running multiple jobsAdam Gross2020-10-132-14/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way runtest.py passes the list of fixture directories is racy because it sets it in os.environ['FIXTURE_DIRS'] and then spawns the subprocess, counting on Python to start the subprocess before that list is overwritten when spawning the next directory. At least on Windows, the environment is not copied in subprocess.run so runtest.py may overwrite the list of fixture directories with the list for test #2 while the subprocess module is still kicking off test #1. I was able to easily reproduce this by running the command: `python runtest.py -j 2 test\MSVC\VSWHERE.py test\AS\ASPPFLAGS.py` a few times in a row. However, with this fix, that command repeatedly succeeds. To validate ths fix, I also ran that command with "--xml a.xml" and "--xml a.xml --nopipefiles" to validate that those other executors worked correctly.
| | * Update CHANGES.txt for AddMethod changes. [ci skip]Mats Wichmann2020-10-151-2/+5
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * Fix/update global AddMethodMats Wichmann2020-10-125-129/+119
| |/ |/| | | | | | | | | Fixes #3028 Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3811 from mwichmann/doc-subst-attrsWilliam Deegan2020-10-101-59/+87
|\ \ | |/ |/| Update manpage on variable substitution
| * [PR #3811] revert some Command syntax changes [ci skip]Mats Wichmann2020-10-101-16/+12
| | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * Update manpage on variable substitution [skip appveyor]Mats Wichmann2020-10-081-61/+93
| | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3812 from bdbaddog/fix_manpage_in_packagesWilliam Deegan2020-10-0911-13/+82
|\ \ | |/ |/| Fix manpage in packages - Fixes issue #3759
generated by cgit v0.12 at 2025-03-04 00:44:59 (GMT)