From b649dec7073d1fb1e9fd08b57f2a95288eba6965 Mon Sep 17 00:00:00 2001 From: grbd Date: Mon, 28 May 2018 02:39:14 +0100 Subject: set the pip installation directory to be non version specific --- src/setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/setup.py b/src/setup.py index 442315c..273da18 100644 --- a/src/setup.py +++ b/src/setup.py @@ -247,10 +247,12 @@ class install_lib(_install_lib): if Options.standalone_lib: # ...but they asked for a standalone directory. self.install_dir = os.path.join(prefix, "scons") - elif Options.version_lib or not Options.standard_lib: + elif Options.version_lib: # ...they asked for a version-specific directory, - # or they get it by default. self.install_dir = os.path.join(prefix, "scons-%s" % Version) + elif not Options.standard_lib: + # default. + self.install_dir = os.path.join(prefix, "scons") msg = "Installed SCons library modules into %s" % self.install_dir Installed.append(msg) -- cgit v0.12 From 1e4effee750f8a1bec2f982b1a46b9f4ab14cf04 Mon Sep 17 00:00:00 2001 From: grbd Date: Mon, 28 May 2018 02:45:35 +0100 Subject: updates Changes.txt --- src/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 0544f60..f74565a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -15,6 +15,8 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From Richard West: - Add SConstruct.py, Sconstruct.py, sconstruct.py to the search path for the root SConstruct file. Allows easier debugging within Visual Studio + - Set the default pip installation directory to be non version specific + to aid with development of external tools (such as using pytest) From Bernard Blackham: - Fixed handling of side-effects in task master (fixes #3013). -- cgit v0.12