diff options
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index bc5418248b7..c6151083974 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -33,6 +33,7 @@ from scripts import Expect keepGoing = False iceHome = None x64 = False +java2 = False preferIPv4 = False demoErrors = [] @@ -82,7 +83,10 @@ def configurePaths(): # if iceHome == "/usr": javaDir = os.path.join("/", "usr", "share", "java") - addenv("CLASSPATH", os.path.join(javaDir, "Ice.jar")) + if java2: + addenv("CLASSPATH", os.path.join(javaDir, "Ice-java2.jar")) + else: + addenv("CLASSPATH", os.path.join(javaDir, "Ice.jar")) addenv("CLASSPATH", "classes") return # That's it, we're done! @@ -332,7 +336,7 @@ def run(demos, root = False): try: opts, args = getopt.getopt(sys.argv[1:], "lr:R:", [ "filter=", "rfilter=", "start=", "loop", "fast", "trace=", "debug", "host=", "mode=", - "continue", "ice-home=", "x64", "preferIPv4", "env", "noenv", "script"]) + "continue", "ice-home=", "x64", "java2", "preferIPv4", "env", "noenv", "script"]) except getopt.GetoptError: usage() @@ -522,7 +526,7 @@ def processCmdLine(): print "usage: " + sys.argv[0] + " --x64 --preferIPv4 --env --noenv --fast --trace=output --debug --host host --mode=[debug|release] --ice-home=<dir>" sys.exit(2) try: - opts, args = getopt.getopt(sys.argv[1:], "", ["env", "noenv", "x64", "preferIPv4", "fast", "trace=", "debug", "host=", "mode=", "ice-home="]) + opts, args = getopt.getopt(sys.argv[1:], "", ["env", "noenv", "x64", "java2", "preferIPv4", "fast", "trace=", "debug", "host=", "mode=", "ice-home="]) except getopt.GetoptError: usage() @@ -531,6 +535,7 @@ def processCmdLine(): global tracefile global buildmode global x64 + global java2 global preferIPv4 global debug global host @@ -540,6 +545,7 @@ def processCmdLine(): trace = False buildmode = None x64 = False + java2 = False tracefile = None env = False noenv = False @@ -562,6 +568,8 @@ def processCmdLine(): fast = True if o == "--x64": x64 = True + if o == "--java2": + java2 = True if o == "--preferIPv4": preferIPv4 = True if o == "--ice-home": |