diff options
| author | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
| commit | 2380e089401d048490da23bc6d71e5687bafbe47 (patch) | |
| tree | 6d97052d1f93bc2bafcd7fd1a9ebe103544b6cad /cpp/demo/IceGrid/icebox/expect.py | |
| parent | Fixed permissions (diff) | |
| parent | 3.3.1 third-party updates (diff) | |
| download | ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.bz2 ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.xz ice-2380e089401d048490da23bc6d71e5687bafbe47.zip | |
Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch
Conflicts:
java/resources/IceGridAdmin/icegridadmin_content_dyn.html
java/resources/IceGridAdmin/icegridadmin_content_static.html
Diffstat (limited to 'cpp/demo/IceGrid/icebox/expect.py')
| -rwxr-xr-x | cpp/demo/IceGrid/icebox/expect.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/demo/IceGrid/icebox/expect.py b/cpp/demo/IceGrid/icebox/expect.py index 9cfbc351353..1fd646b714a 100755 --- a/cpp/demo/IceGrid/icebox/expect.py +++ b/cpp/demo/IceGrid/icebox/expect.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. @@ -23,7 +23,7 @@ from demoscript import * from demoscript.IceGrid import icebox desc = 'application.xml' -if Util.getBuild() == 'debug': +if Util.isDebugBuild(): fi = open(desc, "r") desc = 'tmp_application.xml' fo = open(desc, "w") @@ -34,7 +34,6 @@ if Util.getBuild() == 'debug': fi.close() fo.close() -directory = os.path.dirname(os.path.abspath(__file__)) -Util.addLdPath(directory) +Util.addLdPath(os.getcwd()) icebox.run('./client', desc[0:len(desc)-4]) |