truffle: mxtool/mx.py comparison

comparison mxtool/mx.py @ 14964:e1ce6c66f56e

refactored archive command to use "with" statement

author	Doug Simon <doug.simon@oracle.com>
date	Thu, 03 Apr 2014 20:53:52 +0200
parents	82971f397b94
children	858d2b91c1f8

comparison

equal deleted inserted replaced

-:0c2e34446bd7
+:e1ce6c66f56e
 class Distribution:
 def __init__(self, suite, name, path, sourcesPath, deps, excludedLibs):
 self.suite = suite
 self.name = name
 self.path = path.replace('/', os.sep)
-self.sourcesPath = sourcesPath.replace('/', os.sep) if sourcesPath else None
+self.path = _make_absolute(self.path, suite.dir)
-if not isabs(self.path):
+self.sourcesPath = _make_absolute(sourcesPath.replace('/', os.sep), suite.dir) if sourcesPath else None
-self.path = join(suite.dir, self.path)
 self.deps = deps
 self.update_listeners = set()
 self.excludedLibs = excludedLibs
 def sorted_deps(self, includeLibs=False):
 with open(currentApsFile, 'w') as fp:
 for ap in aps:
 print >> fp, ap
 return outOfDate
+def _make_absolute(path, prefix):
+"""
+Makes 'path' absolute if it isn't already by prefixing 'prefix'
+"""
+if not isabs(path):
+return join(prefix, path)
+return path
 def _download_file_with_sha1(name, path, urls, sha1, sha1path, resolve, mustExist, sources=False):
 def _download_lib():
 print 'Downloading ' + ("Sources " if sources else "") + name + ' from ' + str(urls)
 download(path, urls)
 return result
 return not result
 def get_path(self, resolve):
-path = self.path
+path = _make_absolute(self.path, self.suite.dir)
-if not isabs(path):
-path = join(self.suite.dir, path)
 sha1path = path + '.sha1'
 includedInJDK = getattr(self, 'includedInJDK', None)
 if includedInJDK and java().javaCompliance >= JavaCompliance(includedInJDK):
 return None
 return _download_file_with_sha1(self.name, path, self.urls, self.sha1, sha1path, resolve, self.mustExist)
 def get_source_path(self, resolve):
-path = self.sourcePath
+if self.path is None:
-if path is None:
 return None
-if not isabs(path):
+path = _make_absolute(self.path, self.suite.dir)
-path = join(self.suite.dir, path)
 sha1path = path + '.sha1'
 return _download_file_with_sha1(self.name, path, self.sourceUrls, self.sourceSha1, sha1path, resolve, len(self.sourceUrls) != 0, sources=True)
 def append_to_classpath(self, cp, resolve):
 """create jar files for projects and distributions"""
 parser = ArgumentParser(prog='mx archive')
 parser.add_argument('names', nargs=REMAINDER, metavar='[<project>|@<distribution>]...')
 args = parser.parse_args(args)
+class Archive:
+def __init__(self, path):
+self.path = path
+def __enter__(self):
+if self.path:
+fd, tmp = tempfile.mkstemp(suffix='', prefix=basename(self.path) + '.', dir=dirname(self.path))
+self.tmpFd = fd
+self.tmpPath = tmp
+self.zf = zipfile.ZipFile(tmp, 'w')
+else:
+self.tmpFd = None
+self.tmpPath = None
+self.zf = None
+return self
+def __exit__(self, exc_type, exc_value, traceback):
+if self.zf:
+self.zf.close()
+os.close(self.tmpFd)
+# Correct the permissions on the temporary file which is created with restrictive permissions
+os.chmod(self.tmpPath, 0o666 & ~currentUmask)
+# Atomic on Unix
+shutil.move(self.tmpPath, self.path)
 archives = []
 for name in args.names:
 if name.startswith('@'):
 dname = name[1:]
 d = distribution(dname)
-fd, tmp = tempfile.mkstemp(suffix='', prefix=basename(d.path) + '.', dir=dirname(d.path))
+with Archive(d.path) as arc, Archive(d.sourcesPath) as srcArc:
-if d.sourcesPath:
+services = {}
-sourcesFd, sourcesTmp = tempfile.mkstemp(suffix='', prefix=basename(d.sourcesPath) + '.', dir=dirname(d.sourcesPath))
+def overwriteCheck(zf, arcname, source):
-else:
+if arcname in zf.namelist():
-sourcesTmp = None
+log('warning: ' + d.path + ': overwriting ' + arcname + ' [source: ' + source + ']')
-services = tempfile.mkdtemp(suffix='', prefix=basename(d.path) + '.', dir=dirname(d.path))
-def overwriteCheck(zf, arcname, source):
-if arcname in zf.namelist():
-log('warning: ' + d.path + ': overwriting ' + arcname + ' [source: ' + source + ']')
-try:
-zf = zipfile.ZipFile(tmp, 'w')
-szf = zipfile.ZipFile(sourcesTmp, 'w') if sourcesTmp else None
 for dep in d.sorted_deps(includeLibs=True):
 if dep.isLibrary():
 l = dep
 # merge library jar into distribution jar
 logv('[' + d.path + ': adding library ' + l.name + ']')
 libSourcePath = l.get_source_path(resolve=True)
 if lpath:
 with zipfile.ZipFile(lpath, 'r') as lp:
 for arcname in lp.namelist():
 if arcname.startswith('META-INF/services/') and not arcname == 'META-INF/services/':
-f = arcname[len('META-INF/services/'):].replace('/', os.sep)
+service = arcname[len('META-INF/services/'):]
-with open(join(services, f), 'a') as outfile:
+assert '/' not in service
-for line in lp.read(arcname).splitlines():
+services.setdefault(service, []).extend(lp.read(arcname).splitlines())
-outfile.write(line)
 else:
-overwriteCheck(zf, arcname, lpath + '!' + arcname)
+overwriteCheck(arc.zf, arcname, lpath + '!' + arcname)
-zf.writestr(arcname, lp.read(arcname))
+arc.zf.writestr(arcname, lp.read(arcname))
-if szf and libSourcePath:
+if srcArc.zf and libSourcePath:
 with zipfile.ZipFile(libSourcePath, 'r') as lp:
 for arcname in lp.namelist():
-overwriteCheck(szf, arcname, lpath + '!' + arcname)
+overwriteCheck(srcArc.zf, arcname, lpath + '!' + arcname)
-szf.writestr(arcname, lp.read(arcname))
+srcArc.zf.writestr(arcname, lp.read(arcname))
 else:
 p = dep
 # skip a  Java project if its Java compliance level is "higher" than the configured JDK
 jdk = java(p.javaCompliance)
 if not jdk:
 logv('[' + d.path + ': adding project ' + p.name + ']')
 outputDir = p.output_dir()
 for root, _, files in os.walk(outputDir):
 relpath = root[len(outputDir) + 1:]
 if relpath == join('META-INF', 'services'):
-for f in files:
+for service in files:
-with open(join(services, f), 'a') as outfile:
+with open(join(root, service), 'r') as fp:
-with open(join(root, f), 'r') as infile:
+services.setdefault(service, []).extend([provider.strip() for provider in fp.readlines()])
-for line in infile:
-outfile.write(line)
 elif relpath == join('META-INF', 'providers'):
-for f in files:
+for provider in files:
-with open(join(root, f), 'r') as infile:
+with open(join(root, provider), 'r') as fp:
-for line in infile:
+for service in fp:
-with open(join(services, line.strip()), 'a') as outfile:
+services.setdefault(service.strip(), []).append(provider)
-outfile.write(f + '\n')
 else:
 for f in files:
 arcname = join(relpath, f).replace(os.sep, '/')
-overwriteCheck(zf, arcname, join(root, f))
+overwriteCheck(arc.zf, arcname, join(root, f))
-zf.write(join(root, f), arcname)
+arc.zf.write(join(root, f), arcname)
-if szf:
+if srcArc.zf:
 for srcDir in p.source_dirs():
 for root, _, files in os.walk(srcDir):
 relpath = root[len(srcDir) + 1:]
 for f in files:
 if f.endswith('.java'):
 arcname = join(relpath, f).replace(os.sep, '/')
