summaryrefslogtreecommitdiff
path: root/demoscript/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-12-04 16:14:52 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-12-04 16:14:52 +0100
commitb86dc1d22719bbb3ce883faf6e313bf21692bfd7 (patch)
tree7c9898a46f87abb6efeb937c443ae17200c4f7a6 /demoscript/Util.py
parentFixes to allow compiling mappings using translators from binary distribution (diff)
downloadice-b86dc1d22719bbb3ce883faf6e313bf21692bfd7.tar.bz2
ice-b86dc1d22719bbb3ce883faf6e313bf21692bfd7.tar.xz
ice-b86dc1d22719bbb3ce883faf6e313bf21692bfd7.zip
Fixed issue from previous commit, removed all references to getIceVersion
Diffstat (limited to 'demoscript/Util.py')
-rw-r--r--demoscript/Util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py
index a2075526674..ec733e112e9 100644
--- a/demoscript/Util.py
+++ b/demoscript/Util.py
@@ -631,7 +631,7 @@ def getServiceDir():
if iceHome:
serviceDir = os.path.join(iceHome, "bin")
else:
- serviceDir = "C:\\Progra~1\ZeroC\Ice-" + str(getIceVersion()) + "\\bin"
+ serviceDir = "C:\\Progra~1\ZeroC\Ice-" + iceVersion + "\\bin"
return serviceDir
def getIceBox(mapping = "cpp"):
@@ -774,7 +774,7 @@ def addLdPath(libpath):
addenv("LD_LIBRARY_PATH", libpath)
def getIceBoxClassPath():
- jarSuffix = "-" + getIceVersion() + ".jar"
+ jarSuffix = "-" + iceVersion + ".jar"
javaDir = getIceDir("java")
s = ""
for jar in ["ice", "icebox"]: