anonfunc/mumo3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try updating mbf2man to work with ice 3.2

Browse Source
This commit is contained in:
Stefan Hacker
2010-12-27 17:03:42 +01:00
parent 793fb121fe
commit 6cb5bfd2b7
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/mbf2man.py
View File

@@ -64,9 +64,12 @@ if __name__ == "__main__":
help = 'Treename', default = 'BF2') help = 'Treename', default = 'BF2')
parser.add_option('-o', '--out', default = 'bf2.ini', parser.add_option('-o', '--out', default = 'bf2.ini',
help = 'File to output configuration to') help = 'File to output configuration to')
parser.add_option('-d', '--slidedir',
help = 'System slice directory used when getSliceDir is not available', default = '/usr/share/slice')
(option, args) = parser.parse_args() (option, args) = parser.parse_args()
host = option.target host = option.target
slicedir = option.slicedir
try: try:
port = int(option.port) port = int(option.port)
except ValueError: except ValueError:
@@ -101,15 +104,24 @@ if __name__ == "__main__":
prx = ice.stringToProxy(prxstr) prx = ice.stringToProxy(prxstr)
print "Done" print "Done"
def lslice(slf):
if not hasattr(Ice, "getSliceDir"):
Ice.loadSlice('-I%s %s' % (slicedir, slf))
else:
Ice.loadSlice('', ['-I' + Ice.getSliceDir(), slf])
try: try:
print "Trying to retrieve slice dynamically from server...", print "Trying to retrieve slice dynamically from server...",
slice = IcePy.Operation('getSlice', Ice.OperationMode.Idempotent, Ice.OperationMode.Idempotent, True, (), (), (), IcePy._t_string, ()).invoke(prx, ((), None)) op = IcePy.Operation('getSlice', Ice.OperationMode.Idempotent, Ice.OperationMode.Idempotent, True, (), (), (), IcePy._t_string, ())
if hasattr(Ice, "getSliceDir"):
slice = op.invoke(prx, ((), None))
else:
slice = op.invoke(prx, (), None)
(dynslicefiledesc, dynslicefilepath) = tempfile.mkstemp(suffix = '.ice') (dynslicefiledesc, dynslicefilepath) = tempfile.mkstemp(suffix = '.ice')
dynslicefile = os.fdopen(dynslicefiledesc, 'w') dynslicefile = os.fdopen(dynslicefiledesc, 'w')
dynslicefile.write(slice) dynslicefile.write(slice)
dynslicefile.flush() dynslicefile.flush()
Ice.loadSlice('', ['-I' + Ice.getSliceDir(), dynslicefilepath]) lslice(dynslicefilepath)
dynslicefile.close() dynslicefile.close()
os.remove(dynslicefilepath) os.remove(dynslicefilepath)
print "Success" print "Success"
@@ -118,7 +130,7 @@ if __name__ == "__main__":
print str(e) print str(e)
slicefile = option.ice slicefile = option.ice
print "Load slice (%s)..." % slicefile, print "Load slice (%s)..." % slicefile,
Ice.loadSlice('', ['-I' + Ice.getSliceDir(), slicefile]) lslice(slicefile)
print "Done" print "Done"
print "Import dynamically compiled murmur class...", print "Import dynamically compiled murmur class...",