truffle: mxtool/mx.py comparison

comparison mxtool/mx.py @ 16846:e3dd75b3c290

revived creation of annotation processor jars by 'mx ideinit'

author	Doug Simon <doug.simon@oracle.com>
date	Fri, 15 Aug 2014 13:54:37 +0200
parents	1fd7bb00a77f
children	043575a99815

comparison

equal deleted inserted replaced

-:1fd7bb00a77f
+:e3dd75b3c290
 projects = _projects_opt_limit_to_suites(projects_from_names(projectNames))
 # N.B. Limiting to a suite only affects the starting set of projects. Dependencies in other suites will still be compiled
 sortedProjects = sorted_project_deps(projects, includeAnnotationProcessors=True)
 if args.java:
-ideinit([], refreshOnly=True)
+ideinit([], refreshOnly=True, buildProcessorJars=False)
 def prepareOutputDirs(p, clean):
 outputDir = p.output_dir()
 if exists(outputDir):
 if clean:
 if not os.path.isfile(args.eclipse_exe):
 abort('File does not exist: ' + args.eclipse_exe)
 if not os.access(args.eclipse_exe, os.X_OK):
 abort('Not an executable file: ' + args.eclipse_exe)
-eclipseinit([])
+eclipseinit([], buildProcessorJars=False)
 # build list of projects to be processed
 projects = sorted_deps()
 if args.projects is not None:
 projects = [project(name) for name in args.projects.split(',')]
 if args.backup:
 zf.close()
 log('Wrote backup of {0} modified files to {1}'.format(len(modified), backup))
 return 1
 return 0
+def processorjars():
+for s in suites(True):
+_processorjars_suite(s)
+def _processorjars_suite(s):
+projs = [p for p in s.projects if p.definedAnnotationProcessors is not None]
+if len(projs) <= 0:
+return []
+pnames = [p.name for p in projs]
+build(['--jdt-warning-as-error', '--projects', ",".join(pnames)])
+return [p.definedAnnotationProcessorsDist.path for p in s.projects if p.definedAnnotationProcessorsDist is not None]
 def pylint(args):
 """run pylint (if available) over Python source files (found by 'hg locate' or by tree walk with -walk)"""
 parser = ArgumentParser(prog='mx pylint')
 eclipseLaunches = join('mx', 'eclipse-launches')
 if not exists(eclipseLaunches):
 os.makedirs(eclipseLaunches)
 return update_file(join(eclipseLaunches, name + '.launch'), launch)
-def eclipseinit(args, refreshOnly=False):
+def eclipseinit(args, buildProcessorJars=True, refreshOnly=False):
 """(re)generate Eclipse project configurations and working sets"""
 for s in suites(True):
-_eclipseinit_suite(args, s, refreshOnly)
+_eclipseinit_suite(args, s, buildProcessorJars, refreshOnly)
 generate_eclipse_workingsets()
 def _check_ide_timestamp(suite, configZip, ide):
 """return True if and only if the projects file, eclipse-settings files, and mx itself are all older than configZip"""
 out.close('factorypath')
 update_file(join(p.dir, '.factorypath'), out.xml(indent='\t', newl='\n'))
 if files:
 files.append(join(p.dir, '.factorypath'))
-def _eclipseinit_suite(args, suite, refreshOnly=False):
+def _eclipseinit_suite(args, suite, buildProcessorJars=True, refreshOnly=False):
 configZip = TimeStampFile(join(suite.mxDir, 'eclipse-config.zip'))
 configLibsZip = join(suite.mxDir, 'eclipse-config-libs.zip')
 if refreshOnly and not configZip.exists():
 return
 if _check_ide_timestamp(suite, configZip, 'eclipse'):
 logv('[Eclipse configurations are up to date - skipping]')
 return
 files = []
 libFiles = []
+if buildProcessorJars:
+files += _processorjars_suite(suite)
 for p in suite.projects:
 if p.native:
 continue
-_eclipseinit_project(p)
+_eclipseinit_project(p, files, libFiles)
 _, launchFile = make_eclipse_attach(suite, 'localhost', '8000', deps=sorted_deps(projectNames=None, includeLibs=True))
 files.append(launchFile)
-_zip_files(files, suite.dir, configZip.path)
-_zip_files(libFiles, suite.dir, configLibsZip)
 # Create an Eclipse project for each distribution that will create/update the archive
 # for the distribution whenever any (transitively) dependent project of the
 # distribution is updated.
 for dist in suite.dists:
 out.close('projectDescription')
 projectFile = join(projectDir, '.project')
 update_file(projectFile, out.xml(indent='\t', newl='\n'))
 files.append(projectFile)
+_zip_files(files, suite.dir, configZip.path)
+_zip_files(libFiles, suite.dir, configLibsZip)
 def _zip_files(files, baseDir, zipPath):
 fd, tmp = tempfile.mkstemp(suffix='', prefix=basename(zipPath), dir=baseDir)
 try:
 zf = zipfile.ZipFile(tmp, 'w')
 for f in sorted(set(files)):
 wsdoc.open('workingSet', {'editPageID': 'org.eclipse.jdt.ui.JavaWorkingSetPage', 'factoryID': 'org.eclipse.ui.internal.WorkingSetFactory', 'id': 'wsid_' + ws, 'label': ws, 'name': ws})
 def _workingset_element(wsdoc, p):
 wsdoc.element('item', {'elementID': '=' + p, 'factoryID': 'org.eclipse.jdt.ui.PersistableJavaElementFactory'})
-def netbeansinit(args, refreshOnly=False):
+def netbeansinit(args, refreshOnly=False, buildProcessorJars=True):
 """(re)generate NetBeans project configurations"""
 for suite in suites(True):
-_netbeansinit_suite(args, suite, refreshOnly)
+_netbeansinit_suite(args, suite, refreshOnly, buildProcessorJars)
-def _netbeansinit_suite(args, suite, refreshOnly=False):
+def _netbeansinit_suite(args, suite, refreshOnly=False, buildProcessorJars=True):
 configZip = TimeStampFile(join(suite.mxDir, 'netbeans-config.zip'))
 configLibsZip = join(suite.mxDir, 'eclipse-config-libs.zip')
 if refreshOnly and not configZip.exists():
 return
 log("Error removing {0}".format(p.name + '.jar'))
 for d in _dists.itervalues():
 shutil.rmtree(d.get_ide_project_dir(), ignore_errors=True)
+def ideinit(args, refreshOnly=False, buildProcessorJars=True):
-def ideinit(args, refreshOnly=False):
 """(re)generate Eclipse, NetBeans and Intellij project configurations"""
-eclipseinit(args, refreshOnly=refreshOnly)
+eclipseinit(args, refreshOnly=refreshOnly, buildProcessorJars=buildProcessorJars)
-netbeansinit(args, refreshOnly=refreshOnly)
+netbeansinit(args, refreshOnly=refreshOnly, buildProcessorJars=buildProcessorJars)
 intellijinit(args, refreshOnly=refreshOnly)
 if not refreshOnly:
 fsckprojects([])
 def fsckprojects(args):

Mercurial > hg > truffle

comparison mxtool/mx.py @ 16846:e3dd75b3c290