Mercurial > hg > truffle

comparison mx/mx_graal.py @ 21718:b5bbf03bc17a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve makefile generator, exporting files into shared dir (JBS:GRAAL-52)
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Thu, 04 Jun 2015 03:21:58 +0200
parents 6df25b1418be
children d915361cc3a1
comparison
equal deleted inserted replaced
21717:a3315bce5192 21718:b5bbf03bc17a
577 optionsFiles = [] 577 optionsFiles = []
578 for jar in jvmciJars: 578 for jar in jvmciJars:
579 if os.path.isfile(jar): 579 if os.path.isfile(jar):
580 with zipfile.ZipFile(jar) as zf: 580 with zipfile.ZipFile(jar) as zf:
581 for member in zf.namelist(): 581 for member in zf.namelist():
582 if member.startswith('META-INF/services'): 582 if member.startswith('META-INF/services') and member:
583 serviceName = basename(member) 583 serviceName = basename(member)
584 if serviceName == "":
585 continue # Zip files may contain empty entries for directories (jar -cf ... creates such)
584 # we don't handle directories 586 # we don't handle directories
585 assert serviceName and member == 'META-INF/services/' + serviceName 587 assert serviceName and member == 'META-INF/services/' + serviceName
586 with zf.open(member) as serviceFile: 588 with zf.open(member) as serviceFile:
587 serviceImpls = servicesMap.setdefault(serviceName, []) 589 serviceImpls = servicesMap.setdefault(serviceName, [])
588 for line in serviceFile.readlines(): 590 for line in serviceFile.readlines():
589 line = line.strip() 591 line = line.strip()
590 if line: 592 if line:
591 serviceImpls.append(line) 593 serviceImpls.append(line)
592 elif member.startswith('META-INF/options'): 594 elif member.startswith('META-INF/options'):
593 filename = basename(member) 595 filename = basename(member)
596 if filename == "":
597 continue # Zip files may contain empty entries for directories (jar -cf ... creates such)
594 # we don't handle directories 598 # we don't handle directories
595 assert filename and member == 'META-INF/options/' + filename 599 assert filename and member == 'META-INF/options/' + filename
596 targetpath = join(optionsDir, filename) 600 targetpath = join(optionsDir, filename)
597 optionsFiles.append(filename) 601 optionsFiles.append(filename)
598 with zf.open(member) as optionsFile, \ 602 with zf.open(member) as optionsFile, \