summaryrefslogtreecommitdiffstats
path: root/SCons
Commit message (Collapse)AuthorAgeFilesLines
* Added new alias 'shutdown-ninja-scons-daemon' to allow ninja to shutdown the ↵Daniel Moody2022-06-074-2/+29
| | | | daemon
* Update ActionTests for Python 3.11Mats Wichmann2022-06-041-159/+185
| | | | | | | | | | Required all new bytecode strings. Some reformatting done (this is not a full formatting run). Partial fix for #4162, do not close only for this PR. Signed-off-by: Mats Wichmann <mats@linux.com>
* [ci skip] Add note to handle processes not dying properly by raising ↵William Deegan2022-06-032-0/+3
| | | | exception and handling in calling function
* Merge branch 'ninja_always_execute' of github.com:dmoody256/scons into ↵William Deegan2022-06-0213-149/+209
|\ | | | | | | ninja_always_execute
| * Merge branch 'master' into ninja_always_executeWilliam Deegan2022-06-0213-149/+209
| |\
| | * Merge pull request #4158 from dmoody256/shell_env_gen_listWilliam Deegan2022-06-015-16/+66
| | |\ | | | | | | | | Updated SHELL_ENV_GENERATOR to be list of functions now called SHELL_ENV_GENERATORS
| | | * Updated CHANGES/RELEASE to be a bit simpler. Fixed typo in docs for ↵William Deegan2022-06-012-6/+12
| | | | | | | | | | | | | | | | SHELL_ENV_GENERATORS.
| | | * fix missing f stringDaniel Moody2022-05-271-1/+1
| | | |
| | | * move ENV copy to more optimal locationDaniel Moody2022-05-241-1/+1
| | | |
| | | * removed auto typeDaniel Moody2022-05-241-1/+0
| | | |
| | | * fix sider complaintDaniel Moody2022-05-241-1/+2
| | | |
| | | * Updated SHELL_ENV_GENERATOR to be list of functions now called ↵Daniel Moody2022-05-245-16/+60
| | | | | | | | | | | | | | | | SHELL_ENV_GENERATORS
| | * | Merge branch 'master' into 4162-python-311-unittestsMats Wichmann2022-05-3032-326/+930
| | |\ \
| | | * \ Merge pull request #4150 from mwichmann/docs/variantdirWilliam Deegan2022-05-262-84/+81
| | | |\ \ | | | | | | | | | | | | Improve variantdir docs
| | | | * | SConscript doc tweaks per #4150 review comments [skip appveyor]Mats Wichmann2022-05-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | | | * | Typo fix [ci skip]Mats Wichmann2022-05-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | | | * | Further tweak of VariantDir doc [skip appveyor]Mats Wichmann2022-05-251-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | | | * | Fix grammar error ("the the") [ci skip]Mats Wichmann2022-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | | | * | A little more work on Sconscript() documentation [skip appveyor]Mats Wichmann2022-05-252-25/+30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | | | * | Try to improve variantdir docs [skip appveyor]Mats Wichmann2022-05-252-63/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder some bits, add some explantaions, include example of passing different environments to subsidiary SConscript. Signed-off-by: Mats Wichmann <mats@linux.com>
| | | * | | Merge pull request #4152 from jcbrill/jbrill-msvc-cachefixWilliam Deegan2022-05-261-1/+13
| | | |\ \ \ | | | | |/ / | | | |/| | MSVC environment vars cache warning for incompatible format
| | | | * | Issue warning for incompatible cache format and continue; file possibly ↵Joseph Brill2022-05-191-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | overwritten.
| | | | * | Raise exception for unexpected cache file formatJoseph Brill2022-05-171-1/+9
| | | | | |
| | | * | | Fix review comments. [skip appveyor]Mats Wichmann2022-05-251-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | | * | | Tweak the swig tool documentation [skip appveyor]Mats Wichmann2022-05-231-43/+34
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes: the spelled-out name of the tool as used in SCons docs was not the same as the manpage uses, and it was repeated a bunch of times spelled out for no good reason. Just turned it all into uses of &swig; entity. A bit of tweaking of some of the entries. SWIGCXXFILESUFFIX had a copy-paste error, it referred to CFILESUFFIX instead of CXXFILESUFFIX. Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | | Fix some Py 3.11 depr warns in testsMats Wichmann2022-05-304-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of unittest methods that a few SCons tests use have been marked deprecated in Python 3.11, with replacements provided. Partial fix for #4162, do not close just off this PR. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | Fix sider complaintsWilliam Deegan2022-06-021-2/+1
|/ / / /
* | | | Updated ninja docs in users guilde.William Deegan2022-06-021-1/+1
| | | |
* | | | Move logic which waits for a process to die into SCons.Util ↵William Deegan2022-06-022-27/+37
| | | | | | | | | | | | | | | | wait_for_process_to_die(pid)
* | | | Merge branch 'master' into ninja_always_executeDaniel Moody2022-05-2410-28/+423
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'upstream/master' into ↵William Deegan2022-05-224-17/+152
| |\ \ \ | | | |/ | | |/| | | | | feature/minor_java_improvements
| | * | Merge pull request #4111 from mwichmann/msvc/cachefixWilliam Deegan2022-05-152-7/+38
| | |\ \ | | | | | | | | | | Tweak the MSVC environment vars cache
| | | * | Drop leading '.' from cachefile nameMats Wichmann2022-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't need to be named .scons_msvc_cache.json, does not feel like it's really a "hidden" file, it'a a cache. Already renaming in this PR (adding the .json suffix) so sneak this change in as well. Signed-off-by: Mats Wichmann <mats@linux.com>
| | | * | Add comments describing reason for data structure conversion to/from jsonJoseph Brill2022-05-151-0/+6
| | | | |
| | | * | Change cache key to tuple and read/write list of dictionaries to jsonJoseph Brill2022-05-152-3/+5
| | | | |
| | | * | Merge branch 'master' into msvc/cachefixWilliam Deegan2022-05-1525-489/+953
| | | |\ \
| | | * \ \ Merge branch 'master' into msvc/cachefixWilliam Deegan2022-03-2947-201/+1055
| | | |\ \ \
| | | * | | | Fix use of too-new (Py 3.8) pathlib featureMats Wichmann2022-03-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | | * | | | PR 4111: tweak msvc cache invalid algorithmMats Wichmann2022-03-121-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt previous change so if cache entry tools dir is empty, don't invalidate the entry, it's an old compiler that doesn't add this info (we always add it, if it didn't come from the batch file it will be an empty list). We don't want to force that case to recalculate, or the value of the cache is lost for those compilers. Signed-off-by: Mats Wichmann <mats@linux.com>
| | | * | | | MSVS_CACHE: Reword the CHANGES and RELEASE entriesMats Wichmann2022-03-111-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharpened up the descriptions of the change in PR 4111. Changed the opening of the cache file to use pathlib functions. Signed-off-by: Mats Wichmann <mats@linux.com>
| | | * | | | Tweak the MSVC environment vars cacheMats Wichmann2022-03-082-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Now performs a sanity check: if the retrieved tools path does not exist, consider the entry invalid so it will be recomputed. - The dictionary key, which is the name of a batch file, is computed a bit differently: the dashes are left off if there are no arguments. - The cachefile is changed to have a .json suffix, for better recognition on Windows systems. Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | | | | Merge branch 'master' into jbrill-msvc-usesettingsWilliam Deegan2022-05-153-9/+7
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-05-1520-170/+377
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | Manually resolve conflicts in RELEASE.txt
| | | * | | | | Propagate OS and windir environment variables to msvc batch file environmentJoseph Brill2022-05-041-0/+2
| | | | | | | |
| | | * | | | | Combine the msvc 7.1-7.0 and 6.0 batch file clauses following conflict ↵Joseph Brill2022-05-041-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolution.
| | | * | | | | Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-05-032-274/+519
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-05-031-18/+18
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-04-151-4/+12
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-04-1032-193/+853
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' into jbrill-msvc-vscomntoolsJoseph Brill2022-03-255-2/+88
| | | |\ \ \ \ \ \ \ \