diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-01-22 16:47:38 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-01-22 16:47:38 -0330 |
| commit | 51f7d974b85e827ee891fbe76876e7d0e7e021a2 (patch) | |
| tree | 24da34026edfd2d7371ecf4426dd824b71e31e88 /py/demo/Ice/bidir/Server.py | |
| parent | Updated mcpp instructions (diff) | |
| download | ice-51f7d974b85e827ee891fbe76876e7d0e7e021a2.tar.bz2 ice-51f7d974b85e827ee891fbe76876e7d0e7e021a2.tar.xz ice-51f7d974b85e827ee891fbe76876e7d0e7e021a2.zip | |
Change python tests to detect slice dir in repository
Diffstat (limited to 'py/demo/Ice/bidir/Server.py')
| -rw-r--r-- | py/demo/Ice/bidir/Server.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/py/demo/Ice/bidir/Server.py b/py/demo/Ice/bidir/Server.py index f14fc59b155..608cd6e8fe1 100644 --- a/py/demo/Ice/bidir/Server.py +++ b/py/demo/Ice/bidir/Server.py @@ -10,18 +10,21 @@ import os, sys, traceback, threading, Ice -slice_dir = os.getenv('ICEPY_HOME', '') -if len(slice_dir) == 0 or not os.path.exists(os.path.join(slice_dir, 'slice')): - slice_dir = os.getenv('ICE_HOME', '') -if len(slice_dir) == 0 or not os.path.exists(os.path.join(slice_dir, 'slice')): - slice_dir = os.path.join('/', 'usr', 'share', 'Ice-3.3.0') -if not os.path.exists(os.path.join(slice_dir, 'slice')): - slice_dir = os.path.join('/', 'opt', 'Ice-3.3.0') -if not os.path.exists(os.path.join(slice_dir, 'slice')): - print sys.argv[0] + ': Slice directory not found. Define ICEPY_HOME or ICE_HOME.' - sys.exit(1) - -Ice.loadSlice('-I' + slice_dir + '/slice Callback.ice') +slice_dir = os.path.normpath("../../../../slice") +if not os.path.exists(slice_dir): + home_dir = os.getenv('ICEPY_HOME', '') + if len(home_dir) == 0 or not os.path.exists(os.path.join(home_dir, 'slice')): + 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.3.0') + if not os.path.exists(os.path.join(home_dir, 'slice')): + home_dir = os.path.join('/', 'opt', 'Ice-3.3.0') + if not os.path.exists(os.path.join(home_dir, 'slice')): + print sys.argv[0] + ': Slice directory not found. Define ICEPY_HOME or ICE_HOME.' + sys.exit(1) + slice_dir = os.path.join(home_dir, "slice") + +Ice.loadSlice('-I' + slice_dir + ' Callback.ice') import Demo class CallbackSenderI(Demo.CallbackSender, threading.Thread): |