comparison mxtool/mx.py @ 14538:5454f6bf50bf

fix for mx, did not compile on Windows
author Christian Wirth <christian.wirth@oracle.com>
date Wed, 12 Mar 2014 11:23:56 +0100
parents 38c0db058dcd
children 47b775458982
comparison
equal deleted inserted replaced
14150:38ca365c09ca 14538:5454f6bf50bf
354 def _writesha1Cached(): 354 def _writesha1Cached():
355 with open(sha1path, 'w') as f: 355 with open(sha1path, 'w') as f:
356 f.write(_sha1OfFile()) 356 f.write(_sha1OfFile())
357 357
358 def _sha1OfFile(): 358 def _sha1OfFile():
359 with open(path, 'r') as f: 359 with open(path, 'rb') as f:
360 return hashlib.sha1(f.read()).hexdigest() 360 return hashlib.sha1(f.read()).hexdigest()
361 361
362 362
363 if resolve and mustExist and not exists(path): 363 if resolve and mustExist and not exists(path):
364 assert not len(urls) == 0, 'cannot find required library ' + name + ' ' + path 364 assert not len(urls) == 0, 'cannot find required library ' + name + ' ' + path
1091 return _java 1091 return _java
1092 1092
1093 def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, addDefaultArgs=True): 1093 def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, addDefaultArgs=True):
1094 return run(java().format_cmd(args, addDefaultArgs), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd) 1094 return run(java().format_cmd(args, addDefaultArgs), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
1095 1095
1096 def _kill_process_group(pid, sig=signal.SIGKILL): 1096 def _kill_process_group(pid, sig=None):
1097 if not sig:
1098 sig = signal.SIGKILL
1097 pgid = os.getpgid(pid) 1099 pgid = os.getpgid(pid)
1098 try: 1100 try:
1099 os.killpg(pgid, sig) 1101 os.killpg(pgid, sig)
1100 return True 1102 return True
1101 except: 1103 except:
4086 abort(1) 4088 abort(1)
4087 signal.signal(signal.SIGTERM, term_handler) 4089 signal.signal(signal.SIGTERM, term_handler)
4088 4090
4089 def quit_handler(signum, frame): 4091 def quit_handler(signum, frame):
4090 _send_sigquit() 4092 _send_sigquit()
4091 signal.signal(signal.SIGQUIT, quit_handler) 4093 if get_os() != 'windows':
4094 signal.signal(signal.SIGQUIT, quit_handler)
4092 4095
4093 try: 4096 try:
4094 if opts.timeout != 0: 4097 if opts.timeout != 0:
4095 def alarm_handler(signum, frame): 4098 def alarm_handler(signum, frame):
4096 abort('Command timed out after ' + str(opts.timeout) + ' seconds: ' + ' '.join(commandAndArgs)) 4099 abort('Command timed out after ' + str(opts.timeout) + ' seconds: ' + ' '.join(commandAndArgs))