summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #3394 from bdbaddog/fix_vc_invalid_HOST_or_TARGET_ARCHWilliam Deegan2019-06-204-22/+220
|\ \ | | | | | | Fix MSVC handling of invalid HOST_ARCH or TARGET_ARCH
| * | Fix sider warningWilliam Deegan2019-06-201-1/+1
| | |
| * | Allow MSVCUnsupportedTargetArch and MSVCUnsupportedHostArch exceptions to ↵William Deegan2019-06-202-1/+4
| | | | | | | | | | | | propagate and cause SCons to exit
| * | Switch back to None with proper comparison using is instead of notWilliam Deegan2019-06-191-4/+4
| | |
| * | Switch from testing for directory value being false to -1 as "" evaluates to ↵William Deegan2019-06-191-4/+9
| | | | | | | | | | | | false
| * | Fix conflictWilliam Deegan2019-06-181-5/+0
| | |
| * | [skip ci] remove conflict markers from CHANGES.txtWilliam Deegan2019-06-181-3/+0
| | |
| * | Added tests to logic changes by mhqtronic PR #3375William Deegan2019-06-183-17/+215
|/ /
* | Merge branch 'master' of github.com:SCons/sconsWilliam Deegan2019-06-153-3/+22
|\ \ | |/
| * Merge pull request #3383 from chasinglogic/action-hides-exceptionsWilliam Deegan2019-06-133-3/+22
| |\ | | | | | | Don't hide exceptions when command does not exist
| | * Don't hide exceptions when command does not existMathew Robinson2019-06-103-3/+22
| | |
* | | add comment on how to update irc infoWilliam Deegan2019-06-131-0/+1
|/ /
* | Move IRC Channel to encrypted so forks won't publish to scons irc channelWilliam Deegan2019-06-121-22/+23
| |
* | Merge pull request #3388 from mwichmann/xsl-changesWilliam Deegan2019-06-126-336/+330
|\ \ | | | | | | Update Docbook test stylesheets
| * | Update Docbook test stylesheetsMats Wichmann2019-06-066-336/+330
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Real change to two files, as apparently a system stylesheet has moved (checked in multiple Ubuntu versions, and in upstream dockbook-xsl) from html to xhtml path. Or to be more precise, in old docbook-xsl packages, both subdirectories existed but in newer releases only the xhtml subdirectory exists. - <xsl:import href="file:///usr/share/xml/docbook/stylesheet/docbook-xsl/slides/html/plain.xsl"/> + <xsl:import href="file:///usr/share/xml/docbook/stylesheet/docbook-xsl/slides/xhtml/plain.xsl"/> The other changes were to change file to standard line endings (not Windows) and quiet git complaints about whitespace errors. Unfortunately the line-endings change makes it look like the files were 100% replaced. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3389 from mwichmann/harness-tests-cmdWilliam Deegan2019-06-122-269/+318
|\ \ | | | | | | test harness: fix TestCmd tests
| * | test harness: fix TestCmd testsMats Wichmann2019-06-072-269/+318
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the companion to PR #3382. The testing/harness/TestCmdTests.py unit tests do not currently pass. Note they are not run by the CI system, or in fact by doing runtests -a, since they're in a directory that is not searched. After these changes, there are no fails. This is a test-only change. The method simple_diff, modeled on difflib functions, is converted to a generator to match difflib, and now has a doctest as well. This means calls to it which aren't going to iterate needs to convert the return with list(), but that just makes usage more consistent, since the calls to difflib.context_diff and difflib.unified_diff already had to do so. Also, the methods that used Google-style docbook markup are changed to REsT-style markup. Our current doc producer, epydoc, does not understand the Google style, and we shouldn't mix styles; can convert them all in bulk later if we switch to Sphinx as the production tool. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Merge pull request #3390 from bdbaddog/py38_fixesWilliam Deegan2019-06-101-3/+2
|\ \ \ | | | | | | | | Fix escaping to quiet py38 warnings about bad escapes
| * | | Fix escaping to quiet py38 warnings about bad escapesWilliam Deegan2019-06-101-3/+2
|/ / /
* | | Merge pull request #3368 from mwichmann/try-38-devWilliam Deegan2019-06-071-1/+10
|\ \ \ | |/ / |/| | Modify CI build to add Python 3.8-dev as a fail-allowed build
| * | [WIP] try a run with Travis' py3.8Mats Wichmann2019-05-131-1/+10
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Merge pull request #3387 from mwichmann/iter-not-rangeWilliam Deegan2019-06-061-3/+3
|\ \ \ | |_|/ |/| | Use more idiomatic Python
| * | Use more idiomatic PythonMats Wichmann2019-06-061-3/+3
|/ / | | | | | | | | | | | | | | Minor: replace an instance of "for i in range(len(foo))" with the now preferred "for i in foo". This change didn't naturally fit with any of the other instances of this usage, so is submitted by itself. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3379 from mwichmann/test-tweaksWilliam Deegan2019-05-316-40/+40
|\ \ | | | | | | Tweak a few tests
| * | Tweak a few testsMats Wichmann2019-05-306-40/+40
|/ / | | | | | | | | | | | | | | | | | | | | | | | | "for i in range(len(foo))" idiom changed to iterate directly over lists instead of indexing them. zip() generates the iterator in the case with two lists. reversed() used for the Windows drive-letter test. gdbm is not gone, just renamed. change test to find under either name. Use a context manager for closing StringIO objects opened for capturing standard I/O streams. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3380 from bdbaddog/py38_fixesWilliam Deegan2019-05-303-358/+409
|\ \ | | | | | | Py38 fixes
| * | PY38: Fix invalid escape chars in compare stringWilliam Deegan2019-05-301-26/+27
| | |
| * | PY38: Fix invalid escape chars in compare stringWilliam Deegan2019-05-301-4/+4
| | |
| * | PY38: Resolve duplicate creation of 'work' subdir which yielded warnings. ↵William Deegan2019-05-302-2/+4
| | | | | | | | | | | | Also improve exception handling message in test.subdir()
| * | PEP8 fileWilliam Deegan2019-05-301-326/+374
|/ /
* | Merge pull request #3367 from mwichmann/docs-parse_flagsWilliam Deegan2019-05-287-40/+50
|\ \ | | | | | | Update docs for parse_flags keywords
| * | Update docs for parse_flags keywordsMats Wichmann2019-05-147-40/+50
| |/ | | | | | | | | | | | | | | | | The somewhat poorly named parse_flags keyword args actually work like the MergeFlags method - don't just split like the ParseFlags method, but do the merging as well. Tweak the docs and add a reference to env.MergeFlags. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3374 from chasinglogic/more-cache-statsWilliam Deegan2019-05-174-0/+37
|\ \ | | | | | | Add cache hit rate to cache debugging
| * | Add cache hit rate to cache debuggingMathew Robinson2019-05-174-0/+37
|/ /
* | Merge pull request #3373 from dholth/patch-1William Deegan2019-05-141-0/+1
|\ \ | |/ |/| Add __main__.py to MANIFEST.in
| * Add __main__.py to MANIFEST.inDaniel Holth2019-05-141-0/+1
|/
* Merge pull request #3369 from mwichmann/more-regexWilliam Deegan2019-05-135-5/+7
|\ | | | | Fix some regexes for Python 3.8 complaints
| * [PR #3369] more info into changelogMats Wichmann2019-05-131-0/+1
| | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * Fix some regexes for Python 3.8 complaintsMats Wichmann2019-05-135-5/+6
|/ | | | | | | | | | | Regexes that contained unescaped backslashes and were not listed in raw string form caused one more test failure when Python 3.8 was experimentally turned on in the Travis CI build. Also one utility script had the same, not affecting tests - found through inspection. Signed-off-by: Mats Wichmann <mats@linux.com>
* Merge pull request #3364 from mwichmann/parallel-fail-altWilliam Deegan2019-05-131-32/+36
|\ | | | | Rework the failed-builds test
| * [PR #3364] small change to trigger ciMats Wichmann2019-05-041-1/+2
| | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * Rework the failed-builds testMats Wichmann2019-05-031-31/+34
| | | | | | | | | | | | | | test/Parallel/failed-builds.py has been sporadically failing on the CI builds. Rework it a bit to see if it improves. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3363 from mwichmann/gnu-incsWilliam Deegan2019-05-067-11/+33
|\ \ | |/ |/| Add -iquote and -idirafter for CCFLAGS
| * [PR #3363] doc update for added flagsMats Wichmann2019-05-045-5/+11
| | | | | | | | | | | | Needed a doc regen to pick up the change. Signed-off-by: Mats Wichmann <mats@linux.com>
| * Add -iquote and -idirafter for CCFLAGSMats Wichmann2019-05-023-8/+24
|/ | | | | | | | | | | Recognize two additional GNU compiler header directory search options: -iquote and -idirafter. Each takes a following arg, which scons now recognizes and adds together with the option to CCFLAGS. Note that (similar to -isystem which was added in git commit f8614aa2), this does not tell scons anything special, it only recognizes the flag + argument so it can be passed on to the compiler. Signed-off-by: Mats Wichmann <mats@linux.com>
* [ci skip] Update CHANGES.txtWilliam Deegan2019-05-011-1/+1
|
* Merge pull request #3362 from mwichmann/doublewriteWilliam Deegan2019-05-012-1/+2
|\ | | | | Fix a small error in docbook tool
| * Fix a small error in docbook toolMats Wichmann2019-04-302-1/+2
|/ | | | | | | The routine used in the builder if lxml is being used had a doubled write command likely to produce unexpected results. Signed-off-by: Mats Wichmann <mats@linux.com>
* Merge pull request #3361 from mwichmann/msvsfixWilliam Deegan2019-04-281-2/+7
|\ | | | | Fix misplaced file closing
| * Fix misplaced file closingMats Wichmann2019-04-281-2/+7
|/ | | | | | | | | One file close ended up in the wrong method, meaning it was closing a file which needed to stay open for further reading, while another method of the same name in a different class was missing one. (this didn't trigger any test fails, hmmm, just visual inspection) Signed-off-by: Mats Wichmann <mats@linux.com>
generated by cgit v0.12 at 2025-08-29 23:48:13 (GMT)