From 8b484df1cf36cbf43192bc1e4669b5e3dcb591e7 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 16 Sep 2016 11:07:58 +0200 Subject: setup.py: Prefix build/install directories by virtualenv name Use testenv_name_build/testenv_name_install instead of pyside_build_install when a virtual environment exists. This makes it easier to maintain builds in varying environments in parallel for comparing things. Change-Id: I33f672a24d871ccb8c9aad1614b7b3eded33b93c Reviewed-by: Alexandru Croitor --- setup.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 637d9ca4b..0be9d1a33 100644 --- a/setup.py +++ b/setup.py @@ -280,6 +280,14 @@ if OPTION_NOEXAMPLES: if item[0].startswith('pyside2-examples'): del submodules[__version__][idx] +# Return a prefix suitable for the _install/_build directory +def prefix(): + virtualEnvName = os.environ['VIRTUAL_ENV'] + name = os.path.basename(virtualEnvName) if virtualEnvName is not None else 'pyside' + name += str(sys.version_info[0]) + if OPTION_DEBUG: + name += 'd' + return name # Initialize, pull and checkout submodules def prepareSubModules(): @@ -551,8 +559,8 @@ class pyside_build(_build): script_dir = os.getcwd() sources_dir = os.path.join(script_dir, "sources") - build_dir = os.path.join(script_dir, "pyside_build", "%s" % build_name) - install_dir = os.path.join(script_dir, "pyside_install", "%s" % build_name) + build_dir = os.path.join(script_dir, prefix() + '_build', "%s" % build_name) + install_dir = os.path.join(script_dir, prefix() + '_install', "%s" % build_name) # Try to ensure that tools built by this script (such as shiboken2) # are found before any that may already be installed on the system. -- cgit v1.2.3