summaryrefslogtreecommitdiffstats
path: root/SCons
Commit message (Collapse)AuthorAgeFilesLines
...
* | [ci skip] Add CHANGES/RELEASE Blurb. Minor edit in ninja.xmlWilliam Deegan2024-11-161-1/+1
| |
* | *.xml: Add miscellaneous language improvementsAlex Thiessen2024-11-159-10/+10
| |
* | *.xml: Fix joined wordsAlex Thiessen2024-11-152-3/+3
| |
* | *.xml: Remove trailing whitespaceAlex Thiessen2024-11-151-1/+1
| |
* | *.xml: Capitalize proper nounsAlex Thiessen2024-11-152-2/+2
| | | | | | | | | | | | | | | | Refer to https://en.wikipedia.org/wiki/Proper_noun#Modern_English_capitalization_of_proper_nouns. > In modern English orthography, it is the norm for recognized proper > names to be capitalized.
* | *.xml: Hyphenate `out of date`Alex Thiessen2024-11-152-7/+7
| | | | | | | | This seems to be a compound adjective which usually gets a hyphen.
* | *.xml: Fix hyphensAlex Thiessen2024-11-157-8/+8
| | | | | | | | | | | | | | One of the implemented rules is: > A compound adjective usually gets a hyphen when it comes before a > noun.
* | *.xml: Use en_USAlex Thiessen2024-11-151-1/+1
| |
* | *.xml: Add missing commasAlex Thiessen2024-11-1517-22/+22
| |
* | *.xml: Fix obvious typos etc.Alex Thiessen2024-11-1519-52/+52
|/
* Add as_dict flag to env.DictionaryMats Wichmann2024-11-123-57/+92
| | | | | | | | | | | | The Dictionary method now has an as_dict flag. If true, Dictionary always returns a dict. The default remains to return different types depending on whether zero (a dict of construction vars), one (that construction var's value), or multiple (a list of construction var values) arguments are given Fixes #4631 Signed-off-by: Mats Wichmann <mats@linux.com>
* Merge branch 'master' into jbrill-gh4623-intJoseph Brill2024-11-113-26/+163
|\
| * Merge branch 'master' into jbrill-msvs-testsJoseph Brill2024-10-287-188/+269
| |\ | | | | | | | | | Manually resolve conflicts in CHANGES.txt.
| * | Add optional keyword argument auto_filter_projects to MSVSSolution.Joseph Brill2024-10-282-1/+85
| | | | | | | | | | | | | | | | | | | | | Changes: * Detect solution file names and nodes in projects argument list. Behavior based on the auto_filter_projects value. By default, raise an exception. * Update TestSConsMSVS and multiple project auto_build_solution tests. * Update documentation, CHANGES.txt, and RELEASE.txt.
| * | Merge branch 'master' into jbrill-msvs-testsJoseph Brill2024-10-262-1/+32
| |\ \ | | | | | | | | | | | | Manually resolve conflicts: CHANGES.txt and RELEASE.txt
| * \ \ Merge branch 'master' into jbrill-msvs-testsJoseph Brill2024-10-202-185/+198
| |\ \ \
| * | | | Fix: normalize case for solution file extension and file name for string ↵Joseph Brill2024-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | endswith test.
| * | | | Bug fix in msvs.py: the value for the construction value 'nokeep' was ↵Joseph Brill2024-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | inadvertently querying the value of env['variant'].
| * | | | Minor code order refactor in msvs.py.Joseph Brill2024-10-191-3/+4
| | | | |
| * | | | Remove MSVSProject argument projectguid and replace with MSVS_PROJECT_GUID ↵Joseph Brill2024-10-131-4/+1
| | | | | | | | | | | | | | | | | | | | in all test files.
| * | | | Update Tool/msvs.py, update MSVS tests; and add additional tests for MSVS ↵Joseph Brill2024-10-112-26/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-project and solution builds. Tool/msvs.py: * Add "projectguid" argument to MSVSProject to enable user-defined GUID assignment per-project for multiple project solutions. * Project GUID priority: (1) MSVSProject "projectguid" argument, (2) SCons env MSVS_PROJECT_GUID value, (3) internally generated GUID. SCons env MSVS_PROJECT_GUID value should not be used for multiple project solutions without using projectguid arguments (otherwise, multiple projects will use the same GUID). * Store the project GUID as a node Tag when generating the MSVSProject and retrieve the project GUIDs using GetTag when generating the solution. * Move project node processing to a function so it can be called from multiple code locations. * Filter out solution nodes from project list (bugfix: auto_build_solution enabled and returned value used as project list includes auto-generated solution as a Project in the solution file). * Check for variant directory build of MSVSSolution and adjust src node accordingly similar to MSVSProject code. Bug fix: the solution file is generated in the build directory instead of the source directory. The placeholder solution file is now generated in the build directory and the solution file is generated in the source folder similar to the handling of project files. * Add project dsp nodes to the dsw source node list. This appears to always cause the project files to be generated before the solution files which is necessary to retrieve the project GUIDs for use in the solution file. This does change the behavior of clean for a project generated with auto_build_solution disabled and explicit solution generation: when the solution file is cleaned, the project files are also cleaned. The tests for vs 6.0-7.1 were changed accordingly. testing/framework/TestSConsMSVS.py: * Add known project GUID for single project tests and two known project GUIDs for dual project tests. * Add projectguid to MSVSProject arguments for single project test SConstruct/SConscript files. * Add PROJECT_BASENAME replaceable field to expected generated project file templates. * Add dual project and single solution templates. Tests: * Use known project guid for most tests which prevents have to hard-code generated GUIDs. * Add 4 (2x2) tests using two projects for combinations of auto_build_solutions settings (2) and variant directories (2). * Add 2 tests using two projects which use default GUID generation with and without variant directories.
| * | | | Merge branch 'Master' into jbrill-msvs-testsJoseph Brill2024-10-071-6/+67
| |\ \ \ \
| * | | | | Fix MSVS tests and minor changes to Tool/msvs.py.Joseph Brill2024-10-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing/framework/TestSConsMSVS.py: * Add default project GUID * Pass MSVS_PROJECT_GUID via environment * Add AdditionalOptions Condition to expected vcx project file * Fix vs version number for vc version 14.3 * Fix expected platform toolset version SCons/Tool/msvs.py: * User environment MSVS_PROJECT_GUID when creating project files info * Fix writing Visual Studio 15 for VS2015 * Add .vcxprof as an expected suffix for assigning the name to the file base name Fix early exit after vc version 8.0 (exit at the end of first loop execution) in: * test/MSVS/vs-files.py * test/MSVS/vs-scc-files.py * test/MSVS/vs-scc-legacy-files.py * test/MSVS/vs-variant_dir.py Tests: * Modify tests using TestSConsMSVS to add MSVS_PROJECT_GUID to the environment in the generated SConstruct/SConscript files. * Fix: delete env['PYTHON_ROOT'] before next loop iteration in test/MSVS/vs-files.py.
* | | | | | Fix CPP conditional scanner (cpp.py) and test suite (cppTests.py).Joseph Brill2024-11-102-17/+332
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Preserve non-integer literals that contain valid integer specifications. - Add binary integer specifications - Add octal integer specification - Zero (0) is considered an octal number - Add negative lookbehind/lookahead for number specifications (text is not word/token based) - Add method to evaluate constant expression for define constant expressions - Replace int conversion with constant evaluation expression - int conversion failed for hex numbers due to default base 10 [int(s)] vs unknown base [int(s, 0)] - Add additional tests
* | | | | Add a tag to the cachedirMats Wichmann2024-10-282-73/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there are now two files to make when a cachedir is created, use the temporary-dir -> rename technique. CacheDir tests no longer pre-create the cache directory, they should be verifying it's created properly upon request (one unit test still makes sure passing an existing empty directory works, too). Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | | Merge branch 'master' into test/fix-rootWilliam Deegan2024-10-275-74/+94
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4622 from mwichmann/doc/repositoryWilliam Deegan2024-10-273-73/+62
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Improve Repository docs
| | * | | | Improve Repository docs [skip appveyor]Mats Wichmann2024-10-243-73/+62
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give a few more details. Add example for another usecase to the User Guide. At the same time - convert more "construction environment" and "construction variable" to entities in files already being edited. Normalize on NEXT_RELEASE (since 4.8.1, some changed had used NEXT_RELEASE and some on NEXT_VERSION).
| * | | | Add support for tracking beamer themesKeith F. Prussing2024-10-211-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a regular expression to check for beamer theme files for LaTeX that may be part of the user's build tree. Similar to package files found via `\usepackage`, this will not report a missing file because the user may just be relying on the system version.
| * | | | Add test for beamer filesKeith F. Prussing2024-10-211-0/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | The branch adds support for tracking Beamer theme files. This defines the test to show the scanning failed without modification, but succeeds with the modification.
* | | | Move IS_ROOT definition to frameworkMats Wichmann2024-10-193-21/+3
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Use IS_WINDOWS from test frameworkMats Wichmann2024-10-192-10/+9
| | | | | | | | | | | | | | | | Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Adjust tests in case running as rootMats Wichmann2024-10-193-30/+83
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although validation tests are not normally run as root, there may be cicrumstances when it happens - one known case is when the test suite is run as part of a particular Linux distros package construction. It isn't too hard to avoid the few places where we counted on something failing because of permissions, which don't if the user is root - added a few skips. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Minor test cleanup - EnvironmentTestsMats Wichmann2024-10-181-183/+178
| | | | | | | | | | | | | | | | | | | | | Convert two huge blocks of test parameters to iterate-over-list from former while-then-del strategy. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Remove unused MSCommonLogFile warning.Joseph Brill2024-10-081-3/+0
| | |
* | | Merge branch 'master' into jbrill-mscommon-debugJoseph Brill2024-10-071-6/+67
|\ \ \ | | |/ | |/|
| * | Merge pull request #4598 from mwichmann/AddOption-shortoptsWilliam Deegan2024-10-011-6/+67
| |\ \ | | |/ | |/| Fix short-option processing
| | * Merge branch 'master' into AddOption-shortoptsWilliam Deegan2024-09-2211-345/+367
| | |\
| | * | Fix short-option processingMats Wichmann2024-09-161-6/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override the _process_short_opts method from optparse so it behaves better. This fix is lifted directly from #3799, leaving an additional part to apply later. Fixes #3798 Signed-off-by: Mats Wichmann <mats@linux.com>
* | | | Detect double quotes in SCONS_MSCOMMON_DEBUG value and raise UserError ↵Joseph Brill2024-10-011-9/+6
| | | | | | | | | | | | | | | | immediately.
* | | | Remove unnecessary f-string specification in ms common logging error message.Joseph Brill2024-09-271-1/+1
| | | |
* | | | Simplify log file handling.Joseph Brill2024-09-271-169/+20
| | | | | | | | | | | | | | | | | | | | | | | | Changes: * Remove leading and trailing double quotes from SCONS_MSDEBUG_VALUE and issue a warning. * Catch logging module OSError and FileNotFoundError and wrap in SCons UserError.
* | | | Validate the SCONS_MSCOMMON_DEBUG file name.Joseph Brill2024-09-261-2/+175
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Changes: * Issue warning and remove leading and trailing double quotes from SCONS_MSCOMMON_DEBUG file name when present. * Issue warning when SCONS_MSCOMMON_DEBUG file name is likely invalid. Known issues: * A false positive warning may be issued when a colon is detected in the file name. An output file and hidden alternate data stream file may be created.
* | | Handle permission errors while generating paths on DarwinAlex James2024-09-231-1/+1
| |/ |/| | | | | | | | | On Darwin, Nix may invoke SCons in a sandbox which lacks access to /etc/paths.d. Handle PermissionError while iterating through /etc/paths.d to support sandboxed environments such as Nix.
* | Merge branch 'master' into doc/gettextWilliam Deegan2024-09-222-12/+18
|\ \
| * | Tweak User Guide environment descriptionsMats Wichmann2024-09-212-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword/clarify the section on `AllowSubstExceptions` and the sidebar on Python dictionaries. Add an additonal piece to `env.Replace`. Also, some entity replacements, and more explicit `id` tags added to `section` elements. One unittest change to make sure passing a dict to `env.Replace` works. Signed-off-by: Mats Wichmann <mats@linux.com>
* | | Fix typosWilliam Deegan2024-09-221-4/+4
| | |
* | | Clean up manpage entries for gettext and pdf builders [skip appveyor]Mats Wichmann2024-09-207-320/+331
|/ / | | | | | | | | | | | | | | | | Minor wording cleanup, formatting for examples, etc. in the gettext-family (inc. msginit, msgformat, msgmerge) and the pdf and dvips builders. No code changes, no test changes. Signed-off-by: Mats Wichmann <mats@linux.com>
* | Add clang, clang++ to default tool searchMats Wichmann2024-09-191-4/+4
| | | | | | | | | | | | | | SCons will now automatically find clang (clang++) on Linux and Windows, in each case looked for just after gcc (g++). Signed-off-by: Mats Wichmann <mats@linux.com>
* | Fix initialization of compilation_db emittersMats Wichmann2024-09-161-6/+11
|/ | | | Signed-off-by: Mats Wichmann <mats@linux.com>