Mercurial > hg > truffle
diff mx/mx_graal.py @ 21718:b5bbf03bc17a
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 |
line wrap: on
line diff
--- a/mx/mx_graal.py Wed Jun 03 20:24:04 2015 +0200 +++ b/mx/mx_graal.py Thu Jun 04 03:21:58 2015 +0200 @@ -579,8 +579,10 @@ if os.path.isfile(jar): with zipfile.ZipFile(jar) as zf: for member in zf.namelist(): - if member.startswith('META-INF/services'): + if member.startswith('META-INF/services') and member: serviceName = basename(member) + if serviceName == "": + continue # Zip files may contain empty entries for directories (jar -cf ... creates such) # we don't handle directories assert serviceName and member == 'META-INF/services/' + serviceName with zf.open(member) as serviceFile: @@ -591,6 +593,8 @@ serviceImpls.append(line) elif member.startswith('META-INF/options'): filename = basename(member) + if filename == "": + continue # Zip files may contain empty entries for directories (jar -cf ... creates such) # we don't handle directories assert filename and member == 'META-INF/options/' + filename targetpath = join(optionsDir, filename)