-overwriteCheck(szf, arcname, join(root, f))
+overwriteCheck(srcArc.zf, arcname, join(root, f))
-szf.write(join(root, f), arcname)
+srcArc.zf.write(join(root, f), arcname)
-for f in os.listdir(services):
+for service, providers in services.iteritems():
-arcname = join('META-INF', 'services', f).replace(os.sep, '/')
+arcname = 'META-INF/services/' + service
-zf.write(join(services, f), arcname)
+arc.zf.writestr(arcname, '\n'.join(providers))
-zf.close()
-os.close(fd)
+d.notify_updated()
-shutil.rmtree(services)
+archives.append(d.path)
-# Atomic on Unix
-shutil.move(tmp, d.path)
-# Correct the permissions on the temporary file which is created with restrictive permissions
-os.chmod(d.path, 0o666 & ~currentUmask)
-archives.append(d.path)
-if szf:
-szf.close()
-os.close(sourcesFd)
-shutil.move(sourcesTmp, d.sourcesPath)
-os.chmod(d.sourcesPath, 0o666 & ~currentUmask)
-d.notify_updated()
-finally:
-if exists(tmp):
-os.remove(tmp)
-if exists(services):
-shutil.rmtree(services)
 else:
 p = project(name)
 outputDir = p.output_dir()
-fd, tmp = tempfile.mkstemp(suffix='', prefix=p.name, dir=p.dir)
+with Archive(join(p.dir, p.name + '.jar')) as arc:
-try:
-zf = zipfile.ZipFile(tmp, 'w')
 for root, _, files in os.walk(outputDir):
 for f in files:
 relpath = root[len(outputDir) + 1:]
 arcname = join(relpath, f).replace(os.sep, '/')
-zf.write(join(root, f), arcname)
+arc.zf.write(join(root, f), arcname)
-zf.close()
+archives.append(arc.path)
-os.close(fd)
-# Atomic on Unix
-jarFile = join(p.dir, p.name + '.jar')
-shutil.move(tmp, jarFile)
-# Correct the permissions on the temporary file which is created with restrictive permissions
-os.chmod(jarFile, 0o666 & ~currentUmask)
-archives.append(jarFile)
-finally:
-if exists(tmp):
-os.remove(tmp)
 return archives
 def canonicalizeprojects(args):
 """process all project files to canonicalize the dependencies
 path = dep.path
 dep.get_path(resolve=True)
 if not path or (not exists(path) and not dep.mustExist):
 continue
-if not isabs(path):
+# Relative paths for "lib" class path entries have various semantics depending on the Eclipse
-# Relative paths for "lib" class path entries have various semantics depending on the Eclipse
+# version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
-# version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
+# safest to simply use absolute paths.
-# safest to simply use absolute paths.
+path = _make_absolute(path, p.suite.dir)
-path = join(p.suite.dir, path)
 attributes = {'exported' : 'true', 'kind' : 'lib', 'path' : path}
 sourcePath = dep.get_source_path(resolve=True)
 if sourcePath is not None:
 if dep.isLibrary():
 if not hasattr(dep, 'eclipse.container') and not hasattr(dep, 'eclipse.project'):
 if dep.mustExist:
 path = dep.get_path(resolve=True)
 if path:
-if not isabs(path):
+# Relative paths for "lib" class path entries have various semantics depending on the Eclipse
-# Relative paths for "lib" class path entries have various semantics depending on the Eclipse
+# version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
-# version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
+# safest to simply use absolute paths.
-# safest to simply use absolute paths.
+path = _make_absolute(path, p.suite.dir)
-path = join(p.suite.dir, path)
 out.element('factorypathentry', {'kind' : 'EXTJAR', 'id' : path, 'enabled' : 'true', 'runInBatchMode' : 'false'})
 files.append(path)
 else:
 out.element('factorypathentry', {'kind' : 'WKSPJAR', 'id' : '/' + dep.name + '/' + dep.name + '.jar', 'enabled' : 'true', 'runInBatchMode' : 'false'})
 out.close('factorypath')

Mercurial > hg > truffle

comparison mxtool/mx.py @ 14964:e1ce6c66f56e