summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix one merge issue and the test I added yesterdayAdam Gross2020-08-042-7/+7
|
* Fix rebase issue with CHANGES.txtAdam Gross2020-08-041-4/+4
| | | | | Rebasing off of master put my CHANGES.txt addition in an old release. This commit moves it up to the correct section.
* [ci skip] Clarify --md5-chunksize optionAdam Gross2020-08-041-1/+1
|
* Two small changes to the test caseAdam Gross2020-08-042-16/+14
| | | | | 1. Remove unnecessary writes of f1.in and f2.in. The former is already in the dir fixture and the latter is unused. 2. Untabify SConstruct file.
* Fix a few issuesAdam Gross2020-08-042-6/+4
| | | | Fixes one sider issue and a code error that broke some tests
* Add support for overriding the default hash formatAdam Gross2020-08-0420-86/+293
| | | | | | | This change adds support for a new --hash-format parameter that can be used to override the default hash format used by SCons. The default remains MD5, but this allows consumers to opt into SHA1, SHA256, or any other hash algorithm offered by their implementation of hashlib.
* Merge pull request #3763 from grossag/topic/grossag/md5chunksizeWilliam Deegan2020-08-044-4/+68
|\ | | | | Fix SCons.Node.FS.File.get_csig() usage of md5_chunksize (Issue #3726)
| * Address review feedbackAdam Gross2020-08-033-9/+10
| | | | | | | | Do the "* 1024" when setting File.md5_chunksize, not when using it later.
| * Push another commit to run testsAdam Gross2020-08-031-2/+2
| | | | | | | | I had forgotten that [ci skip] will cancel running tests...
| * [ci skip] Add some more commentsAdam Gross2020-08-031-1/+4
| | | | | | | | Try to clarify a few parts of the working of the test through comments.
| * Fix one comment and make one test a bit more obviousAdam Gross2020-08-031-2/+2
| |
| * Fix SCons.Node.FS.File.get_csig() usage of md5_chunksizeAdam Gross2020-08-033-1/+61
| | | | | | | | | | | | md5_chunksize is documented to be in kilobytes, but this function was using it as though it is in bytes. This change fixes that, adding a test to confirm the correct behavior for a few different cases.
* | Merge pull request #3764 from mwichmann/issue_2154William Deegan2020-08-031-3/+35
|\ \ | | | | | | Update SideEffect testcase
| * | [PR #3746] fixed missed Py2-Py3 porting on testcase addsMats Wichmann2020-08-031-2/+2
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Update SideEffect testcaseMats Wichmann2020-08-031-3/+35
| |/ | | | | | | | | | | | | | | | | | | The problems reported in the issue are not present any longer. Since the issue proposed an enhanced testcase to show the problem, committing the new version so we can detect any regression. Closes issue #2154. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge branch 'master' of github.com:SCons/scons into masterWilliam Deegan2020-08-0326-403/+1107
|\ \ | |/
| * Merge pull request #3751 from dirkbaechle/fix-dbhtml-metaencWilliam Deegan2020-08-024-12/+373
| |\ | | | | | | [WIP] Enforcing HTML output encoding to UTF-8.
| | * Enforcing HTML output encoding to UTF-8.Dirk Baechle2020-07-194-12/+373
| | | | | | | | | | | | | | | | | | | | | | | | The stylesheet for the single HTML outputs (not chunked) get adapted, such that UTF-8 is always used as output encoding for all chunks. In addition, the HTML header now contains a corresponding "content" tag, displaying the used charset=UTF-8. [skip ci]
| * | Merge pull request #3752 from mwichmann/doc-overridesWilliam Deegan2020-08-0213-277/+547
| |\ \ | | | | | | | | Update docs on argument passing to Environment, etc.
| | * | [PR #3572] a bit more docbook markup in environments.xml [skip appveyor]Mats Wichmann2020-08-021-17/+14
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | [PR #3752] doc tweaks to address review comments [ci skip]Mats Wichmann2020-08-021-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | [PR #375] minor doc tweak: dicts [skip appveyor]Mats Wichmann2020-07-261-11/+15
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | Fix xml validation errorMats Wichmann2020-07-241-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | [PR #3752] fix review comment on keywords [skip appveyor]Mats Wichmann2020-07-242-45/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified the guide wording on source/target kwargs to get rid of an ambifuity. Some tweaking of the manpage on overrides and parse_args. Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | [PR #3572] typo fix [skip appveyor]Mats Wichmann2020-07-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | [PR #3752] guide: update consvar setting after review [skip appveyor]Mats Wichmann2020-07-234-114/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review comments noted that there was perhaps more assumptions about Python knowledge than warranted, added some things to address that, including an intro to dictionaries. Markup changes in environment chapter, plus more wording tweaks. Filled out an example of of overriding when calling a builder, and added a note on when that is not sufficient, and separate envs are needed. Dropped a python2 paragraph. Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | Update docs on argument passing to Environment, etc.Mats Wichmann2020-07-2210-124/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new uguide Ch 7 section on using the parse_flags method (with Ex.) Moves the section on overrides in calls to Builders to Chap 7 - it was using concepts not introduced yet where it was placed. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | Merge pull request #3756 from mwichmann/rename-doc-initWilliam Deegan2020-08-027-108/+113
| |\ \ \ | | | | | | | | | | Rename some doc files; Packaging doc fixups
| | * | | [PR #3756] grid the packager table [skip appveyor]Mats Wichmann2020-07-261-17/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | | [PR #3756] review: do not use CAPS for manpage option [skip appveyor]Mats Wichmann2020-07-261-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two manpage options from a previous commit had the option-argument listed in caps to match the --help output. A review comment suggested not to do this, as all-caps indicates a construction variable. Question: should the AddOption calls for these two set a metavar to match the current documentation? Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | | Rename some doc files; Packaging doc fixups [skip appveyor]Mats Wichmann2020-07-257-108/+106
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed those documentation files named __init__.xml to the name of the component directory. Merged SCons/Tool/packaging.xml (which had no unique content) into the renamed SCons/Tool/packaging/packaging.xml Considerable rework was needed to the packaging content to fill in some gaps: * properly named the commandline option * add the option to the manpage (with a note it's not always avail) * only list the packagers once * add example of selecting packaging tool, and of specifying multiple packagers * more description of source, target and metadata for Packaging * mention use of PACKAGEROOT * redo tag description * add a bit of explanation to the complete packaging example Signed-off-by: Mats Wichmann <mats@linux.com>
| * | | Merge pull request #3760 from mwichmann/env.setdefaultWilliam Deegan2020-08-023-6/+74
| |\ \ \ | | | | | | | | | | Enable environment dict.setdefault
| | * | | Adjust env.setdefault to be more efficient (review comment)Mats Wichmann2020-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * | | Enable environment dict.setdefaultMats Wichmann2020-07-313-6/+74
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setdefault() now works on SubstitutionEnvironment and OverrideEnvironment. Unittests added for that. OverrideEnvironment Dictionary() method was not accepting the one-arg and multi-arg forms that are documented for the regular env.Dictionary(). Not detected because the testcase also didn't test that; updated. Testcase was misnamed, duplicated test_items - not sure if that mattered or not. Tests did not exist for OverrideEnvironment keys() and values() methods. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | [ci skip] Fix docstring, was comment above function previouslyWilliam Deegan2020-08-031-3/+5
|/ / /
* | | Merge pull request #3755 from dmoody256/conftest_nodesWilliam Deegan2020-07-265-12/+48
|\ \ \ | |/ / |/| | Added method to Node to check if node is used in sconf
| * | Quiet sider complaint about unused variableWilliam Deegan2020-07-261-1/+1
| | |
| * | Add .attributes to Dummy MyNode class used for testsWilliam Deegan2020-07-261-0/+4
| | |
| * | Added method to check if node is used in sconfDaniel Moody2020-07-254-12/+44
|/ /
* | Merge pull request #3731 from mwichmann/warn-to-sconswarnWilliam Deegan2020-07-1919-74/+85
|\ \ | |/ |/| Change Warning to SConsWarning
| * [PR #3731] more adjustments to WarningsMats Wichmann2020-07-072-35/+42
| | | | | | | | | | | | | | Replace the arguments-to-WarningClass converter. Improve docstrings. Signed-off-by: Mats Wichmann <mats@linux.com>
| * Change Warning to SConsWarningMats Wichmann2020-07-0718-42/+46
| | | | | | | | | | | | avoid potential overlap with Python's own Warnng class. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3748 from mwichmann/build-scan-docsWilliam Deegan2020-07-185-89/+158
|\ \ | | | | | | Update docs on Builders, Scanners, Environment
| * | [PR #3748] Fix typo and add some links [ci skip]Mats Wichmann2020-07-182-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up the reference to some consvars only having an effect on init by adding MSVC_VERSION as an example. That entry already said so, so should be non-controversial. That change led to a few changes in the file defining that var - mostly turning entity references into entity link references. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Update docs on Builders, Scanners, EnvironmentMats Wichmann2020-07-174-69/+135
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment Base docstrings tweaked. Internal _update_onlynew added: like _update but update the env "dict" only with items that are not already in the internal dict: intent is to simplify numbers of "if FOO not in env: # set env[FOO]" in tools. There are no clients of this at this time. Tweak BUILDERS cvar description Add known keyword args accepted by Environment(), and pointer to the broken out Construction Environments section where these are described. Add missing "name" keyword to template for Scanners() Construction Environments: uncommented the note that setting a cvar after Environment() call do not always take effect - the question still remains how the user can tell that's the case. Construction Environments - paragraphs for the other Environment kwargs with pointers to the sections that describe them. A little clarification of use of None in Variables() call, plus be explicit about the default if Variables called with no args. Mention that the default name of a Scanner object is "NONE" if not set. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Post releaseWilliam Deegan2020-07-173-25/+44
| |
* | MergedWilliam Deegan2020-07-178-50/+48
|\ \
| * \ Merge pull request #3746 from SCons/rel_4.0.1William Deegan2020-07-179-53/+51
| |\ \ | | | | | | | | Rel 4.0.1
| | * | 4.0.1 updatesWilliam Deegan2020-07-171-4/+4
| | | |
| | * | updates for 4.0.1William Deegan2020-07-172-2/+2
| | | |