From e3a4ea4876d55d22a5a6f5e1f702e6dae11ee147 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Mon, 14 Jan 2019 09:51:34 -0700 Subject: scons-local version has symlink problems Earlier fix to running with scons-local when the directory is a symlink (i.e. scons-local symlinked to scons-local-{versiontag} and invoked as scons-local/scons.py) broke running scons when the "executable" is a symlink. Restoring that behavior. This is dodgy to test reliably on a developer system, as the fallback mechansim to find a usable scons goes on to look for a system-installed scons, so it looked like it was working. I will add a test if I can figure out a good way. Signed-off-by: Mats Wichmann --- src/CHANGES.txt | 3 +++ src/script/scons.py | 2 +- src/script/sconsign.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 840359c..7d07811 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -16,6 +16,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER product from the default Visual Studio - Add TEMPFILESUFFIX to allow a customizable filename extension, as described in the patch attached to issue #2431. + - scons.py and sconsign.py stopped working if script called as a symlink + to location in scons-local location. From Daniel Moody: - Improved support for VC14.1 and Visual Studio 2017, as well as arm and arm64 targets. @@ -25,6 +27,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Enhance cpp scanner regex logic to detect if/elif expressions without whitespaces but parenthesis like "#if(defined FOO)" or "#elif!(BAR)" correctly. + RELEASE 3.0.3 - Mon, 07 Jan 2019 20:05:22 -0400 NOTE: 3.0.2 release was dropped because there was a packaging bug. Please consider all 3.0.2 content. diff --git a/src/script/scons.py b/src/script/scons.py index d22e76b..351fb9f 100755 --- a/src/script/scons.py +++ b/src/script/scons.py @@ -68,7 +68,7 @@ Python 2.7 or >= 3.5 is required.\n" # Strip the script directory from sys.path so on case-insensitive # (WIN32) systems Python doesn't think that the "scons" script is the # "SCons" package. -script_dir = os.path.dirname(__file__) +script_dir = os.path.dirname(os.path.realpath(__file__)) script_path = os.path.realpath(os.path.dirname(__file__)) if script_path in sys.path: sys.path.remove(script_path) diff --git a/src/script/sconsign.py b/src/script/sconsign.py index 6241ae2..d15cff1 100644 --- a/src/script/sconsign.py +++ b/src/script/sconsign.py @@ -59,7 +59,7 @@ Python 2.7 or >= 3.5 is required.\n" # Strip the script directory from sys.path so on case-insensitive # (WIN32) systems Python doesn't think that the "scons" script is the # "SCons" package. -script_dir = os.path.dirname(__file__) +script_dir = os.path.dirname(os.path.realpath(__file__)) script_path = os.path.realpath(os.path.dirname(__file__)) if script_path in sys.path: sys.path.remove(script_path) -- cgit v0.12 From 74187aaa981052573d5c9bd166fdde92194d1edb Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Tue, 15 Jan 2019 11:04:54 -0700 Subject: Update changelog entry for scons-local symlink fix Signed-off-by: Mats Wichmann --- src/CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7d07811..4f61881 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -18,6 +18,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER described in the patch attached to issue #2431. - scons.py and sconsign.py stopped working if script called as a symlink to location in scons-local location. + - Fix issue running scons using a symlink to scons.py in an scons-local dir From Daniel Moody: - Improved support for VC14.1 and Visual Studio 2017, as well as arm and arm64 targets. -- cgit v0.12