diff options
| author | Jose <jose@zeroc.com> | 2016-12-05 21:06:28 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-12-05 21:06:28 +0100 |
| commit | 3717320b72fbe91bc80b86f0795672b29168614e (patch) | |
| tree | 7cee17ee51fdcb6d318f68d10cbbeef69fd9f621 /scripts/Util.py | |
| parent | Fixed bug where --all-cross didn't run all cross tests (diff) | |
| download | ice-3717320b72fbe91bc80b86f0795672b29168614e.tar.bz2 ice-3717320b72fbe91bc80b86f0795672b29168614e.tar.xz ice-3717320b72fbe91bc80b86f0795672b29168614e.zip | |
Fixed Windows PYTONPATH setting
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index fcb628f4e42..34390c7030f 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1956,11 +1956,18 @@ class PythonMapping(CppBasedMapping): return sys.executable + " " + exe def getEnv(self, process, current): + c = current.config env = CppBasedMapping.getEnv(self, process, current) if current.driver.getIceDir(self) != platform.getIceDir(self): # If not installed in the default platform installation directory, add # the Ice python directory to PYTHONPATH - env["PYTHONPATH"] = os.path.join(current.driver.getIceDir(self), "python") + + pythondirs = [] + if isinstance(platform, Windows): + pythondirs.append(os.path.join(current.driver.getIceDir(self), "python", c.buildPlatform, c.buildConfig)) + pythondirs.append(os.path.join(current.driver.getIceDir(self), "python")) + + env["PYTHONPATH"] = os.pathsep.join(pythondirs) return env def getDefaultExe(self, processType, config): |