diff options
| author | Jose <jose@zeroc.com> | 2014-10-08 01:07:13 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-10-08 01:07:13 +0200 |
| commit | 3a98e0453a7d8367e478eff8c742b14835da7603 (patch) | |
| tree | bfeb6335ccc9d0b0ef99118e49812e5f7459e305 /py/allDemos.py | |
| parent | Windows thirdparty distribution updates (diff) | |
| download | ice-3a98e0453a7d8367e478eff8c742b14835da7603.tar.bz2 ice-3a98e0453a7d8367e478eff8c742b14835da7603.tar.xz ice-3a98e0453a7d8367e478eff8c742b14835da7603.zip | |
Several Windows build fixes:
ICE-3420 - Force link failure for debug/release mismatch?
Update VS add-in to not add C++ libraries
Fixed WinRT builds
Fixed Python Windows builds
Diffstat (limited to 'py/allDemos.py')
| -rwxr-xr-x | py/allDemos.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/py/allDemos.py b/py/allDemos.py index 2245e1700f5..d84ba1c5df3 100755 --- a/py/allDemos.py +++ b/py/allDemos.py @@ -36,12 +36,16 @@ demos = [ "Ice/session", "Ice/throughput", "Ice/value", - "IceStorm/clock", - "IceGrid/simple", - "Glacier2/callback", "book/printer", "book/simple_filesystem" ] +# +# In Windows service demos only run when using a bin dist, +# we don't build Ice services with VC100 +# +if not Util.isWin32() or Util.isBinDist(): + demos += ["IceStorm/clock", "IceGrid/simple", "Glacier2/callback"] + if __name__ == "__main__": Util.run(demos) |