diff options
| author | Jose <jose@zeroc.com> | 2014-12-04 16:23:28 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-04 16:23:28 +0100 |
| commit | 39126e8f5f7a54be60fedc6ac73cc1105c669e6f (patch) | |
| tree | fdd97e0eb6fdc8c9f8bf8732218a335770c3de1a /demoscript | |
| parent | Fixed issue from previous commit, removed all references to getIceVersion (diff) | |
| download | ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.tar.bz2 ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.tar.xz ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.zip | |
Fixed (ICE-6057) - VS2012: IceGrid\customLoadBalancing fails
Diffstat (limited to 'demoscript')
| -rw-r--r-- | demoscript/Util.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index ec733e112e9..25e9a9689b4 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -657,10 +657,16 @@ def getIceBoxAdmin(): return "iceboxadmin" def getIceGridRegistry(): - return "icegridregistry" + exe = "icegridregistry" + if isWin32() and isDebugBuild(): + exe += "d" + return exe def getIceGridNode(): - return "icegridnode" + exe = "icegridnode" + if isWin32() and isDebugBuild(): + exe += "d" + return exe def getIceGridAdmin(): return "icegridadmin" @@ -684,8 +690,9 @@ def spawn(command, cwd = None, mapping = None): args = '%s %s' % (args, defaultHost) # magic - knownCommands = [ "icegridnode", "icegridregistry", "icebox", "iceboxd", "icebox32", "icebox++11", "icebox32++11", - "icegridadmin", "icestormadmin", "iceboxadmin", "transformdb", "glacier2router" ] + knownCommands = [ "icegridnode", "icegridnoded", "icegridregistry", "icegridregistryd", "icebox", "iceboxd", + "icebox32", "icebox++11", "icebox32++11", "icegridadmin", "icestormadmin", "iceboxadmin", + "transformdb", "glacier2router" ] if mapping == None: if desc in knownCommands: mapping = "cpp" |