diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2014-11-06 15:21:48 -0330 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2014-11-06 15:21:48 -0330 |
commit | ecfd4cad58c101d31d95adcf24cff62e12718359 (patch) | |
tree | 655dcb5f1a387070da0e53c02656448f69b8fd78 /demoscript/Util.py | |
parent | ICE-5844 bad C# code generated for interface that inherits method with option... (diff) | |
download | ice-ecfd4cad58c101d31d95adcf24cff62e12718359.tar.bz2 ice-ecfd4cad58c101d31d95adcf24cff62e12718359.tar.xz ice-ecfd4cad58c101d31d95adcf24cff62e12718359.zip |
Freze jar was improperly named in 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 9108b90f6e6..7f3b8834632 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -72,7 +72,7 @@ else: elif os.path.exists(os.path.join(path, "nodejs")): nodeCmd = "nodejs" break - + def getNodeCommand(): return nodeCmd @@ -84,7 +84,7 @@ def getJavaVersion(): matchVersion = re.compile('java version \"(.*)\"') m = matchVersion.match(p.stdout.readline().decode('UTF-8')) return m.group(1) - + class filereader(Expect.reader): def __init__(self, desc, p): Expect.reader.__init__(self, desc, p, None) @@ -94,8 +94,8 @@ class filereader(Expect.reader): try: while True: c = self.p.read(1) - if not c: - time.sleep(0.1) + if not c: + time.sleep(0.1) continue if c == '\r': continue @@ -167,7 +167,7 @@ class FileExpect(object): self.matchindex = 0 raise e return self.matchindex - + def terminate(self): try: self.f.close() @@ -307,7 +307,7 @@ def configurePaths(): jarSuffix = "-" + getIceVersion() + ".jar" addenv("CLASSPATH", os.path.join(javaDir, "lib", "Ice" + jarSuffix)) addenv("CLASSPATH", os.path.join(javaDir, "lib", "Glacier2" + jarSuffix)) - addenv("CLASSPATH", os.path.join(javaDir, "lib", "Freeze." + jarSuffix)) + addenv("CLASSPATH", os.path.join(javaDir, "lib", "Freeze" + jarSuffix)) addenv("CLASSPATH", os.path.join(javaDir, "lib", "IceBox" + jarSuffix)) addenv("CLASSPATH", os.path.join(javaDir, "lib", "IceStorm" + jarSuffix)) addenv("CLASSPATH", os.path.join(javaDir, "lib", "IceGrid" + jarSuffix)) @@ -334,7 +334,7 @@ def configurePaths(): addenv("PYTHONPATH", os.path.join(getIceDir("py"), "python", "x64")) else: addenv("PYTHONPATH", os.path.join(getIceDir("py"), "python")) - + if isWin32() and x64: addenv("RUBYLIB", os.path.join(getIceDir("rb"), "ruby", "x64")) else: @@ -657,7 +657,7 @@ def getIceBox(mapping = "cpp"): return "iceboxd" return "icebox" elif mapping == "cs": - if isMono(): + if isMono(): # Mono cannot locate icebox in the PATH. This is wrong for a demo dist. return os.path.join(getIceDir("cs"), "bin", "iceboxnet.exe") else: |