diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-03-12 20:37:19 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-03-12 20:37:19 -0700 |
| commit | aba437bf7457b1953462154ea37e206a9e9d767b (patch) | |
| tree | 24e6ac79b33e8e61cc587d8d665306c03c8d80c8 /py/demo/Ice/bidir/Server.py | |
| parent | Fixed build against binary distribution (diff) | |
| download | ice-aba437bf7457b1953462154ea37e206a9e9d767b.tar.bz2 ice-aba437bf7457b1953462154ea37e206a9e9d767b.tar.xz ice-aba437bf7457b1953462154ea37e206a9e9d767b.zip | |
Python ICE_HOME fixes, incl. bug 2750
Diffstat (limited to 'py/demo/Ice/bidir/Server.py')
| -rw-r--r-- | py/demo/Ice/bidir/Server.py | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py index d80e2131abf..9b5c3db5ffe 100644 --- a/py/demo/Ice/bidir/Server.py +++ b/py/demo/Ice/bidir/Server.py @@ -10,17 +10,10 @@ import os, sys, traceback, threading, Ice -slice_dir = os.path.normpath("../../../../slice") -if not os.path.exists(slice_dir): - home_dir = os.getenv('ICE_HOME', '') - if len(home_dir) == 0 or not os.path.exists(os.path.join(home_dir, 'slice')): - home_dir = os.path.join('/', 'usr', 'share', 'Ice-3.3b') - if not os.path.exists(os.path.join(home_dir, 'slice')): - home_dir = os.path.join('/', 'opt', 'Ice-3.3b') - if not os.path.exists(os.path.join(home_dir, 'slice')): - print sys.argv[0] + ': Slice directory not found. Define ICE_HOME.' - sys.exit(1) - slice_dir = os.path.join(home_dir, "slice") +slice_dir = Ice.getSliceDir() +if not slice_dir: + print sys.argv[0] + ': Slice directory not found. Define ICE_HOME.' + sys.exit(1) Ice.loadSlice('-I' + slice_dir + ' Callback.ice') import Demo |