diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-11-21 14:07:29 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-11-21 14:07:29 -0330 |
| commit | 1209bc41f291d12a3046fd305576ee28be339123 (patch) | |
| tree | bcf6c769246c852cfd708a369fd4f59cd33eceaa /demoscript/Util.py | |
| parent | Fixed IceGrid/icebox demo READMEs (diff) | |
| download | ice-1209bc41f291d12a3046fd305576ee28be339123.tar.bz2 ice-1209bc41f291d12a3046fd305576ee28be339123.tar.xz ice-1209bc41f291d12a3046fd305576ee28be339123.zip | |
Fixed setting of library.path in test and demo scripts
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 446e5c7e6a1..27fa89d9d7a 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -435,7 +435,7 @@ if os.path.isfile("/etc/issue"): def isUbuntu(): return isLinux() and linuxDistribution and linuxDistribution == "Ubuntu" - + def isRhel(): if isLinux() and linuxDistribution: for r in ["RedHat", "Amazon", "CentOS"]: @@ -807,17 +807,17 @@ def cleanDbDir(path): def getJavaLibraryPath(): if isWin32(): - if iceHome: - return "-Djava.library.path=%s " % os.path.join(iceHome, "bin\\x64" if x64 else "bin") + 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 os.path.join(getThirdpartyHome(), "bin")) + return "-Djava.library.path=\"%s\" " % os.path.join(getThirdpartyHome(), "bin\\x64" if x64 else "bin") elif isDarwin(): - return "-Djava.library.path=%s " % os.path.join(iceHome if iceHome else getThirdpartyHome(), "lib") + return "-Djava.library.path=\"%s\" " % os.path.join(iceHome if iceHome else getThirdpartyHome(), "lib") elif isRhel() or isSles(): - return "-Djava.library.path=%s " % "/usr/lib64" if x64 else "/usr/lib" + return "-Djava.library.path=\"%s\" " % "/usr/lib64" if x64 else "/usr/lib" elif isUbuntu(): - return "-Djava.library.path=%s " % "/usr/lib/x86_64-linux-gnu" if x64 else "/usr/lib/i386-linux-gnu" + return "-Djava.library.path=\"%s\" " % "/usr/lib/x86_64-linux-gnu" if x64 else "/usr/lib/i386-linux-gnu" return None def addLdPath(libpath): |