graal-compiler: mxtool/mx.py comparison

comparison mxtool/mx.py @ 5853:767312416f6a

added support to mx for specifying library sources

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 18 Jul 2012 12:17:38 +0200
parents	b1dc8fbebb48
children	2c00c51357d8

comparison

equal deleted inserted replaced

-:76191410c88d
+:767312416f6a
 be downloaded and saved in the location specified by 'path'.
 optional
 If "true" then this library will be omitted from a class path
 if it doesn't exist on the file system and no URLs are specified.
+sourcePath
+The file system path for a jar file containing the library sources.
+sourceUrls
+A comma separated list of URLs from which the library source jar can
+be downloaded and saved in the location specified by 'sourcePath'.
 Project specification format:
 project@<name>@<prop>=<value>
 classes.append(pkg + '.' + basename)
 return classes
 class Library(Dependency):
-def __init__(self, suite, name, path, mustExist, urls):
+def __init__(self, suite, name, path, mustExist, urls, sourcePath, sourceUrls):
 Dependency.__init__(self, suite, name)
 self.path = path.replace('/', os.sep)
 self.urls = urls
 self.mustExist = mustExist
+self.sourcePath = sourcePath
+self.sourceUrls = sourceUrls
 def get_path(self, resolve):
 path = self.path
 if not isabs(path):
 path = join(self.suite.dir, path)
 if resolve and self.mustExist and not exists(path):
-assert not len(self.urls) == 0, 'cannot find required library  ' + self.name + " " + path;
+assert not len(self.urls) == 0, 'cannot find required library ' + self.name + ' ' + path;
 print('Downloading ' + self.name + ' from ' + str(self.urls))
 download(path, self.urls)
+return path
+def get_source_path(self, resolve):
+path = self.sourcePath
+if path is None:
+return None
+if not isabs(path):
+path = join(self.suite.dir, path)
+if resolve and len(self.sourceUrls) != 0 and not exists(path):
+print('Downloading sources for ' + self.name + ' from ' + str(self.sourceUrls))
+download(path, self.sourceUrls)
 return path
 def append_to_classpath(self, cp, resolve):
 path = self.get_path(resolve)
 if exists(path) or not resolve:
 for name, attrs in libsMap.iteritems():
 path = attrs.pop('path')
 mustExist = attrs.pop('optional', 'false') != 'true'
 urls = pop_list(attrs, 'urls')
-l = Library(self, name, path, mustExist, urls)
+sourcePath = attrs.pop('sourcePath', None)
+sourceUrls = pop_list(attrs, 'sourceUrls')
+l = Library(self, name, path, mustExist, urls, sourcePath, sourceUrls)
 l.__dict__.update(attrs)
 self.libs.append(l)
 def _load_commands(self, mxDir):
 commands = join(mxDir, 'commands.py')
 built.add(p.name)
 continue
 else:
 if not args.java:
 continue
+if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
+continue
 # skip building this Java project if its Java compliance level is "higher" than the configured JDK
 if javaCompliance < p.javaCompliance:
 log('Excluding {0} from build (Java compliance level {1} required)'.format(p.name, p.javaCompliance))
 continue
 out.element('classpathentry', {'kind' : 'src', 'path' : src})
 # Every Java program depends on the JRE
 out.element('classpathentry', {'kind' : 'con', 'path' : 'org.eclipse.jdt.launching.JRE_CONTAINER'})
+if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
+out.element('classpathentry', {'kind' : 'con', 'path' : 'org.eclipse.pde.core.requiredPlugins'})
 for dep in p.all_deps([], True):
 if dep == p:
 continue;
 if dep.isLibrary():
 out.element('classpathentry', {'combineaccessrules' : 'false', 'exported' : 'true', 'kind' : 'src', 'path' : '/' + getattr(dep, 'eclipse.project')})
 else:
 path = dep.path
 if dep.mustExist:
 dep.get_path(resolve=True)
-if isabs(path):
+if not isabs(path):
-out.element('classpathentry', {'exported' : 'true', 'kind' : 'lib', 'path' : path})
-else:
 # 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
 # safest to simply use absolute paths.
-out.element('classpathentry', {'exported' : 'true', 'kind' : 'lib', 'path' : join(suite.dir, path)})
+path = join(suite.dir, path)
+attributes = {'exported' : 'true', 'kind' : 'lib', 'path' : path}
+sourcePath = dep.get_source_path(resolve=True)
+if sourcePath is not None:
+attributes['sourcepath'] = sourcePath
+out.element('classpathentry', attributes)
 else:
 out.element('classpathentry', {'combineaccessrules' : 'false', 'exported' : 'true', 'kind' : 'src', 'path' : '/' + dep.name})
 out.element('classpathentry', {'kind' : 'output', 'path' : getattr(p, 'eclipse.output', 'bin')})
 out.close('classpath')
 if exists(csConfig):
 out.open('buildCommand')
 out.element('name', data='net.sf.eclipsecs.core.CheckstyleBuilder')
 out.element('arguments', data='')
 out.close('buildCommand')
+if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
+for buildCommand in ['org.eclipse.pde.ManifestBuilder', 'org.eclipse.pde.SchemaBuilder']:
+out.open('buildCommand')
+out.element('name', data=buildCommand)
+out.element('arguments', data='')
+out.close('buildCommand')
 out.close('buildSpec')
 out.open('natures')
 out.element('nature', data='org.eclipse.jdt.core.javanature')
 if exists(csConfig):
 out.element('nature', data='net.sf.eclipsecs.core.CheckstyleNature')
+if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
+out.element('nature', data='org.eclipse.pde.PluginNature')
 out.close('natures')
 out.close('projectDescription')
 update_file(join(p.dir, '.project'), out.xml(indent='\t', newl='\n'))
 settingsDir = join(p.dir, ".settings")
 out.write(str(obj) + '\n')
 updated = False
 for p in projects():
 if p.native:
+continue
+if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
 continue
 if not exists(join(p.dir, 'nbproject')):
 os.makedirs(join(p.dir, 'nbproject'))

Mercurial > hg > graal-compiler

comparison mxtool/mx.py @ 5853:767312416f6a