diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /scripts/IceGridAdmin.py | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'scripts/IceGridAdmin.py')
| -rw-r--r-- | scripts/IceGridAdmin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index e74c304ae6d..7d66516563c 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -71,7 +71,7 @@ def getDefaultLocatorProperty(): def startIceGridRegistry(testdir, dynamicRegistration = False): iceGrid = "" - if TestUtil.isBCC2010() or TestUtil.isVC6(): + if TestUtil.isVC6(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridregistry") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridregistry") @@ -155,7 +155,7 @@ def iceGridNodePropertiesOverride(): def startIceGridNode(testdir): iceGrid = "" - if TestUtil.isBCC2010() or TestUtil.isVC6(): + if TestUtil.isVC6(): iceGrid = os.path.join(TestUtil.getServiceDir(), "icegridnode") else: iceGrid = os.path.join(TestUtil.getCppBinDir(), "icegridnode") |