diff options
| author | Jose <jose@zeroc.com> | 2016-05-05 21:07:19 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-05 21:07:19 +0200 |
| commit | a6369e92aa8c9ee28fea1e6f7135c1db11cfa045 (patch) | |
| tree | 585f5d201203628f6b4766941abb086c11c9b4ac /scripts/TestUtil.py | |
| parent | Do not build iceboxadmin with C++11 (diff) | |
| download | ice-a6369e92aa8c9ee28fea1e6f7135c1db11cfa045.tar.bz2 ice-a6369e92aa8c9ee28fea1e6f7135c1db11cfa045.tar.xz ice-a6369e92aa8c9ee28fea1e6f7135c1db11cfa045.zip | |
Windows msbuild build updates
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 ad7533add6d..982c3221521 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -390,8 +390,12 @@ else: # iceVersion = None try: - config = open(os.path.join(toplevel, "config", "Make.rules"), "r") - iceVersion = re.search("version[\t\s]*= ([0-9]+\.[0-9]+(\.[0-9]+|[ab][0-9]*))", config.read()).group(1) + if isWin32(): + config = open(os.path.join(toplevel, "config", "Ice.props"), "r") + iceVersion = re.search("<IceVersion>[\t\s]*([0-9]+\.[0-9]+(\.[0-9]+|[ab][0-9]*))</IceVersion>", config.read()).group(1) + else: + config = open(os.path.join(toplevel, "config", "Make.rules"), "r") + iceVersion = re.search("version[\t\s]*= ([0-9]+\.[0-9]+(\.[0-9]+|[ab][0-9]*))", config.read()).group(1) config.close() except: print("error: couldn't figure Ice version") |