diff options
| author | Jose <jose@zeroc.com> | 2016-10-17 21:55:26 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-10-17 21:55:26 +0200 |
| commit | 0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42 (patch) | |
| tree | 3d559919e657febbb6810f319a0baa570e82ee3c /scripts/TestUtil.py | |
| parent | Add support for JavaScript import/expor in generated code (diff) | |
| download | ice-0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42.tar.bz2 ice-0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42.tar.xz ice-0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42.zip | |
Update mcpp version for Windows
* Update windows builds to use mcpp-2.7.2.10.
* Fix Slice/unicodePath test script form Windows.
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index f36b0698c3a..32a57da6d4d 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1887,10 +1887,14 @@ def getCppBinDir(lang = None): return binDir def getSliceTranslator(lang = "cpp"): + compiler = "" if iceHome: - return os.path.join(iceHome, "bin", "slice2%s" % lang) + compiler = os.path.join(iceHome, "bin", "slice2%s" % lang) else: - return os.path.join(getCppBinDir(), ("slice2%s" % lang)) + compiler = os.path.join(getCppBinDir(), ("slice2%s" % lang)) + if isWin32(): + compiler += ".exe" + return compiler def getCppLibDir(lang = None): if isWin32(): |