summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2021-11-26 19:51:11 (GMT)
committerMats Wichmann <mats@linux.com>2021-11-26 19:51:11 (GMT)
commit9ca9d4480892c45827b5719163675eb7bde1e071 (patch)
tree9fe7561464ea0cb793c4b25739073f55cabaf996
parent10e76cd4a9d25f58886d5d22575ab742158ed899 (diff)
downloadSCons-9ca9d4480892c45827b5719163675eb7bde1e071.zip
SCons-9ca9d4480892c45827b5719163675eb7bde1e071.tar.gz
SCons-9ca9d4480892c45827b5719163675eb7bde1e071.tar.bz2
Fix test syntax error, update CHANGES/RELEASE
Signed-off-by: Mats Wichmann <mats@linux.com>
-rwxr-xr-xCHANGES.txt14
-rwxr-xr-xRELEASE.txt6
-rw-r--r--test/scons-time/run/config/python.py4
3 files changed, 17 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index f418973..2b79aec 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,12 +14,16 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Whatever John Doe did.
From Mats Wichmann:
- - Tweak definition of default site_scons paths on Windows to conform
- to conventions, drop a Py2 workaround, and pick as better "system" path
- (old one remains supported).
+ - Tweak the way default site_scons paths on Windows are expressed to
+ conform to conventions (what they actually resolve to is unchanged),
+ drop a Py2 workaround, and pick a better "system" path, old one
+ remains supported (%AllUsersProfile%\scons\site_scons vs old
+ %AllUsersProfile%\Application Data\scons\site_scons).
- Fix testsuite to work on Windows systems where there is no usable
- association for running .py files (there are five tests where we need
- to do this for internal reasons, these are skipped now).
+ association for running .py files directly. There are a few tests where
+ we need to do this for internal reasons, those are skipped in that case.
+ Bad association could mean some other tool took it over (Visual
+ Studio Code is known to do this), or no association at all.
RELEASE 4.3.0 - Tue, 16 Nov 2021 18:12:46 -0700
diff --git a/RELEASE.txt b/RELEASE.txt
index 89d634c..1ebcb3d 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -22,6 +22,12 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
- List modifications to existing features, where the previous behavior
wouldn't actually be considered a bug
+- On Windows, %AllUsersProfile%\scons\site_scons is now the default "system"
+ location for a site_scons. %AllUsersProfile%\Application Data\scons\site_scons
+ will continue to work. There does not seem to be any convention to use
+ an "Application Data" subdirectory here.
+
+
FIXES
-----
diff --git a/test/scons-time/run/config/python.py b/test/scons-time/run/config/python.py
index ebfece1..d7c13a0 100644
--- a/test/scons-time/run/config/python.py
+++ b/test/scons-time/run/config/python.py
@@ -45,8 +45,8 @@ my_python_py = test.workpath('my_python.py')
test.write(
'config',
- """\
-python = r'%(my_python_py)s'
+ f"""\
+python = f'{my_python_py}'
""",
)