diff options
| author | Jose <jose@zeroc.com> | 2015-03-05 11:29:47 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-03-05 11:29:47 +0100 |
| commit | bdba1b684ef18ea6137bb91f3257b278e72ba23b (patch) | |
| tree | 451707c73404525dff969503981b0fa76655da0e /scripts/TestUtil.py | |
| parent | Slice/errorDetection fixes (diff) | |
| download | ice-bdba1b684ef18ea6137bb91f3257b278e72ba23b.tar.bz2 ice-bdba1b684ef18ea6137bb91f3257b278e72ba23b.tar.xz ice-bdba1b684ef18ea6137bb91f3257b278e72ba23b.zip | |
Mingw/Ruby build updates
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 434780bddfc..5414852388b 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1696,6 +1696,8 @@ def createConfig(path, lines, enc=None): def getCppBinDir(lang = None): binDir = os.path.join(getIceDir("cpp"), "bin") + if isMINGW() and x64: + binDir = os.path.join(binDir, "x64") if iceHome: if lang == None: lang = getDefaultMapping() @@ -1713,7 +1715,10 @@ def getCppBinDir(lang = None): return binDir def getSliceTranslator(lang = "cpp"): - return os.path.join((iceHome if iceHome else getIceDir("cpp")) , "bin", "slice2%s" % lang) + if iceHome: + return os.path.join(iceHome, "bin", "slice2%s" % lang) + else: + return os.path.join(getCppBinDir(), ("slice2%s" % lang)) def getCppLibDir(lang = None): if isWin32(): |