summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* updates4.5.0rel_4.5.0William Deegan2023-03-051-3/+3
|
* fixed some version string and copyright date items in README-SF.rstWilliam Deegan2023-03-051-9/+9
|
* Post build commits for 4.5.0William Deegan2023-03-053-7/+7
|
* Updates for 4.5.0 ReleaseWilliam Deegan2023-03-052-11/+17
|
* Regenerated docs for 4.5.0 release.William Deegan2023-03-0511-742/+1399
|
* Merge pull request #4314 from mwichmann/doc/ValidateOptions-versionWilliam Deegan2023-03-031-3/+3
|\ | | | | man: add a "New in..." to ValidateOptions [skip appveyor]
| * man: add a "New in..." to ValidateOPtions [skip appveyor]Mats Wichmann2023-03-031-3/+3
| | | | | | | | | | | | | | The new ValidateOptions had a :versionadded: in the docstring, but just noticed the actual manpage entry didn't have similar. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #4313 from bdbaddog/fix_textfile_unicode_on_winWilliam Deegan2023-03-031-1/+2
|\ \ | |/ |/| Fix test/textfile/textfile.py test failing (only on windows)
| * fix textfile test failing (only on windows) needed to switch generated file ↵William Deegan2023-03-021-1/+2
|/ | | | comparison from r (text) to rb (read binary) since we now include unicode, and test logic assumes r = ascii
* [ci skip] Update versionadded for ValidateOptions()William Deegan2023-03-021-1/+1
|
* Merge pull request #4305 from bdbaddog/rename_qt_qt3William Deegan2023-03-0124-869/+1033
|\ | | | | Rename qt tool to qt3
| * Merge pull request #10 from mwichmann/rename_qt_qt3-updateWilliam Deegan2023-03-013-18/+104
| |\ | | | | | | Update PR 4305: failing stub qt tool
| | * test/import works on dummy qt tool nowMats Wichmann2023-03-011-3/+3
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| | * Update PR 4305: failing stub qt toolMats Wichmann2023-03-013-16/+102
| |/ | | | | | | | | | | | | | | | | | | Proposed addition of code to cause stub qt to fail, and test/import.py to detect this situation. Unfortunately, it doesn't seem to work... needs adjustment. Doc updates to record rename version. Signed-off-by: Mats Wichmann <mats@linux.com>
| * Fix qt3 -> QT3 typosWilliam Deegan2023-02-241-5/+5
| |
| * add placeholder tool qt to instruct users to switch to qt3William Deegan2023-02-242-0/+69
| |
| * fix test/import.py for qt3 changesWilliam Deegan2023-02-241-3/+3
| |
| * moved the qt tool to qt3. Changed all QT envvars to be now prefixed with QT3William Deegan2023-02-2416-100/+105
| |
| * move qt -> qt3 tool, adjust testing as wellWilliam Deegan2023-02-2318-155/+159
|/
* Merge pull request #4303 from RedwanFox/fix_textfile_encoding_issueWilliam Deegan2023-02-206-5/+36
|\ | | | | set default encoding of written files to UTF-8, added ability to pass custom file encoding
| * Updated docs to indicate FILE_ENCODING will affect Substfile() as well as ↵William Deegan2023-02-185-13/+24
| | | | | | | | TextFile(). Added blurb to RELEASE.txt. Updated test fixture to include new utf-8 text for test
| * set default encoding of written files to UTF-8, added ability to passNickolai Korshunov2023-02-184-3/+23
| | | | | | | | custom file enconding
* | Merge pull request #4263 from mwichmann/maint/CPPDEFINES-AppendWilliam Deegan2023-02-1817-545/+1627
|\ \ | | | | | | Split out CPPDEFINES handling in Append methods
| * \ Merge pull request #8 from bdbaddog/maint/CPPDEFINES-AppendMats Wichmann2023-02-164-19/+14
| |\ \ | | | | | | | | rewording of CHANGES.txt info. Changed versionadded to 4.5.0
| | * | clarify noticeWilliam Deegan2023-02-161-1/+1
| | | |
| | * | rewording of CHANGES.txt info. Changed versionadded to 4.5.0William Deegan2023-02-154-19/+14
| |/ /
| * | CPPDEFINES prepend test fixMats Wichmann2023-02-151-1/+1
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Tweak Append/Prepend e2e testsMats Wichmann2023-02-155-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added another try block so complete prepend e2e test can be run on a branch where PR #4263 is not applied (for comparison). Added license header. Changed invalid-tuple unittest to use assertRaises (behavior is the same) Also added a versionadded and a versionchanged to docstrings. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Added DefaultEnvironment(tools=[]) to fixtures for CPPDEFINES. Added ↵William Deegan2023-02-104-2/+15
| | | | | | | | | | | | negative test for non-two-tuple. Minor wording change
| * | Adjust CPPDEFINES tests to be more resilientMats Wichmann2023-02-102-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | In a hope to make the tests runnable against a checkout that does not include PR #4263, add some try blocks so the things which used to blow up can generate errors rather than aborting the test run. The prepend test still fails against master. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Adjusted CPPDEFINES behavior for list and tupleMats Wichmann2023-02-0911-311/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the previous proposals, addition of a bare tuple is restored to the valued-macro behavior (this previously did not work consistently). Strings are now consistently split if they contain spaces, except if entered as a list member, in which case (as documented) they are left alone. tuples with nore than two members are now flagged as a UserError; previously the first two members were taken as name=value and any further members were silently ignored. More tests added. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Add explicit note to RELEASE.txt warning about rebuilds if you use ↵William Deegan2023-02-021-0/+3
| | | | | | | | | | | | dictionaries to specify CPPDEFINES
| * | Alter append logic to keep existing append of tuple value yielding -Dkey=valueWilliam Deegan2023-02-021-1/+13
| | |
| * | [ci skip] remove umerged conflict markers in RELEASE.txtWilliam Deegan2023-02-021-3/+0
| | |
| * | Fix some CPPDEFINES handling problemsMats Wichmann2023-01-307-14/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few places were deciding what to do based on result of is_List, when the intent was really list-or-tuple-or-derivatives - changed to is_Sequence. Added some test cases, including a unit test for processDefines (which would have caught one of these cases). Signed-off-by: Mats Wichmann <mats@linux.com>
| * | CPPDEFINES: reword some doc stuffMats Wichmann2023-01-302-22/+28
| | | | | | | | | | | | | | | | | | | | | Fix a typo Try to further clarify how to add valued macros. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | test/CPPDEFINES: stop using tabsMats Wichmann2023-01-304-204/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test output for append and prepend generated tabs, and so the "expected" strings had to contain tab indents. This made Sider on the CI extremely noisy. There's no specific benefit to tabs here, so just change them to spaces. Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Fix some pyside complaintsMats Wichmann2023-01-302-4/+3
| | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
| * | Split out CPPDEFINES handling in Append methodsMats Wichmann2023-01-3016-485/+1179
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than having lots of special-case code for CPPDEFINES in four separate routines, add a new _add_cppdefines function to handle it, paying attention to append/prepend, unique/duplicating, and keep-original/replace-original. The existing special case handing was then removed from Append and AppendUnique (it was never present in Prepend and PrependUnique anyway - see #3876, but these now get it due to a call to the new function). Tuple handling is now consistent with list handling: a single tuple is treated as macro names to add, not as a name=value pair. A tuple or list has to be a member of a containing tuple or list to get the macro=value treatment. This *may* affect some existing usage. macro=value tuples without a value can now be entered either in (macro,) form or (macro, None) form. Internally, whenever append/prepend is done, existing contents are forced to a deque, which allows efficient adding at either end without resorting to the tricks the Prepend functions currently do (they still do these tricks, but only in non-CPPDEFINES cases). As a result, values from a dict are not stored as a dict, which has some effect on ordering: values will be *consistently* ordered, but the ones from the dict are no longer necessarily sorted. In SCons/Defaults.py, processDefines no longer sorts a dict it is passed, since Python now preserves dict order. This does not affect the E2E test for CPPDEFINES - since those all call an Append routine, CPPDEFINES will always be a deque, and so processDefines never sees a dict in that case. It could well affect real-life usage - if setup of CPPDEFINES was such that it used to contain a dict with multiple entries, the order might change (sorting would have presented the keys from that dict in alphabetical order). This would lead to a one-time rebuild for actions that change (after that it will remain consistent). In the E2E test CPPDEFINES/append.py some bits were reformatted, and the handler routine now accounts for the type being a deque - since the test does a text comparison of internally produced output, it failed if the word "deque" appeared. Some new test cases were added to also exercise strings with spaces embedded in them. Changes were made to the expected output of the E2E test. These reflect changes in the way data is now stored in CPPDEFINES, and in some cases in order. Most of these do not change the meaning (i.e. "result" changes, but "final" output is the same). These are the exceptions: - "appending a dict to a list-of-2lists", AppendUnique case: order now preserved as entered (previously took the order of the appended dict) - "appending a string to a dict", Append case: not stored as a dict, so ordering is as originally entered. - "appending a dict to a dict", Append case: no longer merge into a dict, so this is now an actual append rather than a merge of dicts which caused the uniquing effect even without calling AppendUnique (arguably the old way was incorrect). A new test/CPPDEFINES/prepend.py is added to test Prepend* cases. append.py and prepend.py are structured to fetch the SConstruct from a fixture file. append.py got an added test in the main text matrix, a string of the macro=value form. The same 5x5 maxtrix is used in the new prepend.py test as well ("expected" values for these had to be added as well). Cosmetically, append and prepend now print their test summary so strings have quotation marks - the "orig" lines in the expected output was adjusted. This change looks like: - orig = FOO, append = FOO + orig = 'FOO', append = 'FOO' The other tests in test/CPPDEFINES got copyright updating and reformatting, but otherwise do not change. Documentation updated to clarify behavior. Fixes #4254 Fixes #3876 Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #4304 from mwichmann/test/tex-glossWilliam Deegan2023-02-182-3/+6
|\ \ | |/ |/| Minor tex test fix
| * Minor tex test fixMats Wichmann2023-02-182-3/+6
|/ | | | | | | | | | | | Syntax of selecting a glossary updated - apparently the late 2022.* texlive releases have started warning and prompting for action on this which appears to be what breaks the test. Not directly related to this test, but to trying to get a reasonable set of tests to run, added some pkgs to bin/scons_dev_master.py - this has absolutely no effect on SCons itself. Signed-off-by: Mats Wichmann <mats@linux.com>
* Merge pull request #4297 from mwichmann/CheckLib-uniqueWilliam Deegan2023-01-286-41/+128
|\ | | | | Add unique kwarg to CheckLibs
| * Add unique kwarg to CheckLibsMats Wichmann2023-01-276-41/+128
| | | | | | | | | | | | | | | | | | | | Minor tweak to CheckFunc - the dummy prototype should have a dummy arg list too (comment from Python setuptools discussion). Might as well fail the official way: #error instead of C syntax error. Fixes #2768 Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #4161 from dmoody256/fix_configure_marking_up_to_dateWilliam Deegan2023-01-2812-8/+129
|\ \ | |/ |/| Non-conftest nodes involved in configure checks now get node info cleared after check.
| * [ci skip] Remove duplicated text in CHANGES.txtWilliam Deegan2023-01-281-6/+0
| |
| * Merge remote-tracking branch 'upstream/master' into ↵William Deegan2023-01-28410-12357/+25187
| |\ | |/ |/| | | fix_configure_marking_up_to_date
* | Merge pull request #4295 from mwichmann/CheckLib-appendWilliam Deegan2023-01-265-88/+128
|\ \ | | | | | | Add "append" kwarg to two configure checks
| * | Add "append" kwarg to two configure checksMats Wichmann2023-01-245-88/+128
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Add append=True/False to CheckLib, CheckLibWithHeader in SConf. The "implementation", Conftest.CheckLib, already accepted this kwarg, but it could not be passed from an SConscript using the offical API. Updated manpage to describe and expanded a unit test to check. Fixes #2767 Additionally, clarified some things in manpage, including a recent user confusion about how to call CheckFunc. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Merge pull request #3421 from luhk/latex_after_biberWilliam Deegan2023-01-235-20/+43
|\ \ | | | | | | Run latex after bibtex/biber only when necessary
| * | Fix typoWilliam Deegan2023-01-231-1/+1
| | |
View Lorry Controller Status