diff options
| author | Jose <jose@zeroc.com> | 2014-11-28 10:11:46 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-28 10:11:46 +0100 |
| commit | 444d76d72e303bf982f0f4e6f63aafc0ebac2beb (patch) | |
| tree | ef14ca3d423c29e46cba963c67f00525074c9af1 /demoscript | |
| parent | missing LDEXEFLAGS (diff) | |
| download | ice-444d76d72e303bf982f0f4e6f63aafc0ebac2beb.tar.bz2 ice-444d76d72e303bf982f0f4e6f63aafc0ebac2beb.tar.xz ice-444d76d72e303bf982f0f4e6f63aafc0ebac2beb.zip | |
Demoscript fixes, add ThirdParty bin to path when required
Diffstat (limited to 'demoscript')
| -rw-r--r-- | demoscript/Util.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 0c8beeb7638..4cc586e9823 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -292,7 +292,16 @@ def configurePaths(): binDir = os.path.join(binDir, "sparcv9") else: binDir = os.path.join(binDir, "amd64") - + else: + # + # Add third party home to PATH, to use db_xx tools + if isWin32(): + addenv("PATH", os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "bin")) + if getCppCompiler() == "VC110": + addenv("PATH", os.path.join(getThirdpartyHome(), "bin\\vc110\\x64" if x64 else "bin\\vc110")) + elif isDarwin(): + addenv("PATH", os.path.join(getThirdpartyHome(), "bin")) + if binDir != os.path.join(getIceDir("cpp"), "bin"): addenv("PATH", binDir) @@ -773,7 +782,6 @@ def cleanDbDir(path): def getJavaLibraryPath(): if isWin32(): if iceHome: - print return "-Djava.library.path=\"%s\" " % os.path.join(iceHome, "bin\\x64" if x64 else "bin") else: return "-Djava.library.path=\"%s\" " % os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "bin") |