summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Merge branch 'master' of https://github.com/scons/SConsAdam Gross2019-12-022-29/+48
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master'Adam Gross2019-11-2526-81/+129
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #2 from SCons/masterAdam Gross2019-10-22161-4485/+2907
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | Fast forward master
| | | | | | | * [PR 3443] regen all generated files [ci skip]Mats Wichmann2019-12-05239-4377/+3097
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking in all the examples generated on Ubuntu, which is the default "build platform", to pick up changes caused by a Py3 build. Signed-off-by: Mats Wichmann <mats@linux.com>
| | | | | | | * [PR #3343] fix review comments [ci skip]Mats Wichmann2019-12-055-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get importlib magic number from util sider complaints about unicode usage sider complaint about subprocess return value unused sider complaint about shutil import unused (it is used, but inside a big string that is written to a file to be executed) Signed-off-by: Mats Wichmann <mats@linux.com>
| | | | | | | * Improve building of docs using Py3 [ci skip]Mats Wichmann2019-12-05133-288/+348
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * context managers on file r/w + use shutil.copy where it makes sense. * lxml wants (demands?) that xml files be processed as bytes * for the phase where we gen the entity files, read as text anyway * Need to solve a problem where the generated xml is putting the \n in literally, not evaluating it. * Fix some examples broken for py3 * Fix more octal constant instances * Cleanups suggested by PyCharm: staticmethods, two blanks before class definition, others. This addresses issues called out in #3300, but is not a complete solution because the actual doc build step still fails with the epydoc failures (which aren't directly because of Py3; epydoc build doesn't work any better on my system with Py3, even with the forked version with patches). Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | | | Merge pull request #3485 from mwichmann/more-escapesWilliam Deegan2019-12-022-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix more Python escape complaints
| * | | | | | | fix more Python escape complaintsMats Wichmann2019-12-022-3/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write as raw strings: Two are docstrings that contain a backslash; the third is an odd expression parenthesized for no good reason and containing backslashes. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | | | Merge pull request #3484 from mwichmann/testfw-newWilliam Deegan2019-12-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Typo in testing document
| * | | | | | Typo in testing document [ci skip]Mats Wichmann2019-12-021-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lack of a consistent indent confused ReST readers: System Message: WARNING/2 (/home/mats/github/scons/testing/framework/test-framework.rst, line 32) Block quote ends without a blank line; unexpected unindent. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | | [ci skip] Add to CHANGES.txt for PR #3481William Deegan2019-11-271-16/+20
| | | | | |
* | | | | | Merge pull request #3481 from datalogics-robb/sol_py3William Deegan2019-11-271-13/+28
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix a problem under Solaris when using Python 3
| * | | | | try a different approach that should work on python 3.5.Rob Boehne2019-11-261-2/+2
| | | | | |
| * | | | | Fix a problem under Solaris when using Python 3, while maintaining support ↵Rob Boehne2019-11-261-13/+28
|/ / / / / | | | | | | | | | | | | | | | for Python 2.7. subproces.Popen() produces bytes without the encoding argument in 3, which is not recognized by 2.7, and doesn't need to be decoded.
* | | | | Merge pull request #3471 from ivankravets/patch-1William Deegan2019-11-185-32/+42
|\ \ \ \ \ | | | | | | | | | | | | Parse "-imacros" option in ParseFlags
| * \ \ \ \ Merge branch 'master' into patch-1William Deegan2019-11-1822-49/+87
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3474 from mwichmann/argv0-py39-testsWilliam Deegan2019-11-1812-34/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | [3.9] change tests not to expect bare scriptname
| * | | | | | [3.9] change tests not to expect bare scriptnameMats Wichmann2019-11-0612-34/+34
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python 3.9 changes to give an absolute path in sys.argv[0]. Some tests expected to see just a simple path ('myyacc.py'); these now either do a test.must_contain instead of must_match, or change to do "if 'mypass.py' in sys.argv[0]' instead of the former "if sys.argv[0] == 'mypass.py'". Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | | Merge pull request #3476 from timgates42/bugfix/typo_whoseWilliam Deegan2019-11-172-1/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix simple typo: whos -> whose
| * | | | | Update CHANGES.txtTim Gates2019-11-171-0/+2
| | | | | |
| * | | | | Fix simple typo: whos -> whoseTim Gates2019-11-161-1/+1
|/ / / / /
* | | | | [ci skip] updatesWilliam Deegan2019-11-101-0/+1
| | | | |
* | | | | [ci skip] indicating to github linguist which files to ignore when detecting ↵William Deegan2019-11-101-0/+5
| | | | | | | | | | | | | | | | | | | | the main programming language for this repo
* | | | | Create FUNDING.ymlWilliam Deegan2019-11-101-0/+5
| |_|/ / |/| | |
* | | | [skip ci] make scons_dev_master.py have proper shebang and also set executableWilliam Deegan2019-11-081-1/+1
| | | |
* | | | Merge pull request #3472 from maiphi/latex_latin1William Deegan2019-11-084-3/+28
|\ \ \ \ | | | | | | | | | | Fix crash when Latin-1 encoded Latex log file is read with Python 3
| * | | | Changelog: add details about fix of Latex log encoding issuemaiphi2019-11-071-1/+2
| | | | |
| * | | | Latin-1 log test case: compile to DVI, not PostScript; add commentmaiphi2019-11-071-1/+5
| | | | |
| * | | | Added note about Latex Latin-1/UTF-8 issue to CHANGES.logmaiphi2019-11-011-0/+4
| | | | |
| * | | | Add test case with Latin-1 encoded Latex log file. Required fix in the test ↵maiphi2019-11-012-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework. In order to make the test work, it was necessary to handle the encoding issue also in the test framework. Otherwise, though the Latex builder can handle the case, the test framework chokes on it.
| * | | | Tex builder: avoid error when reading non-utf-8 log filesmaiphi2019-11-011-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Python 3 throws a UnicodeDecodeError when reading a non-utf-8 file in text mode with default (utf-8) encoding. This happens when T1 fontenc is used in Latex and a warning in the log file contains e.g. umlauts. Invalid characters are now replaced.
* | | | Merge pull request #3466 from mwichmann/depr-builderWilliam Deegan2019-11-073-10/+10
|\ \ \ \ | |/ / / |/| | | Remove deprecated Builder keywords
| * | | Remove deprecated Builder keywordsMats Wichmann2019-10-223-10/+10
|/ / / | | | | | | | | | | | | | | | overrides= and scanner= have been deprecated for over a decade. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Added support for "-imacros" to ParseFlagsIvan Kravets2019-11-065-36/+40
| | |
| * | Parse "-imacros" option in ParseFlagsIvan Kravets2019-11-011-1/+1
| | |
| * | Parse GCC "-imacros" option in ParseFlagsIvan Kravets2019-11-011-0/+3
| | |
| * | Parse GCC -imacros optionIvan Kravets2019-11-011-1/+4
|/ / | | | | https://gcc.gnu.org/onlinedocs/gcc/Preprocessor-Options.html
* | Merge pull request #3464 from mwichmann/rm-signature-funcsWilliam Deegan2019-10-2136-622/+148
|\ \ | | | | | | Remove deprecated {Source,Target}Signatures
| * | [PR 3464] quiet sider complaintsMats Wichmann2019-10-212-3/+0
| | | | | | | | | | | | | | | | | | | | | unused imports in a pair of tests that were moved and thus "touched". Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [PR 3464] rework new tests so they match stderrMats Wichmann2019-10-212-10/+20
| | | | | | | | | | | | | | | | | | | | | The re.DOTALL match function somehow wasn't matching the SConstruct error path, so build it up from known information instead. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Remove deprecated {Source,Target}SignaturesMats Wichmann2019-10-2036-619/+138
|/ / | | | | | | | | | | | | | | | | | | These two have been deprecated since 2010 (about SCons 2.0), commit 935e6985. Methods are removed, setoption for setting them removed, doc is removed, tests are migrated to test/Removed/*/Old with a sconstest.skip file so they don't run, and two new tests are added to confirm that using the functions and setoptions generate exceptions. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Changed wording on MSVC caching to indicate it's currently experimental ↵William Deegan2019-10-121-3/+4
| | | | | | | | feature [CI Skip]
* | Merge pull request #3462 from mwichmann/msvc_env_cacheWilliam Deegan2019-10-128-82/+313
|\ \ | | | | | | enable experimental persistent caching of vcvars on win32
| * | [PR 3462] update doc/comments for msvc-env-cacheMats Wichmann2019-10-123-22/+35
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [PR 3462] convert json cache better way for py2Mats Wichmann2019-10-113-18/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there was still a path through without fully converted data, where env['ENV'] could contain unicode, so convert the cache hit instead. This is a little slower but only for Py2 which is going away anyway. added the vs2019 exec test (vs-14.2-exec) which is just a copy of 14.0, 14.1 with the required version changed - this had never been added. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [PR 3462] python two handle the jsonMats Wichmann2019-10-113-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | reading the cache from the json file got us unicode when running python2, and this broke certain tests when calling subprocess.Popen: TypeError, because all the environment wasn't strings, some was unicode. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [PR 3462] quote appveyor setting of cache valMats Wichmann2019-10-101-1/+1
| | | | | | | | | | | | | | | | | | Python 2.7 suffered some problems in subprocess. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [PR 3462] env-var-cache: fix exception to be 2.7 compatibleMats Wichmann2019-10-103-37/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | msvc env-var cache-read function use 'except IOError' since 'FileNotFoundError' did not exist on Py2.7/win32. try to handle error if caceh write fails. add SCONS_CACHE_MSVC_CONFIG to manpage. SCONS_CACHE_MSVC_CONFIG can take a pathname to specify the cache file to use, or it can use the default. slightly simplified logging setup - logging is stdlib since py2.3, no need for try block on import. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | [WIP] enable persistent caching of vcvars on win32Mats Wichmann2019-10-106-57/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting env var SCONS_CACHE_MSVC_CONFIG enables a filesystem cache of vcvars results, making them persistent across scons runs. On test runs (notably our CI system) this helps a lot; in normal usage where you run one scons invocation at a time instead of many hundreds in a test run it will make things a little more responsive (esp on vs2019) but the impact will be much smaller. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Move SConstruct from test to file fixtureWilliam Deegan2019-10-112-5/+4
| | |
generated by cgit v0.12 at 2025-04-05 21:51:15 (GMT)