Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Fix the second Value() example in the manpage, which never ran its
builder: it wrapped the Value Nodes in another Value() and nothing
depended on the target. Fixes #4499.
- Fix four documentation examples that were not valid Python: a stray
parenthesis in the Command() example, an unterminated string in the
MSVC_VERSION example, a missing comma that joined the two
X_RPM_EXTRADEFS strings into one, and the user guide's Progress()
callable, which lacked a colon and a "global count".

From Mats Wichmann:
- Add more unit tests for UNC path handling. These tests expose some
Expand Down
9 changes: 7 additions & 2 deletions RELEASE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,20 @@ DOCUMENTATION

- Fixed the second Value() example in the manpage, which did not work.

* Added scons-ai.md, a condensed version of the manpage intended for
- Added scons-ai.md, a condensed version of the manpage intended for
consumption by AI tools, built into build/doc/MD. It keeps every documented
option, tool, builder, function and construction variable together with its
description, but omits markup, cross-references, examples and version-history
notes, making it roughly half the size of scons.1 as measured in tokens. It is
generated from the checked-in documentation sources by bin/scons-man-to-ai.py,
and can be built with the "ai-manpage" target.

* Improve the wording for the Help() function (manpage and User Guide)
- Fix four documentation examples that were not valid Python: a stray
parenthesis in the Command() example, an unterminated string in the
MSVC_VERSION example, a missing comma that joined the two
X_RPM_EXTRADEFS strings into one, and the user guide's Progress()
callable, which lacked a colon and a "global count".
- Improve the wording for the Help() function (manpage and User Guide)

DEVELOPMENT
-----------
Expand Down
2 changes: 1 addition & 1 deletion SCons/Environment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@ Examples:
env.Command('ddd.list', Dir('ddd'), 'ls -l $SOURCE > $TARGET')

env['DISTDIR'] = 'destination/directory'
env.Command(env.Dir('$DISTDIR')), None, make_distdir)
env.Command(env.Dir('$DISTDIR'), None, make_distdir)
</example_commands>

<para>
Expand Down
2 changes: 1 addition & 1 deletion SCons/Tool/msvc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ env = Environment(MSVC_VERSION='14.2')

# Initialization deferred with empty tools, triggered manually
env = Environment(tools=[])
env['MSVC_VERSION'] = '14.2
env['MSVC_VERSION'] = '14.2'
env.Tool('msvc')
env.Tool('mslink')
env.Tool('msvs')
Expand Down
2 changes: 1 addition & 1 deletion SCons/Tool/packaging/packaging.xml
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ env.Package(
NAME="foo",
...
X_RPM_EXTRADEFS=[
"%define _unpackaged_files_terminate_build 0"
"%define _unpackaged_files_terminate_build 0",
"%define _missing_doc_files_terminate_build 0"
],
...
Expand Down
3 changes: 2 additions & 1 deletion doc/user/output.xml
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,8 @@ Program('f2.c')
<file name="SConstruct" printme="1">
screen = open('/dev/tty', 'w')
count = 0
def progress_function(node)
def progress_function(node):
global count
count += 1
screen.write('Node %4d: %s\r' % (count, node))

Expand Down
Loading