diff options
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index bc5418248b7..d0352171e7d 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! @@ -306,13 +310,14 @@ def runDemos(start, args, demos, num = 0, script = False, root = False): demoErrors.append(message) -def run(demos, root = False): +def run(demos, protobufDemos = [], root = False): def usage(): print """usage: %s --start=index Start running the demos at the given demo." --loop Run the demos in a loop." --filter=<regex> Run all the demos that match the given regex." --rfilter=<regex> Run all the demos that do not match the given regex." + --protobuf Run the protobuf demos." --debug Display debugging information on each demos." --trace=<output> Run the demos with tracing enabled." --host=host Set --Ice.Default.Host=<host>." @@ -332,7 +337,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", "protobuf"]) except getopt.GetoptError: usage() @@ -376,6 +381,8 @@ def run(demos, root = False): start = int(a) elif o in '--script': script = True + elif o in '--protobuf': + demos = demos + protobufDemos for demoFilter, removeFilter in filters: if removeFilter: @@ -522,7 +529,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 +538,7 @@ def processCmdLine(): global tracefile global buildmode global x64 + global java2 global preferIPv4 global debug global host @@ -540,6 +548,7 @@ def processCmdLine(): trace = False buildmode = None x64 = False + java2 = False tracefile = None env = False noenv = False @@ -562,13 +571,15 @@ def processCmdLine(): fast = True if o == "--x64": x64 = True + if o == "--java2": + java2 = True if o == "--preferIPv4": preferIPv4 = True if o == "--ice-home": iceHome = a if o == "--mode": buildmode = a - if buildmode != 'debug' and mode != 'release': + if buildmode != 'debug' and buildmode != 'release': usage() if host != "": |