diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2010-01-13 11:21:14 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2010-01-13 11:21:14 -0330 |
| commit | dc887e5335ec4634b3e13d9aaf11fa7848831313 (patch) | |
| tree | 12e18e7533c7d22047a29fadccc7de9aad77b52c /demoscript/Util.py | |
| parent | Fixed bug 4548 - disable indexing on IceGrid node directories (diff) | |
| download | ice-dc887e5335ec4634b3e13d9aaf11fa7848831313.tar.bz2 ice-dc887e5335ec4634b3e13d9aaf11fa7848831313.tar.xz ice-dc887e5335ec4634b3e13d9aaf11fa7848831313.zip | |
Do not have default setting for CPP_COMPILER in demo Make.rules.mak
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 76891cd6321..67091d45dab 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -456,7 +456,10 @@ def isDebugBuild(): return buildmode == "debug" def getIceVersion(): - config = open(os.path.join(toplevel, "config", "Make.common.rules"), "r") + if isWin32(): + config = open(os.path.join(toplevel, "config", "Make.common.rules.mak"), "r") + else: + config = open(os.path.join(toplevel, "config", "Make.common.rules"), "r") return re.search("VERSION[\t\s]*= ([0-9]+\.[0-9]+(\.[0-9]+|b[0-9]*))", config.read()).group(1) def getServiceDir(): @@ -465,7 +468,7 @@ def getServiceDir(): if iceHome: serviceDir = os.path.join(iceHome, "bin") else: - serviceDir = "C:\\Program Files\ZeroC\Ice-" + str(getIceVersion()) + "\\bin" + serviceDir = "C:\\Progra~1\ZeroC\Ice-" + str(getIceVersion()) + "\\bin" return serviceDir def getIceBox(mapping = "cpp"): |