truffle: mxtool/mx.py annotate

annotate mxtool/mx.py @ 15781:8b9e7f235d85

mx: fixed spurious "error while killing subprocess" messages (GRAAL-350)

author	Doug Simon <doug.simon@oracle.com>
date	Tue, 20 May 2014 11:50:30 +0200
parents	16059f6f5661
children	7a6f6a7ef886

rev	line source
13470 eb7bc1fd38de made mx.py (first line) more portable Doug Simon <doug.simon@oracle.com> parents: 13358 diff changeset	1 #!/usr/bin/env python2.7
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	3 # ----------------------------------------------------------------------------------------------------
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4 #
4186 71a2cd79c375 Made stdout for mx unbuffered. Doug Simon <doug.simon@oracle.com> parents: 4180 diff changeset	5 # Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	6 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	7 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	8 # This code is free software; you can redistribute it and/or modify it
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	9 # under the terms of the GNU General Public License version 2 only, as
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	10 # published by the Free Software Foundation.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	11 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	12 # This code is distributed in the hope that it will be useful, but WITHOUT
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	13 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	14 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	15 # version 2 for more details (a copy is included in the LICENSE file that
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	16 # accompanied this code).
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	17 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	18 # You should have received a copy of the GNU General Public License version
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	19 # 2 along with this work; if not, write to the Free Software Foundation,
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	20 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	21 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	22 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	23 # or visit www.oracle.com if you need additional information or have any
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	24 # questions.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	25 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	26 # ----------------------------------------------------------------------------------------------------
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	27 #
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	28 r"""
12553 9af82ca3f225 mxtool: change about text to refer to Wiki doc, add mx.find script Mick Jordan <mick.jordan@oracle.com> parents: 12524 diff changeset	29 mx is a command line tool for managing the development of Java code organized as suites of projects.
9af82ca3f225 mxtool: change about text to refer to Wiki doc, add mx.find script Mick Jordan <mick.jordan@oracle.com> parents: 12524 diff changeset	30
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	31 Version 1.x supports a single suite of projects.
bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	32
12553 9af82ca3f225 mxtool: change about text to refer to Wiki doc, add mx.find script Mick Jordan <mick.jordan@oracle.com> parents: 12524 diff changeset	33 Full documentation can be found at https://wiki.openjdk.java.net/display/Graal/The+mx+Tool
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	34 """
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	35
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	36 import sys, os, errno, time, subprocess, shlex, types, urllib2, contextlib, StringIO, zipfile, signal, xml.sax.saxutils, tempfile, fnmatch
11295 bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	37 import textwrap
12620 a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	38 import socket
15087 f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	39 import tarfile
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	40 import hashlib
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	41 import xml.parsers.expat
8447 b6b9ab1fde62 removed support for using the Eclipse batch compiler bundled with Eclipse - depending on the version, it has bugs with respect to annotation processing Doug Simon <doug.simon@oracle.com> parents: 8439 diff changeset	42 import shutil, re, xml.dom.minidom
13950 35783e78eaef mx.run: shell-escape arguments when printing them in verbose mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 13927 diff changeset	43 import pipes
14626 4f8268dee8aa mx: eclipseformat now prints all the changes that were found to the console. Christian Humer <christian.humer@gmail.com> parents: 14553 diff changeset	44 import difflib
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	45 from collections import Callable
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	46 from threading import Thread
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	47 from argparse import ArgumentParser, REMAINDER
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	48 from os.path import join, basename, dirname, exists, getmtime, isabs, expandvars, isdir, isfile
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	49
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	50 _projects = dict()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	51 _libs = dict()
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	52 _jreLibs = dict()
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	53 _dists = dict()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	54 _suites = dict()
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	55 _annotationProcessors = None
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	56 _primary_suite_path = None
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	57 _primary_suite = None
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	58 _opts = None
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	59 _java_homes = None
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	60 _warn = False
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	61
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	62 """
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	63 A distribution is a jar or zip file containing the output from one or more Java projects.
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	64 """
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	65 class Distribution:
15638 83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	66 def __init__(self, suite, name, path, sourcesPath, deps, excludedDependencies, distDependencies):
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	67 self.suite = suite
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	68 self.name = name
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	69 self.path = path.replace('/', os.sep)
14964 e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	70 self.path = _make_absolute(self.path, suite.dir)
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	71 self.sourcesPath = _make_absolute(sourcesPath.replace('/', os.sep), suite.dir) if sourcesPath else None
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	72 self.deps = deps
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	73 self.update_listeners = set()
15577 406a94c03ffa truffle distrubtion: move dsl processor in a separated jar, such that it can be a build-time only dependency Bernhard Urban <bernhard.urban@jku.at> parents: 15497 diff changeset	74 self.excludedDependencies = excludedDependencies
15638 83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	75 self.distDependencies = distDependencies
14775 40aa1eb176db mx: added support for excluding dependencies from distributions Doug Simon <doug.simon@oracle.com> parents: 14764 diff changeset	76
40aa1eb176db mx: added support for excluding dependencies from distributions Doug Simon <doug.simon@oracle.com> parents: 14764 diff changeset	77 def sorted_deps(self, includeLibs=False):
14781 d2038d372cd2 changed distribution dependency exclusion mechanism to be only for library dependencies Doug Simon <doug.simon@oracle.com> parents: 14775 diff changeset	78 try:
15577 406a94c03ffa truffle distrubtion: move dsl processor in a separated jar, such that it can be a build-time only dependency Bernhard Urban <bernhard.urban@jku.at> parents: 15497 diff changeset	79 excl = [dependency(d) for d in self.excludedDependencies]
14781 d2038d372cd2 changed distribution dependency exclusion mechanism to be only for library dependencies Doug Simon <doug.simon@oracle.com> parents: 14775 diff changeset	80 except SystemExit as e:
15577 406a94c03ffa truffle distrubtion: move dsl processor in a separated jar, such that it can be a build-time only dependency Bernhard Urban <bernhard.urban@jku.at> parents: 15497 diff changeset	81 abort('invalid excluded dependency for {} distribution: {}'.format(self.name, e))
14775 40aa1eb176db mx: added support for excluding dependencies from distributions Doug Simon <doug.simon@oracle.com> parents: 14764 diff changeset	82 return [d for d in sorted_deps(self.deps, includeLibs=includeLibs) if d not in excl]
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	83
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	84 def __str__(self):
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	85 return self.name
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	86
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	87 def add_update_listener(self, listener):
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	88 self.update_listeners.add(listener)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	89
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	90 def make_archive(self):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	91 # are sources combined into main archive?
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	92 unified = self.path == self.sourcesPath
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	93
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	94 with Archiver(self.path) as arc, Archiver(None if unified else self.sourcesPath) as srcArcRaw:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	95 srcArc = arc if unified else srcArcRaw
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	96 services = {}
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	97 def overwriteCheck(zf, arcname, source):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	98 if not hasattr(zf, '_provenance'):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	99 zf._provenance = {}
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	100 existingSource = zf._provenance.get(arcname, None)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	101 if existingSource and existingSource != source and not arcname.endswith('/'):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	102 log('warning: ' + self.path + ': overwriting ' + arcname + '\n new: ' + source + '\n old: ' + existingSource)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	103 zf._provenance[arcname] = source
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	104
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	105 for dep in self.sorted_deps(includeLibs=True):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	106 if dep.isLibrary():
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	107 l = dep
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	108 # merge library jar into distribution jar
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	109 logv('[' + self.path + ': adding library ' + l.name + ']')
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	110 lpath = l.get_path(resolve=True)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	111 libSourcePath = l.get_source_path(resolve=True)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	112 if lpath:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	113 with zipfile.ZipFile(lpath, 'r') as lp:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	114 for arcname in lp.namelist():
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	115 if arcname.startswith('META-INF/services/') and not arcname == 'META-INF/services/':
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	116 service = arcname[len('META-INF/services/'):]
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	117 assert '/' not in service
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	118 services.setdefault(service, []).extend(lp.read(arcname).splitlines())
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	119 else:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	120 overwriteCheck(arc.zf, arcname, lpath + '!' + arcname)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	121 arc.zf.writestr(arcname, lp.read(arcname))
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	122 if srcArc.zf and libSourcePath:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	123 with zipfile.ZipFile(libSourcePath, 'r') as lp:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	124 for arcname in lp.namelist():
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	125 overwriteCheck(srcArc.zf, arcname, lpath + '!' + arcname)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	126 srcArc.zf.writestr(arcname, lp.read(arcname))
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	127 elif dep.isProject():
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	128 p = dep
15601 4aeb0b80324f mx distributions: allow to specify dependencies between distributions Bernhard Urban <bernhard.urban@jku.at> parents: 15579 diff changeset	129
15638 83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	130 isCoveredByDependecy = False
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	131 for d in self.distDependencies:
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	132 if p in _dists[d].sorted_deps():
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	133 logv("Excluding {0} from {1} because it's provided by the dependency {2}".format(p.name, self.path, d))
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	134 isCoveredByDependecy = True
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	135 break
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	136
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	137 if isCoveredByDependecy:
15601 4aeb0b80324f mx distributions: allow to specify dependencies between distributions Bernhard Urban <bernhard.urban@jku.at> parents: 15579 diff changeset	138 continue
4aeb0b80324f mx distributions: allow to specify dependencies between distributions Bernhard Urban <bernhard.urban@jku.at> parents: 15579 diff changeset	139
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	140 # skip a Java project if its Java compliance level is "higher" than the configured JDK
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	141 jdk = java(p.javaCompliance)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	142 assert jdk
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	143
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	144 logv('[' + self.path + ': adding project ' + p.name + ']')
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	145 outputDir = p.output_dir()
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	146 for root, _, files in os.walk(outputDir):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	147 relpath = root[len(outputDir) + 1:]
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	148 if relpath == join('META-INF', 'services'):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	149 for service in files:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	150 with open(join(root, service), 'r') as fp:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	151 services.setdefault(service, []).extend([provider.strip() for provider in fp.readlines()])
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	152 elif relpath == join('META-INF', 'providers'):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	153 for provider in files:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	154 with open(join(root, provider), 'r') as fp:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	155 for service in fp:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	156 services.setdefault(service.strip(), []).append(provider)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	157 else:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	158 for f in files:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	159 arcname = join(relpath, f).replace(os.sep, '/')
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	160 overwriteCheck(arc.zf, arcname, join(root, f))
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	161 arc.zf.write(join(root, f), arcname)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	162 if srcArc.zf:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	163 sourceDirs = p.source_dirs()
15227 7be43cbf3568 mx: include generated sources in archived distribution sources Doug Simon <doug.simon@oracle.com> parents: 15226 diff changeset	164 if p.source_gen_dir():
7be43cbf3568 mx: include generated sources in archived distribution sources Doug Simon <doug.simon@oracle.com> parents: 15226 diff changeset	165 sourceDirs.append(p.source_gen_dir())
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	166 for srcDir in sourceDirs:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	167 for root, _, files in os.walk(srcDir):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	168 relpath = root[len(srcDir) + 1:]
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	169 for f in files:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	170 if f.endswith('.java'):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	171 arcname = join(relpath, f).replace(os.sep, '/')
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	172 overwriteCheck(srcArc.zf, arcname, join(root, f))
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	173 srcArc.zf.write(join(root, f), arcname)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	174
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	175 for service, providers in services.iteritems():
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	176 arcname = 'META-INF/services/' + service
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	177 arc.zf.writestr(arcname, '\n'.join(providers))
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	178
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	179 self.notify_updated()
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	180
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	181
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	182 def notify_updated(self):
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	183 for l in self.update_listeners:
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	184 l(self)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	185
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	186 """
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	187 A dependency is a library or project specified in a suite.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	188 """
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	189 class Dependency:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	190 def __init__(self, suite, name):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	191 self.name = name
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	192 self.suite = suite
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	193
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	194 def __str__(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	195 return self.name
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	196
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	197 def __eq__(self, other):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	198 return self.name == other.name
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	199
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	200 def __ne__(self, other):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	201 return self.name != other.name
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	202
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	203 def __hash__(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	204 return hash(self.name)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	205
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	206 def isLibrary(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	207 return isinstance(self, Library)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	208
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	209 def isJreLibrary(self):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	210 return isinstance(self, JreLibrary)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	211
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	212 def isProject(self):
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	213 return isinstance(self, Project)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	214
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	215 class Project(Dependency):
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	216 def __init__(self, suite, name, srcDirs, deps, javaCompliance, workingSets, d):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	217 Dependency.__init__(self, suite, name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	218 self.srcDirs = srcDirs
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	219 self.deps = deps
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	220 self.checkstyleProj = name
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	221 self.javaCompliance = JavaCompliance(javaCompliance) if javaCompliance is not None else None
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	222 self.native = False
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	223 self.workingSets = workingSets
7509 442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7299 diff changeset	224 self.dir = d
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	225
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	226 # Verify that a JDK exists for this project if its compliance level is
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	227 # less than the compliance level of the default JDK
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	228 jdk = java(self.javaCompliance)
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	229 if jdk is None and self.javaCompliance < java().javaCompliance:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	230 abort('Cannot find ' + str(self.javaCompliance) + ' JDK required by ' + name + '. ' +
14764 5823c399e28f pylint fixes Bernhard Urban <bernhard.urban@jku.at> parents: 14763 diff changeset	231 'Specify it with --extra-java-homes option or EXTRA_JAVA_HOMES environment variable.')
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	232
5581 9911227e6dd3 create directories for not yet existing projects Doug Simon <doug.simon@oracle.com> parents: 5455 diff changeset	233 # Create directories for projects that don't yet exist
7509 442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7299 diff changeset	234 if not exists(d):
442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7299 diff changeset	235 os.mkdir(d)
5581 9911227e6dd3 create directories for not yet existing projects Doug Simon <doug.simon@oracle.com> parents: 5455 diff changeset	236 for s in self.source_dirs():
9911227e6dd3 create directories for not yet existing projects Doug Simon <doug.simon@oracle.com> parents: 5455 diff changeset	237 if not exists(s):
9911227e6dd3 create directories for not yet existing projects Doug Simon <doug.simon@oracle.com> parents: 5455 diff changeset	238 os.mkdir(s)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	239
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	240 def all_deps(self, deps, includeLibs, includeSelf=True, includeJreLibs=False, includeAnnotationProcessors=False):
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	241 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	242 Add the transitive set of dependencies for this project, including
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	243 libraries if 'includeLibs' is true, to the 'deps' list.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	244 """
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	245 childDeps = list(self.deps)
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	246 if includeAnnotationProcessors and len(self.annotation_processors()) > 0:
394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	247 childDeps = self.annotation_processors() + childDeps
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	248 if self in deps:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	249 return deps
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	250 for name in childDeps:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	251 assert name != self.name
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	252 dep = dependency(name)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	253 if not dep in deps and (dep.isProject or (dep.isLibrary() and includeLibs) or (dep.isJreLibrary() and includeJreLibs)):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	254 dep.all_deps(deps, includeLibs=includeLibs, includeJreLibs=includeJreLibs, includeAnnotationProcessors=includeAnnotationProcessors)
4219 47f7d91d34cf Fix javac build issues with classpath Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4215 diff changeset	255 if not self in deps and includeSelf:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	256 deps.append(self)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	257 return deps
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	258
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	259 def _compute_max_dep_distances(self, name, distances, dist):
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	260 currentDist = distances.get(name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	261 if currentDist is None or currentDist < dist:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	262 distances[name] = dist
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	263 p = project(name, False)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	264 if p is not None:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	265 for dep in p.deps:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	266 self._compute_max_dep_distances(dep, distances, dist + 1)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	267
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	268 def canonical_deps(self):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	269 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	270 Get the dependencies of this project that are not recursive (i.e. cannot be reached
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	271 via other dependencies).
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	272 """
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	273 distances = dict()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	274 result = set()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	275 self._compute_max_dep_distances(self.name, distances, 0)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	276 for n, d in distances.iteritems():
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	277 assert d > 0 or n == self.name
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	278 if d == 1:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	279 result.add(n)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	280
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	281 if len(result) == len(self.deps) and frozenset(self.deps) == result:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	282 return self.deps
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	283 return result
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	284
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	285 def max_depth(self):
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	286 """
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	287 Get the maximum canonical distance between this project and its most distant dependency.
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	288 """
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	289 distances = dict()
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	290 self._compute_max_dep_distances(self.name, distances, 0)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	291 return max(distances.values())
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	292
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	293 def source_dirs(self):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	294 """
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	295 Get the directories in which the sources of this project are found.
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	296 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	297 return [join(self.dir, s) for s in self.srcDirs]
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	298
6535 f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	299 def source_gen_dir(self):
f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	300 """
f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	301 Get the directory in which source files generated by the annotation processor are found/placed.
f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	302 """
f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	303 if self.native:
f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	304 return None
f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	305 return join(self.dir, 'src_gen')
f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	306
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	307 def output_dir(self):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	308 """
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	309 Get the directory in which the class files of this project are found/placed.
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	310 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	311 if self.native:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	312 return None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	313 return join(self.dir, 'bin')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	314
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	315 def jasmin_output_dir(self):
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	316 """
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	317 Get the directory in which the Jasmin assembled class files of this project are found/placed.
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	318 """
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	319 if self.native:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	320 return None
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	321 return join(self.dir, 'jasmin_classes')
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	322
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	323 def append_to_classpath(self, cp, resolve):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	324 if not self.native:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	325 cp.append(self.output_dir())
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	326
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	327 def find_classes_with_matching_source_line(self, pkgRoot, function, includeInnerClasses=False):
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	328 """
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	329 Scan the sources of this project for Java source files containing a line for which
8607 c7672a325faf search for classes containing annotations returns source file as well as class name Doug Simon <doug.simon@oracle.com> parents: 8585 diff changeset	330 'function' returns true. A map from class name to source file path for each existing class
c7672a325faf search for classes containing annotations returns source file as well as class name Doug Simon <doug.simon@oracle.com> parents: 8585 diff changeset	331 corresponding to a matched source file is returned.
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	332 """
8607 c7672a325faf search for classes containing annotations returns source file as well as class name Doug Simon <doug.simon@oracle.com> parents: 8585 diff changeset	333 result = dict()
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	334 pkgDecl = re.compile(r"^package\s+([a-zA-Z_][\w\.])\s;$")
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	335 for srcDir in self.source_dirs():
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	336 outputDir = self.output_dir()
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	337 for root, _, files in os.walk(srcDir):
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	338 for name in files:
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	339 if name.endswith('.java') and name != 'package-info.java':
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	340 matchFound = False
8607 c7672a325faf search for classes containing annotations returns source file as well as class name Doug Simon <doug.simon@oracle.com> parents: 8585 diff changeset	341 source = join(root, name)
c7672a325faf search for classes containing annotations returns source file as well as class name Doug Simon <doug.simon@oracle.com> parents: 8585 diff changeset	342 with open(source) as f:
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	343 pkg = None
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	344 for line in f:
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	345 if line.startswith("package "):
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	346 match = pkgDecl.match(line)
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	347 if match:
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	348 pkg = match.group(1)
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	349 if function(line.strip()):
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	350 matchFound = True
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	351 if pkg and matchFound:
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	352 break
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	353
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	354 if matchFound:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	355 simpleClassName = name[:-len('.java')]
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	356 assert pkg is not None
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	357 if pkgRoot is None or pkg.startswith(pkgRoot):
b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	358 pkgOutputDir = join(outputDir, pkg.replace('.', os.path.sep))
11245 d89a5dbaaaf6 ignore sources for which class files do not exist Doug Simon <doug.simon@oracle.com> parents: 11205 diff changeset	359 if exists(pkgOutputDir):
d89a5dbaaaf6 ignore sources for which class files do not exist Doug Simon <doug.simon@oracle.com> parents: 11205 diff changeset	360 for e in os.listdir(pkgOutputDir):
d89a5dbaaaf6 ignore sources for which class files do not exist Doug Simon <doug.simon@oracle.com> parents: 11205 diff changeset	361 if includeInnerClasses:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	362 if e.endswith('.class') and (e.startswith(simpleClassName) or e.startswith(simpleClassName + '$')):
11245 d89a5dbaaaf6 ignore sources for which class files do not exist Doug Simon <doug.simon@oracle.com> parents: 11205 diff changeset	363 className = pkg + '.' + e[:-len('.class')]
d89a5dbaaaf6 ignore sources for which class files do not exist Doug Simon <doug.simon@oracle.com> parents: 11205 diff changeset	364 result[className] = source
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	365 elif e == simpleClassName + '.class':
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	366 className = pkg + '.' + simpleClassName
11245 d89a5dbaaaf6 ignore sources for which class files do not exist Doug Simon <doug.simon@oracle.com> parents: 11205 diff changeset	367 result[className] = source
8607 c7672a325faf search for classes containing annotations returns source file as well as class name Doug Simon <doug.simon@oracle.com> parents: 8585 diff changeset	368 return result
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	369
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	370 def _init_packages_and_imports(self):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	371 if not hasattr(self, '_defined_java_packages'):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	372 packages = set()
8439 39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	373 extendedPackages = set()
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	374 depPackages = set()
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	375 for d in self.all_deps([], includeLibs=False, includeSelf=False):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	376 depPackages.update(d.defined_java_packages())
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	377 imports = set()
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	378 importRe = re.compile(r'import\s+(?:static\s+)?([^;]+);')
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	379 for sourceDir in self.source_dirs():
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	380 for root, _, files in os.walk(sourceDir):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	381 javaSources = [name for name in files if name.endswith('.java')]
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	382 if len(javaSources) != 0:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	383 pkg = root[len(sourceDir) + 1:].replace(os.sep, '.')
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	384 if not pkg in depPackages:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	385 packages.add(pkg)
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	386 else:
8439 39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	387 # A project extends a package already defined by one of it dependencies
39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	388 extendedPackages.add(pkg)
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	389 imports.add(pkg)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	390
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	391 for n in javaSources:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	392 with open(join(root, n)) as fp:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	393 content = fp.read()
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	394 imports.update(importRe.findall(content))
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	395 self._defined_java_packages = frozenset(packages)
8439 39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	396 self._extended_java_packages = frozenset(extendedPackages)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	397
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	398 importedPackages = set()
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	399 for imp in imports:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	400 name = imp
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	401 while not name in depPackages and len(name) > 0:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	402 lastDot = name.rfind('.')
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	403 if lastDot == -1:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	404 name = None
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	405 break
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	406 name = name[0:lastDot]
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	407 if name is not None:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	408 importedPackages.add(name)
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	409 self._imported_java_packages = frozenset(importedPackages)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	410
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	411 def defined_java_packages(self):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	412 """Get the immutable set of Java packages defined by the Java sources of this project"""
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	413 self._init_packages_and_imports()
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	414 return self._defined_java_packages
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	415
8439 39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	416 def extended_java_packages(self):
39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	417 """Get the immutable set of Java packages extended by the Java sources of this project"""
39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	418 self._init_packages_and_imports()
39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	419 return self._extended_java_packages
39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	420
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	421 def imported_java_packages(self):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	422 """Get the immutable set of Java packages defined by other Java projects that are
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	423 imported by the Java sources of this project."""
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	424 self._init_packages_and_imports()
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	425 return self._imported_java_packages
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	426
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	427 def annotation_processors(self):
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	428 if not hasattr(self, '_annotationProcessors'):
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	429 ap = set()
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	430 if hasattr(self, '_declaredAnnotationProcessors'):
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	431 ap = set(self._declaredAnnotationProcessors)
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	432
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	433 # find dependencies that auto-inject themselves as annotation processors to all dependents
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	434 allDeps = self.all_deps([], includeLibs=False, includeSelf=False, includeAnnotationProcessors=False)
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	435 for p in allDeps:
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	436 if hasattr(p, 'annotationProcessorForDependents') and p.annotationProcessorForDependents.lower() == 'true':
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	437 ap.add(p.name)
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	438 self._annotationProcessors = list(ap)
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	439 return self._annotationProcessors
5762 b30cced39597 generalized functionality for finding classes based on searching for patterns in source code and moved it from commands.py to mx.py Doug Simon <doug.simon@oracle.com> parents: 5712 diff changeset	440
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	441 def update_current_annotation_processors_file(self):
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	442 aps = self.annotation_processors()
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	443 outOfDate = False
12641 851aa5341214 moved persistent annotation processor dependency files into mx/currentAnnotationProcessors directory Doug Simon <doug.simon@oracle.com> parents: 12640 diff changeset	444 currentApsFile = join(self.suite.mxDir, 'currentAnnotationProcessors', self.name)
12648 1fbe3ca3d30d don't equate missing current annotation processor file with it being out of date Doug Simon <doug.simon@oracle.com> parents: 12641 diff changeset	445 currentApsFileExists = exists(currentApsFile)
1fbe3ca3d30d don't equate missing current annotation processor file with it being out of date Doug Simon <doug.simon@oracle.com> parents: 12641 diff changeset	446 if currentApsFileExists:
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	447 with open(currentApsFile) as fp:
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	448 currentAps = [l.strip() for l in fp.readlines()]
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	449 if currentAps != aps:
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	450 outOfDate = True
12648 1fbe3ca3d30d don't equate missing current annotation processor file with it being out of date Doug Simon <doug.simon@oracle.com> parents: 12641 diff changeset	451 if outOfDate or not currentApsFileExists:
12641 851aa5341214 moved persistent annotation processor dependency files into mx/currentAnnotationProcessors directory Doug Simon <doug.simon@oracle.com> parents: 12640 diff changeset	452 if not exists(dirname(currentApsFile)):
851aa5341214 moved persistent annotation processor dependency files into mx/currentAnnotationProcessors directory Doug Simon <doug.simon@oracle.com> parents: 12640 diff changeset	453 os.mkdir(dirname(currentApsFile))
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	454 with open(currentApsFile, 'w') as fp:
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	455 for ap in aps:
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	456 print >> fp, ap
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	457 return outOfDate
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	458
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	459 def make_archive(self, path=None):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	460 outputDir = self.output_dir()
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	461 if not path:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	462 path = join(self.dir, self.name + '.jar')
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	463 with Archiver(path) as arc:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	464 for root, _, files in os.walk(outputDir):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	465 for f in files:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	466 relpath = root[len(outputDir) + 1:]
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	467 arcname = join(relpath, f).replace(os.sep, '/')
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	468 arc.zf.write(join(root, f), arcname)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	469 return path
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	470
14964 e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	471 def _make_absolute(path, prefix):
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	472 """
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	473 Makes 'path' absolute if it isn't already by prefixing 'prefix'
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	474 """
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	475 if not isabs(path):
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	476 return join(prefix, path)
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	477 return path
e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	478
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	479 def _download_file_with_sha1(name, path, urls, sha1, sha1path, resolve, mustExist, sources=False):
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	480 def _download_lib():
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	481 print 'Downloading ' + ("Sources " if sources else "") + name + ' from ' + str(urls)
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	482 download(path, urls)
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	483
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	484 def _sha1Cached():
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	485 with open(sha1path, 'r') as f:
14154 e666c172c9aa mx: some cleanup around sha1 digest support Bernhard Urban <bernhard.urban@jku.at> parents: 14153 diff changeset	486 return f.read()[0:40]
e666c172c9aa mx: some cleanup around sha1 digest support Bernhard Urban <bernhard.urban@jku.at> parents: 14153 diff changeset	487
e666c172c9aa mx: some cleanup around sha1 digest support Bernhard Urban <bernhard.urban@jku.at> parents: 14153 diff changeset	488 def _writeSha1Cached():
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	489 with open(sha1path, 'w') as f:
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	490 f.write(_sha1OfFile())
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	491
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	492 def _sha1OfFile():
14153 e328f28f7401 fix for mx, did not compile on Windows Christian Wirth <christian.wirth@oracle.com> parents: 14136 diff changeset	493 with open(path, 'rb') as f:
14156 7668297a2e67 mx: compute sha1 digest blockwise Bernhard Urban <bernhard.urban@jku.at> parents: 14155 diff changeset	494 d = hashlib.sha1()
7668297a2e67 mx: compute sha1 digest blockwise Bernhard Urban <bernhard.urban@jku.at> parents: 14155 diff changeset	495 while True:
7668297a2e67 mx: compute sha1 digest blockwise Bernhard Urban <bernhard.urban@jku.at> parents: 14155 diff changeset	496 buf = f.read(4096)
7668297a2e67 mx: compute sha1 digest blockwise Bernhard Urban <bernhard.urban@jku.at> parents: 14155 diff changeset	497 if not buf:
7668297a2e67 mx: compute sha1 digest blockwise Bernhard Urban <bernhard.urban@jku.at> parents: 14155 diff changeset	498 break
7668297a2e67 mx: compute sha1 digest blockwise Bernhard Urban <bernhard.urban@jku.at> parents: 14155 diff changeset	499 d.update(buf)
7668297a2e67 mx: compute sha1 digest blockwise Bernhard Urban <bernhard.urban@jku.at> parents: 14155 diff changeset	500 return d.hexdigest()
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	501
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	502 if resolve and mustExist and not exists(path):
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	503 assert not len(urls) == 0, 'cannot find required library ' + name + ' ' + path
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	504 _download_lib()
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	505
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	506 if sha1 and not exists(sha1path):
14154 e666c172c9aa mx: some cleanup around sha1 digest support Bernhard Urban <bernhard.urban@jku.at> parents: 14153 diff changeset	507 _writeSha1Cached()
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	508
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	509 if sha1 and sha1 != _sha1Cached():
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	510 _download_lib()
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	511 if sha1 != _sha1OfFile():
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	512 abort("SHA1 does not match for " + name + ". Broken download? SHA1 not updated in projects file?")
14154 e666c172c9aa mx: some cleanup around sha1 digest support Bernhard Urban <bernhard.urban@jku.at> parents: 14153 diff changeset	513 _writeSha1Cached()
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	514
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	515 return path
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	516
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	517 class BaseLibrary(Dependency):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	518 def __init__(self, suite, name, optional):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	519 Dependency.__init__(self, suite, name)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	520 self.optional = optional
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	521
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	522 def __ne__(self, other):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	523 result = self.__eq__(other)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	524 if result is NotImplemented:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	525 return result
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	526 return not result
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	527
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	528 """
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	529 A library that will be provided by the JDK but may be absent.
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	530 Any project or normal library that depends on a missing library
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	531 will be removed from the global project and library dictionaries
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	532 (i.e., _projects and _libs).
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	533
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	534 This mechanism exists primarily to be able to support code
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	535 that may use functionality in one JDK (e.g., Oracle JDK)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	536 that is not present in another JDK (e.g., OpenJDK). A
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	537 motivating example is the Java Flight Recorder library
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	538 found in the Oracle JDK.
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	539 """
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	540 class JreLibrary(BaseLibrary):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	541 def __init__(self, suite, name, jar, optional):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	542 BaseLibrary.__init__(self, suite, name, optional)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	543 self.jar = jar
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	544
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	545 def __eq__(self, other):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	546 if isinstance(other, JreLibrary):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	547 return self.jar == other.jar
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	548 else:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	549 return NotImplemented
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	550
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	551 def is_present_in_jdk(self, jdk):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	552 for e in jdk.bootclasspath().split(os.pathsep):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	553 if basename(e) == self.jar:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	554 return True
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	555 for d in jdk.extdirs().split(os.pathsep):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	556 if len(d) and self.jar in os.listdir(d):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	557 return True
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	558 for d in jdk.endorseddirs().split(os.pathsep):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	559 if len(d) and self.jar in os.listdir(d):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	560 return True
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	561 return False
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	562
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	563 def all_deps(self, deps, includeLibs, includeSelf=True, includeJreLibs=False, includeAnnotationProcessors=False):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	564 """
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	565 Add the transitive set of dependencies for this JRE library to the 'deps' list.
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	566 """
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	567 if includeJreLibs and includeSelf and not self in deps:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	568 deps.append(self)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	569 return deps
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	570
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	571 class Library(BaseLibrary):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	572 def __init__(self, suite, name, path, optional, urls, sha1, sourcePath, sourceUrls, sourceSha1, deps):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	573 BaseLibrary.__init__(self, suite, name, optional)
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	574 self.path = path.replace('/', os.sep)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	575 self.urls = urls
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	576 self.sha1 = sha1
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	577 self.sourcePath = sourcePath
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	578 self.sourceUrls = sourceUrls
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	579 self.sourceSha1 = sourceSha1
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	580 self.deps = deps
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	581 abspath = _make_absolute(self.path, self.suite.dir)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	582 if not optional and not exists(abspath):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	583 if not len(urls):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	584 abort('Non-optional library {} must either exist at {} or specify one or more URLs from which it can be retrieved'.format(name, abspath))
6350 f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	585 for url in urls:
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	586 if url.endswith('/') != self.path.endswith(os.sep):
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	587 abort('Path for dependency directory must have a URL ending with "/": path=' + self.path + ' url=' + url)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	588
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	589 def __eq__(self, other):
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	590 if isinstance(other, Library):
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	591 if len(self.urls) == 0:
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	592 return self.path == other.path
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	593 else:
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	594 return self.urls == other.urls
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	595 else:
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	596 return NotImplemented
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	597
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	598 def get_path(self, resolve):
14964 e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	599 path = _make_absolute(self.path, self.suite.dir)
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	600 sha1path = path + '.sha1'
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	601
11687 facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	602 includedInJDK = getattr(self, 'includedInJDK', None)
facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	603 if includedInJDK and java().javaCompliance >= JavaCompliance(includedInJDK):
facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	604 return None
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	605
15692 5ec52f033e58 mxtool: minor fix of optional field usage Bernhard Urban <bernhard.urban@jku.at> parents: 15662 diff changeset	606 return _download_file_with_sha1(self.name, path, self.urls, self.sha1, sha1path, resolve, not self.optional)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	607
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	608 def get_source_path(self, resolve):
15147 d93cc1fdf55e Fix Library.get_source_path (use sourcePath instead of path) Gilles Duboscq <duboscq@ssw.jku.at> parents: 15135 diff changeset	609 if self.sourcePath is None:
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	610 return None
15147 d93cc1fdf55e Fix Library.get_source_path (use sourcePath instead of path) Gilles Duboscq <duboscq@ssw.jku.at> parents: 15135 diff changeset	611 path = _make_absolute(self.sourcePath, self.suite.dir)
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	612 sha1path = path + '.sha1'
d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	613
14154 e666c172c9aa mx: some cleanup around sha1 digest support Bernhard Urban <bernhard.urban@jku.at> parents: 14153 diff changeset	614 return _download_file_with_sha1(self.name, path, self.sourceUrls, self.sourceSha1, sha1path, resolve, len(self.sourceUrls) != 0, sources=True)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	615
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	616 def append_to_classpath(self, cp, resolve):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	617 path = self.get_path(resolve)
11687 facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	618 if path and (exists(path) or not resolve):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	619 cp.append(path)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	620
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	621 def all_deps(self, deps, includeLibs, includeSelf=True, includeJreLibs=False, includeAnnotationProcessors=False):
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	622 """
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	623 Add the transitive set of dependencies for this library to the 'deps' list.
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	624 """
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	625 if not includeLibs:
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	626 return deps
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	627 childDeps = list(self.deps)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	628 if self in deps:
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	629 return deps
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	630 for name in childDeps:
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	631 assert name != self.name
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	632 dep = library(name)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	633 if not dep in deps:
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	634 dep.all_deps(deps, includeLibs=includeLibs, includeJreLibs=includeJreLibs, includeAnnotationProcessors=includeAnnotationProcessors)
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	635 if not self in deps and includeSelf:
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	636 deps.append(self)
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	637 return deps
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	638
12508 5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	639 class HgConfig:
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	640 """
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	641 Encapsulates access to Mercurial (hg)
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	642 """
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	643 def __init__(self):
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	644 self.missing = 'no hg executable found'
12512 21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	645 self.has_hg = None
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	646
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	647 def check(self, abortOnFail=True):
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	648 if self.has_hg is None:
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	649 try:
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	650 subprocess.check_output(['hg'])
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	651 self.has_hg = True
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	652 except OSError:
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	653 self.has_hg = False
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	654 warn(self.missing)
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	655
12508 5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	656 if not self.has_hg:
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	657 if abortOnFail:
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	658 abort(self.missing)
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	659 else:
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	660 warn(self.missing)
12512 21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	661
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	662 def tip(self, sDir, abortOnError=True):
12508 5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	663 try:
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	664 return subprocess.check_output(['hg', 'tip', '-R', sDir, '--template', '{node}'])
12512 21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	665 except OSError:
21aa1ce5c666 made hg be called lazily Doug Simon <doug.simon@oracle.com> parents: 12508 diff changeset	666 warn(self.missing)
12508 5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	667 except subprocess.CalledProcessError:
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	668 if abortOnError:
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	669 abort('failed to get tip revision id')
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	670 else:
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	671 return None
5cde653f58f9 mxtool: handle missing hg executable gracefully Mick Jordan <mick.jordan@oracle.com> parents: 12504 diff changeset	672
15402 5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	673 def isDirty(self, sDir, abortOnError=True):
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	674 try:
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	675 return len(subprocess.check_output(['hg', 'status', '-R', sDir])) > 0
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	676 except OSError:
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	677 warn(self.missing)
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	678 except subprocess.CalledProcessError:
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	679 if abortOnError:
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	680 abort('failed to get status')
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	681 else:
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	682 return None
5dcf0ae606f3 mx: new export command Bernhard Urban <bernhard.urban@jku.at> parents: 15386 diff changeset	683
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	684 class Suite:
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	685 def __init__(self, mxDir, primary, load=True):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	686 self.dir = dirname(mxDir)
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	687 self.mxDir = mxDir
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	688 self.projects = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	689 self.libs = []
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	690 self.jreLibs = []
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	691 self.dists = []
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	692 self.commands = None
4180 383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	693 self.primary = primary
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	694 self.requiredMxVersion = None
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	695 self.name = _suitename(mxDir) # validated in _load_projects
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	696 if load:
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	697 # just check that there are no imports
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	698 self._load_imports()
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	699 self._load_env()
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	700 self._load_commands()
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	701 _suites[self.name] = self
9193 c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	702
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	703 def __str__(self):
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	704 return self.name
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	705
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	706 def _load_projects(self):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	707 libsMap = dict()
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	708 jreLibsMap = dict()
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	709 projsMap = dict()
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	710 distsMap = dict()
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	711 projectsFile = join(self.mxDir, 'projects')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	712 if not exists(projectsFile):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	713 return
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	714
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	715 with open(projectsFile) as f:
12455 d08accd58925 added support for wrapping long lines in mx/projects by placing a "\" at the end of the line (like the C preprocessor accepts) Doug Simon <doug.simon@oracle.com> parents: 12441 diff changeset	716 prefix = ''
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	717 lineNum = 0
fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	718
fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	719 def error(message):
fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	720 abort(projectsFile + ':' + str(lineNum) + ': ' + message)
fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	721
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	722 for line in f:
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	723 lineNum = lineNum + 1
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	724 line = line.strip()
12455 d08accd58925 added support for wrapping long lines in mx/projects by placing a "\" at the end of the line (like the C preprocessor accepts) Doug Simon <doug.simon@oracle.com> parents: 12441 diff changeset	725 if line.endswith('\\'):
d08accd58925 added support for wrapping long lines in mx/projects by placing a "\" at the end of the line (like the C preprocessor accepts) Doug Simon <doug.simon@oracle.com> parents: 12441 diff changeset	726 prefix = prefix + line[:-1]
d08accd58925 added support for wrapping long lines in mx/projects by placing a "\" at the end of the line (like the C preprocessor accepts) Doug Simon <doug.simon@oracle.com> parents: 12441 diff changeset	727 continue
d08accd58925 added support for wrapping long lines in mx/projects by placing a "\" at the end of the line (like the C preprocessor accepts) Doug Simon <doug.simon@oracle.com> parents: 12441 diff changeset	728 if len(prefix) != 0:
d08accd58925 added support for wrapping long lines in mx/projects by placing a "\" at the end of the line (like the C preprocessor accepts) Doug Simon <doug.simon@oracle.com> parents: 12441 diff changeset	729 line = prefix + line
d08accd58925 added support for wrapping long lines in mx/projects by placing a "\" at the end of the line (like the C preprocessor accepts) Doug Simon <doug.simon@oracle.com> parents: 12441 diff changeset	730 prefix = ''
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	731 if len(line) != 0 and line[0] != '#':
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	732 if '=' not in line:
fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	733 error('non-comment line does not contain an "=" character')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	734 key, value = line.split('=', 1)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	735
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	736 parts = key.split('@')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	737
9193 c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	738 if len(parts) == 1:
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	739 if parts[0] == 'suite':
e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	740 if self.name != value:
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	741 error('suite name in project file does not match ' + _suitename(self.mxDir))
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	742 elif parts[0] == 'mxversion':
e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	743 try:
13471 020099961eb4 renamed JavaVersion to VersionSpec Doug Simon <doug.simon@oracle.com> parents: 13470 diff changeset	744 self.requiredMxVersion = VersionSpec(value)
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	745 except AssertionError as ae:
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	746 error('Exception while parsing "mxversion" in project file: ' + str(ae))
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	747 else:
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	748 error('Single part property must be "suite": ' + key)
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	749
9193 c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	750 continue
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	751 if len(parts) != 3:
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	752 error('Property name does not have 3 parts separated by "@": ' + key)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	753 kind, name, attr = parts
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	754 if kind == 'project':
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	755 m = projsMap
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	756 elif kind == 'library':
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	757 m = libsMap
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	758 elif kind == 'jrelibrary':
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	759 m = jreLibsMap
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	760 elif kind == 'distribution':
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	761 m = distsMap
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	762 else:
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	763 error('Property name does not start with "project@", "library@" or "distribution@": ' + key)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	764
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	765 attrs = m.get(name)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	766 if attrs is None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	767 attrs = dict()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	768 m[name] = attrs
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	769 value = expandvars_in_property(value)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	770 attrs[attr] = value
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	771
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	772 def pop_list(attrs, name):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	773 v = attrs.pop(name, None)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	774 if v is None or len(v.strip()) == 0:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	775 return []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	776 return [n.strip() for n in v.split(',')]
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	777
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	778 for name, attrs in projsMap.iteritems():
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	779 srcDirs = pop_list(attrs, 'sourceDirs')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	780 deps = pop_list(attrs, 'dependencies')
5876 c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	781 ap = pop_list(attrs, 'annotationProcessors')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	782 # deps += ap
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	783 javaCompliance = attrs.pop('javaCompliance', None)
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	784 subDir = attrs.pop('subDir', None)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	785 if subDir is None:
7509 442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7299 diff changeset	786 d = join(self.dir, name)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	787 else:
7509 442668d41bc2 fixed warnings Doug Simon <doug.simon@oracle.com> parents: 7299 diff changeset	788 d = join(self.dir, subDir, name)
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	789 workingSets = attrs.pop('workingSets', None)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	790 p = Project(self, name, srcDirs, deps, javaCompliance, workingSets, d)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	791 p.checkstyleProj = attrs.pop('checkstyle', name)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	792 p.native = attrs.pop('native', '') == 'true'
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	793 if not p.native and p.javaCompliance is None:
13620 fa56f5a49270 improved format checking and error reporting when parsing a projects file Doug Simon <doug.simon@oracle.com> parents: 13481 diff changeset	794 error('javaCompliance property required for non-native project ' + name)
5876 c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	795 if len(ap) > 0:
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	796 p._declaredAnnotationProcessors = ap
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	797 p.__dict__.update(attrs)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	798 self.projects.append(p)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	799
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	800 for name, attrs in jreLibsMap.iteritems():
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	801 jar = attrs.pop('jar')
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	802 # JRE libraries are optional by default
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	803 optional = attrs.pop('optional', 'true') != 'false'
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	804 l = JreLibrary(self, name, jar, optional)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	805 self.jreLibs.append(l)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	806
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	807 for name, attrs in libsMap.iteritems():
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	808 path = attrs.pop('path')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	809 urls = pop_list(attrs, 'urls')
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	810 sha1 = attrs.pop('sha1', None)
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	811 sourcePath = attrs.pop('sourcePath', None)
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	812 sourceUrls = pop_list(attrs, 'sourceUrls')
14133 d2e4b81fd8f0 mx: support sha1 digest for dependencies Bernhard Urban <bernhard.urban@jku.at> parents: 14103 diff changeset	813 sourceSha1 = attrs.pop('sourceSha1', None)
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	814 deps = pop_list(attrs, 'dependencies')
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	815 # Add support optional libraries once we have a good use case
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	816 optional = False
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	817 l = Library(self, name, path, optional, urls, sha1, sourcePath, sourceUrls, sourceSha1, deps)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	818 l.__dict__.update(attrs)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	819 self.libs.append(l)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	820
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	821 for name, attrs in distsMap.iteritems():
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	822 path = attrs.pop('path')
14937 3de340bdb8d3 added support for adding sources to distribution Doug Simon <doug.simon@oracle.com> parents: 14918 diff changeset	823 sourcesPath = attrs.pop('sourcesPath', None)
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	824 deps = pop_list(attrs, 'dependencies')
15577 406a94c03ffa truffle distrubtion: move dsl processor in a separated jar, such that it can be a build-time only dependency Bernhard Urban <bernhard.urban@jku.at> parents: 15497 diff changeset	825 exclDeps = pop_list(attrs, 'exclude')
15638 83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	826 distDeps = pop_list(attrs, 'distDependencies')
83c69954bbaa mxtool: distribution dependency should be a list Bernhard Urban <bernhard.urban@jku.at> parents: 15601 diff changeset	827 d = Distribution(self, name, path, sourcesPath, deps, exclDeps, distDeps)
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	828 d.__dict__.update(attrs)
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	829 self.dists.append(d)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	830
9193 c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	831 if self.name is None:
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	832 abort('Missing "suite=<name>" in ' + projectsFile)
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	833
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	834 def _commands_name(self):
12641 851aa5341214 moved persistent annotation processor dependency files into mx/currentAnnotationProcessors directory Doug Simon <doug.simon@oracle.com> parents: 12640 diff changeset	835 return 'mx_' + self.name.replace('-', '_')
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	836
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	837 def _find_commands(self, name):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	838 commandsPath = join(self.mxDir, name + '.py')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	839 if exists(commandsPath):
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	840 return name
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	841 else:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	842 return None
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	843
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	844 def _load_commands(self):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	845 commandsName = self._find_commands(self._commands_name())
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	846 if commandsName is None:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	847 # backwards compatibility
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	848 commandsName = self._find_commands('commands')
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	849 if commandsName is not None:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	850 if commandsName in sys.modules:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	851 abort(commandsName + '.py in suite ' + self.name + ' duplicates ' + sys.modules[commandsName].__file__)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	852 # temporarily extend the Python path
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	853 sys.path.insert(0, self.mxDir)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	854 mod = __import__(commandsName)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	855
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	856 self.commands = sys.modules.pop(commandsName)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	857 sys.modules[commandsName] = self.commands
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	858
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	859 # revert the Python path
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	860 del sys.path[0]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	861
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	862 if not hasattr(mod, 'mx_init'):
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	863 abort(commandsName + '.py in suite ' + self.name + ' must define an mx_init(suite) function')
4215 a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4188 diff changeset	864 if hasattr(mod, 'mx_post_parse_cmd_line'):
a2caa019ba3a Fix mx : commands' scripts mx_init hook should be called before parsing command line arguments. Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4188 diff changeset	865 self.mx_post_parse_cmd_line = mod.mx_post_parse_cmd_line
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	866
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	867 mod.mx_init(self)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	868 self.commands = mod
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	869
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	870 def _load_imports(self):
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	871 if exists(join(self.mxDir, 'imports')):
bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	872 abort('multiple suites are not supported in this version of mx')
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	873
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	874 def _load_env(self):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	875 e = join(self.mxDir, 'env')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	876 if exists(e):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	877 with open(e) as f:
10585 be8b942f448f made parsing of mx/env more robust Doug Simon <doug.simon@oracle.com> parents: 10576 diff changeset	878 lineNum = 0
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	879 for line in f:
10585 be8b942f448f made parsing of mx/env more robust Doug Simon <doug.simon@oracle.com> parents: 10576 diff changeset	880 lineNum = lineNum + 1
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	881 line = line.strip()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	882 if len(line) != 0 and line[0] != '#':
10585 be8b942f448f made parsing of mx/env more robust Doug Simon <doug.simon@oracle.com> parents: 10576 diff changeset	883 if not '=' in line:
be8b942f448f made parsing of mx/env more robust Doug Simon <doug.simon@oracle.com> parents: 10576 diff changeset	884 abort(e + ':' + str(lineNum) + ': line does not match pattern "key=value"')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	885 key, value = line.split('=', 1)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	886 os.environ[key.strip()] = expandvars_in_property(value.strip())
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	887
4180 383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	888 def _post_init(self, opts):
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	889 self._load_projects()
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	890 if self.requiredMxVersion is None:
e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	891 warn("This suite does not express any required mx version. Consider adding 'mxversion=<version>' to your projects file.")
e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	892 elif self.requiredMxVersion > version:
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	893 abort("This suite requires mx version " + str(self.requiredMxVersion) + " while your current mx version is " + str(version) + ". Please update mx.")
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	894 # set the global data structures, checking for conflicts unless _check_global_structures is False
4180 383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	895 for p in self.projects:
383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	896 existing = _projects.get(p.name)
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	897 if existing is not None:
4180 383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	898 abort('cannot override project ' + p.name + ' in ' + p.dir + " with project of the same name in " + existing.dir)
5821 0cd337450409 added support to mx for ignoring (broken) projects Doug Simon <doug.simon@oracle.com> parents: 5782 diff changeset	899 if not p.name in _opts.ignored_projects:
0cd337450409 added support to mx for ignoring (broken) projects Doug Simon <doug.simon@oracle.com> parents: 5782 diff changeset	900 _projects[p.name] = p
4180 383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	901 for l in self.libs:
383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	902 existing = _libs.get(l.name)
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	903 # Check that suites that define same library are consistent
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	904 if existing is not None and existing != l:
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	905 abort('inconsistent library redefinition of ' + l.name + ' in ' + existing.suite.dir + ' and ' + l.suite.dir)
4180 383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	906 _libs[l.name] = l
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	907 for l in self.jreLibs:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	908 existing = _jreLibs.get(l.name)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	909 # Check that suites that define same library are consistent
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	910 if existing is not None and existing != l:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	911 abort('inconsistent JRE library redefinition of ' + l.name + ' in ' + existing.suite.dir + ' and ' + l.suite.dir)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	912 _jreLibs[l.name] = l
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	913 for d in self.dists:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	914 existing = _dists.get(d.name)
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	915 if existing is not None:
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	916 # allow redefinition, so use path from existing
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	917 # abort('cannot redefine distribution ' + d.name)
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	918 warn('distribution ' + d.name + ' redefined')
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	919 d.path = existing.path
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	920 _dists[d.name] = d
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	921
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	922 # Remove projects and libraries that (recursively) depend on an optional library
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	923 # whose artifact does not exist or on a JRE library that is not present in the
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	924 # JDK for a project. Also remove projects whose Java compliance requirement
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	925 # cannot be satisfied by the configured JDKs.
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	926 #
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	927 # Removed projects and libraries are also removed from
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	928 # distributions in they are listed as dependencies.
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	929 for d in sorted_deps(includeLibs=True):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	930 if d.isLibrary():
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	931 if d.optional:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	932 try:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	933 d.optional = False
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	934 path = d.get_path(resolve=True)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	935 except SystemExit:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	936 path = None
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	937 finally:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	938 d.optional = True
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	939 if not path:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	940 logv('[omitting optional library {} as {} does not exist]'.format(d, d.path))
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	941 del _libs[d.name]
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	942 self.libs.remove(d)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	943 elif d.isProject():
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	944 if java(d.javaCompliance) is None:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	945 logv('[omitting project {} as Java compliance {} cannot be satisfied by configured JDKs]'.format(d, d.javaCompliance))
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	946 del _projects[d.name]
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	947 self.projects.remove(d)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	948 else:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	949 for name in list(d.deps):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	950 jreLib = _jreLibs.get(name)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	951 if jreLib:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	952 if not jreLib.is_present_in_jdk(java(d.javaCompliance)):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	953 if jreLib.optional:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	954 logv('[omitting project {} as dependency {} is missing]'.format(d, name))
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	955 del _projects[d.name]
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	956 self.projects.remove(d)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	957 else:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	958 abort('JRE library {} required by {} not found'.format(jreLib, d))
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	959 elif not dependency(name, fatalIfMissing=False):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	960 logv('[omitting project {} as dependency {} is missing]'.format(d, name))
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	961 del _projects[d.name]
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	962 self.projects.remove(d)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	963 for dist in _dists.values():
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	964 for name in list(dist.deps):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	965 if not dependency(name, fatalIfMissing=False):
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	966 logv('[omitting {} from distribution {}]'.format(name, dist))
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	967 dist.deps.remove(name)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	968
8134 6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	969 if hasattr(self, 'mx_post_parse_cmd_line'):
6e3ebc6fd5a4 graal.jar is installed in all JDKs every time it is updated (GRAAL-136) Doug Simon <doug.simon@oracle.com> parents: 8131 diff changeset	970 self.mx_post_parse_cmd_line(opts)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	971
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	972 class XMLElement(xml.dom.minidom.Element):
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	973 def writexml(self, writer, indent="", addindent="", newl=""):
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	974 writer.write(indent + "<" + self.tagName)
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	975
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	976 attrs = self._get_attributes()
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	977 a_names = attrs.keys()
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	978 a_names.sort()
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	979
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	980 for a_name in a_names:
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	981 writer.write(" %s=\"" % a_name)
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	982 xml.dom.minidom._write_data(writer, attrs[a_name].value)
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	983 writer.write("\"")
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	984 if self.childNodes:
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	985 if not self.ownerDocument.padTextNodeWithoutSiblings and len(self.childNodes) == 1 and isinstance(self.childNodes[0], xml.dom.minidom.Text):
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	986 # if the only child of an Element node is a Text node, then the
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	987 # text is printed without any indentation or new line padding
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	988 writer.write(">")
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	989 self.childNodes[0].writexml(writer)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	990 writer.write("</%s>%s" % (self.tagName, newl))
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	991 else:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	992 writer.write(">%s" % (newl))
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	993 for node in self.childNodes:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	994 node.writexml(writer, indent + addindent, addindent, newl)
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	995 writer.write("%s</%s>%s" % (indent, self.tagName, newl))
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	996 else:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	997 writer.write("/>%s" % (newl))
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	998
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	999 class XMLDoc(xml.dom.minidom.Document):
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1000
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1001 def __init__(self):
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1002 xml.dom.minidom.Document.__init__(self)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1003 self.current = self
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	1004 self.padTextNodeWithoutSiblings = False
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	1005
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	1006 def createElement(self, tagName):
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	1007 # overwritten to create XMLElement
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	1008 e = XMLElement(tagName)
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	1009 e.ownerDocument = self
70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	1010 return e
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1011
8302 b246434a3e4a made build-graal.xml be generated by mx Doug Simon <doug.simon@oracle.com> parents: 8189 diff changeset	1012 def comment(self, txt):
b246434a3e4a made build-graal.xml be generated by mx Doug Simon <doug.simon@oracle.com> parents: 8189 diff changeset	1013 self.current.appendChild(self.createComment(txt))
b246434a3e4a made build-graal.xml be generated by mx Doug Simon <doug.simon@oracle.com> parents: 8189 diff changeset	1014
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1015 def open(self, tag, attributes=None, data=None):
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1016 if attributes is None:
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1017 attributes = {}
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1018 element = self.createElement(tag)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1019 for key, value in attributes.items():
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1020 element.setAttribute(key, value)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1021 self.current.appendChild(element)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1022 self.current = element
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	1023 if data is not None:
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	1024 element.appendChild(self.createTextNode(data))
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1025 return self
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1026
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	1027 def close(self, tag):
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1028 assert self.current != self
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1029 assert tag == self.current.tagName, str(tag) + ' != ' + self.current.tagName
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1030 self.current = self.current.parentNode
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1031 return self
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1032
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1033 def element(self, tag, attributes=None, data=None):
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1034 if attributes is None:
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1035 attributes = {}
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	1036 return self.open(tag, attributes, data).close(tag)
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1037
8633 c4bca84d86d7 ensure generated Jar.launch files have the same format as that produced when refreshing in Eclipse Doug Simon <doug.simon@oracle.com> parents: 8607 diff changeset	1038 def xml(self, indent='', newl='', escape=False, standalone=None):
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1039 assert self.current == self
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1040 result = self.toprettyxml(indent, newl, encoding="UTF-8")
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1041 if escape:
13968 6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings Bernhard Urban <bernhard.urban@jku.at> parents: 13952 diff changeset	1042 entities = {'"': """, "'": "'", '\n': ' '}
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1043 result = xml.sax.saxutils.escape(result, entities)
8633 c4bca84d86d7 ensure generated Jar.launch files have the same format as that produced when refreshing in Eclipse Doug Simon <doug.simon@oracle.com> parents: 8607 diff changeset	1044 if standalone is not None:
c4bca84d86d7 ensure generated Jar.launch files have the same format as that produced when refreshing in Eclipse Doug Simon <doug.simon@oracle.com> parents: 8607 diff changeset	1045 result = result.replace('encoding="UTF-8"?>', 'encoding="UTF-8" standalone="' + str(standalone) + '"?>')
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1046 return result
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	1047
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1048 def get_os():
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1049 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1050 Get a canonical form of sys.platform.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1051 """
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1052 if sys.platform.startswith('darwin'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1053 return 'darwin'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1054 elif sys.platform.startswith('linux'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1055 return 'linux'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1056 elif sys.platform.startswith('sunos'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1057 return 'solaris'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1058 elif sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1059 return 'windows'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1060 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1061 abort('Unknown operating system ' + sys.platform)
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	1062
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1063 def _loadSuite(mxDir, primary=False):
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	1064 """
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1065 Load a suite from 'mxDir'.
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	1066 """
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1067 for s in _suites.itervalues():
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1068 if s.mxDir == mxDir:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1069 return s
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1070 # create the new suite
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1071 s = Suite(mxDir, primary)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1072 return s
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1073
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1074 def suites(opt_limit_to_suite=False):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1075 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1076 Get the list of all loaded suites.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1077 """
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	1078 return _suites.values()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1079
9193 c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1080 def suite(name, fatalIfMissing=True):
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1081 """
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1082 Get the suite for a given name.
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1083 """
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1084 s = _suites.get(name)
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1085 if s is None and fatalIfMissing:
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1086 abort('suite named ' + name + ' not found')
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1087 return s
c8f4e1081c0b support for referencing commands in other suites (e.g. mx.suite('graal').commands.build([])) Doug Simon <doug.simon@oracle.com> parents: 9144 diff changeset	1088
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1089
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1090 def projects_from_names(projectNames):
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1091 """
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1092 Get the list of projects corresponding to projectNames; all projects if None
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1093 """
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1094 if projectNames is None:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1095 return projects()
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1096 else:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1097 return [project(name) for name in projectNames]
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1098
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1099 def projects(opt_limit_to_suite=False):
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1100 """
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1101 Get the list of all loaded projects limited by --suite option if opt_limit_to_suite == True
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1102 """
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	1103
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1104 if opt_limit_to_suite:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1105 return _projects_opt_limit_to_suites(_projects.values())
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1106 else:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1107 return _projects.values()
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1108
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1109 def projects_opt_limit_to_suites():
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1110 """
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1111 Get the list of all loaded projects optionally limited by --suite option
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1112 """
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1113 return projects(True)
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1114
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1115 def _projects_opt_limit_to_suites(projects):
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	1116 return projects
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1117
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1118 def annotation_processors():
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1119 """
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1120 Get the list of all loaded projects that define an annotation processor.
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1121 """
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1122 global _annotationProcessors
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1123 if _annotationProcessors is None:
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1124 aps = set()
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1125 for p in projects():
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1126 for ap in p.annotation_processors():
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1127 if project(ap, False):
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1128 aps.add(ap)
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1129 _annotationProcessors = list(aps)
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1130 return _annotationProcessors
719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	1131
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1132 def distribution(name, fatalIfMissing=True):
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1133 """
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1134 Get the distribution for a given name. This will abort if the named distribution does
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1135 not exist and 'fatalIfMissing' is true.
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1136 """
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1137 d = _dists.get(name)
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1138 if d is None and fatalIfMissing:
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1139 abort('distribution named ' + name + ' not found')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1140 return d
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	1141
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1142 def dependency(name, fatalIfMissing=True):
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1143 """
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1144 Get the project or library for a given name. This will abort if a project or library does
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1145 not exist for 'name' and 'fatalIfMissing' is true.
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1146 """
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1147 d = _projects.get(name)
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1148 if d is None:
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1149 d = _libs.get(name)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	1150 if d is None:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	1151 d = _jreLibs.get(name)
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1152 if d is None and fatalIfMissing:
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1153 if name in _opts.ignored_projects:
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1154 abort('project named ' + name + ' is ignored')
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1155 abort('project or library named ' + name + ' not found')
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1156 return d
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1157
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1158 def project(name, fatalIfMissing=True):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1159 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1160 Get the project for a given name. This will abort if the named project does
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1161 not exist and 'fatalIfMissing' is true.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1162 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1163 p = _projects.get(name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1164 if p is None and fatalIfMissing:
5821 0cd337450409 added support to mx for ignoring (broken) projects Doug Simon <doug.simon@oracle.com> parents: 5782 diff changeset	1165 if name in _opts.ignored_projects:
0cd337450409 added support to mx for ignoring (broken) projects Doug Simon <doug.simon@oracle.com> parents: 5782 diff changeset	1166 abort('project named ' + name + ' is ignored')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1167 abort('project named ' + name + ' not found')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1168 return p
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1169
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1170 def library(name, fatalIfMissing=True):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1171 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1172 Gets the library for a given name. This will abort if the named library does
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1173 not exist and 'fatalIfMissing' is true.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1174 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1175 l = _libs.get(name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1176 if l is None and fatalIfMissing:
14781 d2038d372cd2 changed distribution dependency exclusion mechanism to be only for library dependencies Doug Simon <doug.simon@oracle.com> parents: 14775 diff changeset	1177 if _projects.get(name):
d2038d372cd2 changed distribution dependency exclusion mechanism to be only for library dependencies Doug Simon <doug.simon@oracle.com> parents: 14775 diff changeset	1178 abort(name + ' is a project, not a library')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1179 abort('library named ' + name + ' not found')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1180 return l
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1181
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1182 def _as_classpath(deps, resolve):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1183 cp = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1184 if _opts.cp_prefix is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1185 cp = [_opts.cp_prefix]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1186 for d in deps:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1187 d.append_to_classpath(cp, resolve)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1188 if _opts.cp_suffix is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1189 cp += [_opts.cp_suffix]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1190 return os.pathsep.join(cp)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1191
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1192 def classpath(names=None, resolve=True, includeSelf=True, includeBootClasspath=False):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1193 """
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1194 Get the class path for a list of given dependencies, resolving each entry in the
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1195 path (e.g. downloading a missing library) if 'resolve' is true.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1196 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1197 if names is None:
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1198 result = _as_classpath(sorted_deps(includeLibs=True), resolve)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1199 else:
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1200 deps = []
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1201 if isinstance(names, types.StringTypes):
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1202 names = [names]
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1203 for n in names:
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	1204 dependency(n).all_deps(deps, True, includeSelf)
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1205 result = _as_classpath(deps, resolve)
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1206 if includeBootClasspath:
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1207 result = os.pathsep.join([java().bootclasspath(), result])
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1208 return result
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1209
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1210 def classpath_walk(names=None, resolve=True, includeSelf=True, includeBootClasspath=False):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1211 """
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1212 Walks the resources available in a given classpath, yielding a tuple for each resource
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1213 where the first member of the tuple is a directory path or ZipFile object for a
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1214 classpath entry and the second member is the qualified path of the resource relative
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1215 to the classpath entry.
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1216 """
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1217 cp = classpath(names, resolve, includeSelf, includeBootClasspath)
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1218 for entry in cp.split(os.pathsep):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1219 if not exists(entry):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1220 continue
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1221 if isdir(entry):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1222 for root, dirs, files in os.walk(entry):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1223 for d in dirs:
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1224 entryPath = join(root[len(entry) + 1:], d)
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1225 yield entry, entryPath
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1226 for f in files:
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1227 entryPath = join(root[len(entry) + 1:], f)
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1228 yield entry, entryPath
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1229 elif entry.endswith('.jar') or entry.endswith('.zip'):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1230 with zipfile.ZipFile(entry, 'r') as zf:
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1231 for zi in zf.infolist():
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1232 entryPath = zi.filename
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1233 yield zf, entryPath
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1234
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	1235 def sorted_deps(projectNames=None, includeLibs=False, includeAnnotationProcessors=False):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1236 """
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1237 Gets projects and libraries sorted such that dependencies
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1238 are before the projects that depend on them. Unless 'includeLibs' is
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1239 true, libraries are omitted from the result.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1240 """
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1241 projects = projects_from_names(projectNames)
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	1242
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1243 return sorted_project_deps(projects, includeLibs=includeLibs, includeAnnotationProcessors=includeAnnotationProcessors)
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1244
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	1245 def sorted_project_deps(projects, includeLibs=False, includeAnnotationProcessors=False):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1246 deps = []
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1247 for p in projects:
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	1248 p.all_deps(deps, includeLibs=includeLibs, includeAnnotationProcessors=includeAnnotationProcessors)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1249 return deps
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1250
11301 8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1251 def _handle_missing_java_home():
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1252 if not sys.stdout.isatty():
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1253 abort('Could not find bootstrap JDK. Use --java-home option or ensure JAVA_HOME environment variable is set.')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1254
11301 8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1255 candidateJdks = []
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1256 if get_os() == 'darwin':
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1257 base = '/Library/Java/JavaVirtualMachines'
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1258 candidateJdks = [join(base, n, 'Contents/Home') for n in os.listdir(base) if exists(join(base, n, 'Contents/Home'))]
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1259 elif get_os() == 'linux':
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1260 base = '/usr/lib/jvm'
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1261 candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1262 elif get_os() == 'solaris':
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1263 base = '/usr/jdk/instances'
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1264 candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1265 elif get_os() == 'windows':
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1266 base = r'C:\Program Files\Java'
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1267 candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, r'jre\lib\rt.jar'))]
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1268
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1269 javaHome = None
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1270 if len(candidateJdks) != 0:
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1271 javaHome = select_items(candidateJdks + ['<other>'], allowMultiple=False)
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1272 if javaHome == '<other>':
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1273 javaHome = None
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1274
11301 8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1275 while javaHome is None:
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1276 javaHome = raw_input('Enter path of bootstrap JDK: ')
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1277 rtJarPath = join(javaHome, 'jre', 'lib', 'rt.jar')
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1278 if not exists(rtJarPath):
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1279 log('Does not appear to be a valid JDK as ' + rtJarPath + ' does not exist')
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1280 javaHome = None
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1281 else:
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1282 break
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1283
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	1284 envPath = join(_primary_suite.mxDir, 'env')
11511 3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	1285 if ask_yes_no('Persist this setting by adding "JAVA_HOME=' + javaHome + '" to ' + envPath, 'y'):
11301 8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1286 with open(envPath, 'a') as fp:
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1287 print >> fp, 'JAVA_HOME=' + javaHome
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1288
11301 8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1289 return javaHome
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1290
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1291 class ArgParser(ArgumentParser):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1292 # Override parent to append the list of available commands
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1293 def format_help(self):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1294 return ArgumentParser.format_help(self) + _format_commands()
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1295
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1296
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1297 def __init__(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1298 self.java_initialized = False
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	1299 # this doesn't resolve the right way, but can't figure out how to override _handle_conflict_resolve in _ActionsContainer
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	1300 ArgumentParser.__init__(self, prog='mx', conflict_handler='resolve')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1301
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1302 self.add_argument('-v', action='store_true', dest='verbose', help='enable verbose output')
5091 54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1303 self.add_argument('-V', action='store_true', dest='very_verbose', help='enable very verbose output')
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	1304 self.add_argument('-w', action='store_true', dest='warn', help='enable warning messages')
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	1305 self.add_argument('-p', '--primary-suite-path', help='set the primary suite directory', metavar='<path>')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1306 self.add_argument('--dbg', type=int, dest='java_dbg_port', help='make Java processes wait on <port> for a debugger', metavar='<port>')
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1307 self.add_argument('-d', action='store_const', const=8000, dest='java_dbg_port', help='alias for "-dbg 8000"')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1308 self.add_argument('--cp-pfx', dest='cp_prefix', help='class path prefix', metavar='<arg>')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1309 self.add_argument('--cp-sfx', dest='cp_suffix', help='class path suffix', metavar='<arg>')
13952 b076b5c13c3f mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments. Gilles Duboscq <duboscq@ssw.jku.at> parents: 13951 diff changeset	1310 self.add_argument('--J', dest='java_args', help='Java VM arguments (e.g. --J @-dsa)', metavar='@<args>')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1311 self.add_argument('--Jp', action='append', dest='java_args_pfx', help='prefix Java VM arguments (e.g. --Jp @-dsa)', metavar='@<args>', default=[])
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1312 self.add_argument('--Ja', action='append', dest='java_args_sfx', help='suffix Java VM arguments (e.g. --Ja @-dsa)', metavar='@<args>', default=[])
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1313 self.add_argument('--user-home', help='users home directory', metavar='<path>', default=os.path.expanduser('~'))
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1314 self.add_argument('--java-home', help='primary JDK directory (must be JDK 7 or later)', metavar='<path>')
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1315 self.add_argument('--extra-java-homes', help='secondary JDK directories separated by "' + os.pathsep + '"', metavar='<path>')
5821 0cd337450409 added support to mx for ignoring (broken) projects Doug Simon <doug.simon@oracle.com> parents: 5782 diff changeset	1316 self.add_argument('--ignore-project', action='append', dest='ignored_projects', help='name of project to ignore', metavar='<name>', default=[])
14135 ee66410c0679 mx: add option to send sigquit before killing child Bernhard Urban <bernhard.urban@jku.at> parents: 14134 diff changeset	1317 self.add_argument('--kill-with-sigquit', action='store_true', dest='killwithsigquit', help='send sigquit first before killing child processes')
4239 676feaf8adee Made the --timeout option apply to the whole mx command as opposed to each subprocess executed (the new --ptimeout does the latter). Doug Simon <doug.simon@oracle.com> parents: 4236 diff changeset	1318 if get_os() != 'windows':
676feaf8adee Made the --timeout option apply to the whole mx command as opposed to each subprocess executed (the new --ptimeout does the latter). Doug Simon <doug.simon@oracle.com> parents: 4236 diff changeset	1319 # Time outs are (currently) implemented with Unix specific functionality
11401 2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1320 self.add_argument('--timeout', help='timeout (in seconds) for command', type=int, default=0, metavar='<secs>')
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1321 self.add_argument('--ptimeout', help='timeout (in seconds) for subprocesses', type=int, default=0, metavar='<secs>')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1322
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1323 def _parse_cmd_line(self, args=None):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1324 if args is None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1325 args = sys.argv[1:]
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1326
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1327 self.add_argument('commandAndArgs', nargs=REMAINDER, metavar='command args...')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1328
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1329 opts = self.parse_args()
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1330
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	1331 # Give the timeout options a default value to avoid the need for hasattr() tests
2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	1332 opts.__dict__.setdefault('timeout', 0)
2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	1333 opts.__dict__.setdefault('ptimeout', 0)
4149 cf4de9cc1268 Integrated latest mxtool updates. Doug Simon <doug.simon@oracle.com> parents: 4148 diff changeset	1334
5091 54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1335 if opts.very_verbose:
54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1336 opts.verbose = True
54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1337
4149 cf4de9cc1268 Integrated latest mxtool updates. Doug Simon <doug.simon@oracle.com> parents: 4148 diff changeset	1338 if opts.java_home is None:
cf4de9cc1268 Integrated latest mxtool updates. Doug Simon <doug.simon@oracle.com> parents: 4148 diff changeset	1339 opts.java_home = os.environ.get('JAVA_HOME')
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1340 if opts.extra_java_homes is None:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1341 opts.extra_java_homes = os.environ.get('EXTRA_JAVA_HOMES')
4149 cf4de9cc1268 Integrated latest mxtool updates. Doug Simon <doug.simon@oracle.com> parents: 4148 diff changeset	1342
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1343 if opts.java_home is None or opts.java_home == '':
11301 8bcae501c51b added dialogue for determining JAVA_HOME if it's not set Doug Simon <doug.simon@oracle.com> parents: 11295 diff changeset	1344 opts.java_home = _handle_missing_java_home()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1345
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1346 if opts.user_home is None or opts.user_home == '':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1347 abort('Could not find user home. Use --user-home option or ensure HOME environment variable is set.')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1348
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1349 os.environ['JAVA_HOME'] = opts.java_home
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1350 os.environ['HOME'] = opts.user_home
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1351
5821 0cd337450409 added support to mx for ignoring (broken) projects Doug Simon <doug.simon@oracle.com> parents: 5782 diff changeset	1352 opts.ignored_projects = opts.ignored_projects + os.environ.get('IGNORED_PROJECTS', '').split(',')
0cd337450409 added support to mx for ignoring (broken) projects Doug Simon <doug.simon@oracle.com> parents: 5782 diff changeset	1353
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1354 commandAndArgs = opts.__dict__.pop('commandAndArgs')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1355 return opts, commandAndArgs
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1356
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	1357 def _handle_conflict_resolve(self, action, conflicting_actions):
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	1358 self._handle_conflict_error(action, conflicting_actions)
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	1359
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1360 def _format_commands():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1361 msg = '\navailable commands:\n\n'
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1362 for cmd in sorted(_commands.iterkeys()):
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1363 c, _ = _commands[cmd][:2]
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1364 doc = c.__doc__
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1365 if doc is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1366 doc = ''
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1367 msg += ' {0:<20} {1}\n'.format(cmd, doc.split('\n', 1)[0])
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1368 return msg + '\n'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1369
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1370 def java(requiredCompliance=None):
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1371 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1372 Get a JavaConfig object containing Java commands launch details.
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1373 If requiredCompliance is None, the compliance level specified by --java-home/JAVA_HOME
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1374 is returned. Otherwise, the JavaConfig exactly matching requiredCompliance is returned
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1375 or None if there is no exact match.
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1376 """
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1377 assert _java_homes
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1378 if not requiredCompliance:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1379 return _java_homes[0]
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1380 for java in _java_homes:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1381 if java.javaCompliance == requiredCompliance:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1382 return java
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1383 return None
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1384
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1385
14913 2d1cc640512c Add possibility to build using error-prone instead of javac. Gilles Duboscq <duboscq@ssw.jku.at> parents: 14907 diff changeset	1386 def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, addDefaultArgs=True, javaConfig=None):
2d1cc640512c Add possibility to build using error-prone instead of javac. Gilles Duboscq <duboscq@ssw.jku.at> parents: 14907 diff changeset	1387 if not javaConfig:
2d1cc640512c Add possibility to build using error-prone instead of javac. Gilles Duboscq <duboscq@ssw.jku.at> parents: 14907 diff changeset	1388 javaConfig = java()
2d1cc640512c Add possibility to build using error-prone instead of javac. Gilles Duboscq <duboscq@ssw.jku.at> parents: 14907 diff changeset	1389 return run(javaConfig.format_cmd(args, addDefaultArgs), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1390
14153 e328f28f7401 fix for mx, did not compile on Windows Christian Wirth <christian.wirth@oracle.com> parents: 14136 diff changeset	1391 def _kill_process_group(pid, sig):
14538 5454f6bf50bf fix for mx, did not compile on Windows Christian Wirth <christian.wirth@oracle.com> parents: 14136 diff changeset	1392 if not sig:
5454f6bf50bf fix for mx, did not compile on Windows Christian Wirth <christian.wirth@oracle.com> parents: 14136 diff changeset	1393 sig = signal.SIGKILL
4241 8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1394 pgid = os.getpgid(pid)
8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1395 try:
14134 e71d421370f3 mx: proxy SIGQUIT to child process Bernhard Urban <bernhard.urban@jku.at> parents: 14133 diff changeset	1396 os.killpg(pgid, sig)
4241 8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1397 return True
8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1398 except:
8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1399 log('Error killing subprocess ' + str(pgid) + ': ' + str(sys.exc_info()[1]))
8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1400 return False
8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1401
4158 f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1402 def _waitWithTimeout(process, args, timeout):
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1403 def _waitpid(pid):
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1404 while True:
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1405 try:
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1406 return os.waitpid(pid, os.WNOHANG)
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1407 except OSError, e:
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1408 if e.errno == errno.EINTR:
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1409 continue
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1410 raise
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1411
4236 11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1412 def _returncode(status):
11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1413 if os.WIFSIGNALED(status):
11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1414 return -os.WTERMSIG(status)
11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1415 elif os.WIFEXITED(status):
11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1416 return os.WEXITSTATUS(status)
11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1417 else:
11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1418 # Should never happen
11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1419 raise RuntimeError("Unknown child exit status!")
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1420
4158 f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1421 end = time.time() + timeout
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1422 delay = 0.0005
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1423 while True:
4236 11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1424 (pid, status) = _waitpid(process.pid)
4158 f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1425 if pid == process.pid:
4236 11383dafc318 Fixed bug in getting correct result code for a subprocess executed with a timeout. Doug Simon <doug.simon@oracle.com> parents: 4234 diff changeset	1426 return _returncode(status)
4158 f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1427 remaining = end - time.time()
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1428 if remaining <= 0:
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1429 abort('Process timed out after {0} seconds: {1}'.format(timeout, ' '.join(args)))
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1430 delay = min(delay * 2, remaining, .05)
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1431 time.sleep(delay)
f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1432
4242 3e25132be4b4 Disabled eager resolution of libraries as they are defined. Doug Simon <doug.simon@oracle.com> parents: 4241 diff changeset	1433 # Makes the current subprocess accessible to the abort() function
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1434 # This is a list of tuples of the subprocess.Popen or
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1435 # multiprocessing.Process object and args.
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1436 _currentSubprocesses = []
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1437
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1438 def _addSubprocess(p, args):
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1439 entry = (p, args)
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1440 _currentSubprocesses.append(entry)
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1441 return entry
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1442
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1443 def _removeSubprocess(entry):
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1444 if entry and entry in _currentSubprocesses:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1445 try:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1446 _currentSubprocesses.remove(entry)
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1447 except:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1448 pass
4241 8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1449
4660 b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1450 def waitOn(p):
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1451 if get_os() == 'windows':
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1452 # on windows use a poll loop, otherwise signal does not get handled
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1453 retcode = None
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1454 while retcode == None:
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1455 retcode = p.poll()
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1456 time.sleep(0.05)
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1457 else:
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1458 retcode = p.wait()
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1459 return retcode
b06ade6e927c Fixed Ctrl+C for Windows in mx.py Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4482 diff changeset	1460
8884 51a8368d0231 Adapt to changes in hotspot makefiles : pass our JAVA_HOME as ALT_BOOTDIR (so that things are built with a 'safe' jdk) and our jdk copy as JAVA_HOME (so that the jvm gets installed there) Gilles Duboscq <duboscq@ssw.jku.at> parents: 8633 diff changeset	1461 def run(args, nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=None, env=None):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1462 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1463 Run a command in a subprocess, wait for it to complete and return the exit status of the process.
4158 f3a50640333b Added support for specifying a timeout when running an external command. Doug Simon <doug.simon@oracle.com> parents: 4150 diff changeset	1464 If the exit status is non-zero and `nonZeroIsFatal` is true, then mx is exited with
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1465 the same exit status.
4225 339cf8d4904d Made mx.run work properly when stderr is redirected to stdout. Doug Simon <doug.simon@oracle.com> parents: 4219 diff changeset	1466 Each line of the standard output and error streams of the subprocess are redirected to
339cf8d4904d Made mx.run work properly when stderr is redirected to stdout. Doug Simon <doug.simon@oracle.com> parents: 4219 diff changeset	1467 out and err if they are callable objects.
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1468 """
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1469
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1470 assert isinstance(args, types.ListType), "'args' must be a list: " + str(args)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1471 for arg in args:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1472 assert isinstance(arg, types.StringTypes), 'argument is not a string: ' + str(arg)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1473
9262 0f4ae7bbe062 fixed bug in handling of -V mx option Doug Simon <doug.simon@oracle.com> parents: 9193 diff changeset	1474 if env is None:
0f4ae7bbe062 fixed bug in handling of -V mx option Doug Simon <doug.simon@oracle.com> parents: 9193 diff changeset	1475 env = os.environ
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1476
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1477 if _opts.verbose:
5091 54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1478 if _opts.very_verbose:
54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1479 log('Environment variables:')
9262 0f4ae7bbe062 fixed bug in handling of -V mx option Doug Simon <doug.simon@oracle.com> parents: 9193 diff changeset	1480 for key in sorted(env.keys()):
0f4ae7bbe062 fixed bug in handling of -V mx option Doug Simon <doug.simon@oracle.com> parents: 9193 diff changeset	1481 log(' ' + key + '=' + env[key])
13950 35783e78eaef mx.run: shell-escape arguments when printing them in verbose mode Gilles Duboscq <duboscq@ssw.jku.at> parents: 13927 diff changeset	1482 log(' '.join(map(pipes.quote, args)))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1483
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	1484 if timeout is None and _opts.ptimeout != 0:
4241 8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1485 timeout = _opts.ptimeout
8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1486
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1487 sub = None
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1488 try:
4241 8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1489 # On Unix, the new subprocess should be in a separate group so that a timeout alarm
8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1490 # can use os.killpg() to kill the whole subprocess group
4252 67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4248 diff changeset	1491 preexec_fn = None
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4248 diff changeset	1492 creationflags = 0
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4248 diff changeset	1493 if get_os() == 'windows':
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4248 diff changeset	1494 creationflags = subprocess.CREATE_NEW_PROCESS_GROUP
67e88b7624d5 Removed need for GRAAL environment variable on Windows. Doug Simon <doug.simon@oracle.com> parents: 4248 diff changeset	1495 else:
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1496 preexec_fn = os.setsid
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1497
12689 697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1498 def redirect(stream, f):
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1499 for line in iter(stream.readline, ''):
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1500 f(line)
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1501 stream.close()
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1502 stdout = out if not callable(out) else subprocess.PIPE
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1503 stderr = err if not callable(err) else subprocess.PIPE
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1504 p = subprocess.Popen(args, cwd=cwd, stdout=stdout, stderr=stderr, preexec_fn=preexec_fn, creationflags=creationflags, env=env)
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1505 sub = _addSubprocess(p, args)
12689 697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1506 if callable(out):
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1507 t = Thread(target=redirect, args=(p.stdout, out))
15701 16059f6f5661 mx: drain all output from subprocess if redirecting to functions Doug Simon <doug.simon@oracle.com> parents: 15697 diff changeset	1508 # Don't make the reader thread a daemon otherwise output can be droppped
12689 697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1509 t.start()
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1510 if callable(err):
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1511 t = Thread(target=redirect, args=(p.stderr, err))
15701 16059f6f5661 mx: drain all output from subprocess if redirecting to functions Doug Simon <doug.simon@oracle.com> parents: 15697 diff changeset	1512 # Don't make the reader thread a daemon otherwise output can be droppped
12689 697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1513 t.start()
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1514 if timeout is None or timeout == 0:
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1515 retcode = waitOn(p)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1516 else:
12689 697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1517 if get_os() == 'windows':
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1518 abort('Use of timeout not (yet) supported on Windows')
697ef4cf18c0 mx.run should support streams for out/err even if there is no timeout Gilles Duboscq <duboscq@ssw.jku.at> parents: 12684 diff changeset	1519 retcode = _waitWithTimeout(p, args, timeout)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1520 except OSError as e:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1521 log('Error executing \'' + ' '.join(args) + '\': ' + str(e))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1522 if _opts.verbose:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1523 raise e
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1524 abort(e.errno)
4242 3e25132be4b4 Disabled eager resolution of libraries as they are defined. Doug Simon <doug.simon@oracle.com> parents: 4241 diff changeset	1525 except KeyboardInterrupt:
3e25132be4b4 Disabled eager resolution of libraries as they are defined. Doug Simon <doug.simon@oracle.com> parents: 4241 diff changeset	1526 abort(1)
4241 8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	1527 finally:
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1528 _removeSubprocess(sub)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1529
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1530 if retcode and nonZeroIsFatal:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1531 if _opts.verbose:
5091 54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1532 if _opts.very_verbose:
54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1533 raise subprocess.CalledProcessError(retcode, ' '.join(args))
54819cdcca7f Added -V option to mx for 'very verbose'which prints the environment variables used for an external command. Doug Simon <doug.simon@oracle.com> parents: 5072 diff changeset	1534 else:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1535 log('[exit code: ' + str(retcode) + ']')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1536 abort(retcode)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1537
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1538 return retcode
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1539
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1540 def exe_suffix(name):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1541 """
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1542 Gets the platform specific suffix for an executable
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1543 """
4258 8d2c14f722ac mx.py: fix OS detection in exe_suffix() Andreas Woess <andreas.woess@jku.at> parents: 4257 diff changeset	1544 if get_os() == 'windows':
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1545 return name + '.exe'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1546 return name
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1547
11401 2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1548 def add_lib_prefix(name):
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1549 """
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1550 Adds the platform specific library prefix to a name
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4396 diff changeset	1551 """
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1552 os = get_os()
11401 2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1553 if os == 'linux' or os == 'solaris' or os == 'darwin':
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1554 return 'lib' + name
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1555 return name
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1556
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1557 def add_lib_suffix(name):
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1558 """
2d228d304247 minor improvements/cleanups to mx (CR-1313) Doug Simon <doug.simon@oracle.com> parents: 11374 diff changeset	1559 Adds the platform specific library suffix to a name
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4396 diff changeset	1560 """
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1561 os = get_os()
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4396 diff changeset	1562 if os == 'windows':
7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4396 diff changeset	1563 return name + '.dll'
5189 6fbf12b8e572 automated download of hsdis lib if PrintAssembly option is used; added support for hsdis on the Mac Doug Simon <doug.simon@oracle.com> parents: 5171 diff changeset	1564 if os == 'linux' or os == 'solaris':
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4396 diff changeset	1565 return name + '.so'
5189 6fbf12b8e572 automated download of hsdis lib if PrintAssembly option is used; added support for hsdis on the Mac Doug Simon <doug.simon@oracle.com> parents: 5171 diff changeset	1566 if os == 'darwin':
6fbf12b8e572 automated download of hsdis lib if PrintAssembly option is used; added support for hsdis on the Mac Doug Simon <doug.simon@oracle.com> parents: 5171 diff changeset	1567 return name + '.dylib'
4482 7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4396 diff changeset	1568 return name
7903b6c28f9c Add hsdis command to mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 4396 diff changeset	1569
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1570 """
12042 fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1571 Utility for filtering duplicate lines.
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1572 """
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1573 class DuplicateSuppressingStream:
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1574 """
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1575 Creates an object that will suppress duplicate lines sent to 'out'.
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1576 The lines considered for suppression are those that contain one of the
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1577 strings in 'restrictTo' if it is not None.
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1578 """
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1579 def __init__(self, restrictTo=None, out=sys.stdout):
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1580 self.restrictTo = restrictTo
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1581 self.seen = set()
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1582 self.out = out
14522 7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1583 self.currentFilteredLineCount = 0
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1584 self.currentFilteredTime = None
12042 fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1585
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1586 def isSuppressionCandidate(self, line):
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1587 if self.restrictTo:
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1588 for p in self.restrictTo:
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1589 if p in line:
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1590 return True
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1591 return False
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1592 else:
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1593 return True
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1594
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1595 def write(self, line):
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1596 if self.isSuppressionCandidate(line):
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1597 if line in self.seen:
14522 7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1598 self.currentFilteredLineCount += 1
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1599 if self.currentFilteredTime:
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1600 if time.time() - self.currentFilteredTime > 1 * 60:
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1601 self.out.write(" Filtered " + str(self.currentFilteredLineCount) + " repeated lines...\n")
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1602 self.currentFilteredTime = time.time()
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1603 else:
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1604 self.currentFilteredTime = time.time()
12042 fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1605 return
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1606 self.seen.add(line)
14522 7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1607 self.currentFilteredLineCount = 0
12042 fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1608 self.out.write(line)
14522 7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output Gilles Duboscq <duboscq@ssw.jku.at> parents: 14156 diff changeset	1609 self.currentFilteredTime = None
12042 fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1610
fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	1611 """
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1612 A JavaCompliance simplifies comparing Java compliance values extracted from a JDK version string.
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1613 """
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1614 class JavaCompliance:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1615 def __init__(self, ver):
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1616 m = re.match(r'1\.(\d+).*', ver)
5071 9d055af068a8 Made Java builds look for mx/ecj.jar to use Eclipse batch compiler by default. Doug Simon <doug.simon@oracle.com> parents: 5032 diff changeset	1617 assert m is not None, 'not a recognized version string: ' + ver
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1618 self.value = int(m.group(1))
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1619
13968 6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings Bernhard Urban <bernhard.urban@jku.at> parents: 13952 diff changeset	1620 def __str__(self):
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1621 return '1.' + str(self.value)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1622
13968 6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings Bernhard Urban <bernhard.urban@jku.at> parents: 13952 diff changeset	1623 def __cmp__(self, other):
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1624 if isinstance(other, types.StringType):
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1625 other = JavaCompliance(other)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1626
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1627 return cmp(self.value, other.value)
13779 fc5e2c808a23 fixed pylint warnings Doug Simon <doug.simon@oracle.com> parents: 13775 diff changeset	1628
13775 43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	1629 def __hash__(self):
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	1630 return self.value.__hash__()
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1631
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1632 """
13471 020099961eb4 renamed JavaVersion to VersionSpec Doug Simon <doug.simon@oracle.com> parents: 13470 diff changeset	1633 A version specification as defined in JSR-56
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1634 """
13471 020099961eb4 renamed JavaVersion to VersionSpec Doug Simon <doug.simon@oracle.com> parents: 13470 diff changeset	1635 class VersionSpec:
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1636 def __init__(self, versionString):
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1637 validChar = r'[\x21-\x25\x27-\x29\x2c\x2f-\x5e\x60-\x7f]'
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1638 separator = r'[.\-_]'
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	1639 m = re.match("^" + validChar + '+(' + separator + validChar + '+)*$', versionString)
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1640 assert m is not None, 'not a recognized version string: ' + versionString
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1641 self.versionString = versionString
8391 d1d486c03e8a Fix version parsing in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 8302 diff changeset	1642 self.parts = [int(f) if f.isdigit() else f for f in re.split(separator, versionString)]
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1643
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1644 def __str__(self):
9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1645 return self.versionString
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1646
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1647 def __cmp__(self, other):
9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1648 return cmp(self.parts, other.parts)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1649
14940 82971f397b94 mx.JavaConfig: filter non-existant paths from bootclasspath, extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14939 diff changeset	1650 def _filter_non_existant_paths(paths):
82971f397b94 mx.JavaConfig: filter non-existant paths from bootclasspath, extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14939 diff changeset	1651 return os.pathsep.join([path for path in paths.split(os.pathsep) if exists(path)])
82971f397b94 mx.JavaConfig: filter non-existant paths from bootclasspath, extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14939 diff changeset	1652
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1653 """
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1654 A JavaConfig object encapsulates info on how Java commands are run.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1655 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1656 class JavaConfig:
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1657 def __init__(self, java_home, java_dbg_port):
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1658 self.jdk = java_home
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1659 self.debug_port = java_dbg_port
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1660 self.jar = exe_suffix(join(self.jdk, 'bin', 'jar'))
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1661 self.java = exe_suffix(join(self.jdk, 'bin', 'java'))
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1662 self.javac = exe_suffix(join(self.jdk, 'bin', 'javac'))
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1663 self.javap = exe_suffix(join(self.jdk, 'bin', 'javap'))
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	1664 self.javadoc = exe_suffix(join(self.jdk, 'bin', 'javadoc'))
14913 2d1cc640512c Add possibility to build using error-prone instead of javac. Gilles Duboscq <duboscq@ssw.jku.at> parents: 14907 diff changeset	1665 self.toolsjar = join(self.jdk, 'lib', 'tools.jar')
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1666 self._bootclasspath = None
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	1667 self._extdirs = None
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	1668 self._endorseddirs = None
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1669
4257 32b8274f52ad Made 'mx ideinit' resolve library dependencies eagerly as well as put absolute paths into the generated Eclipse project configurations. Doug Simon <doug.simon@oracle.com> parents: 4252 diff changeset	1670 if not exists(self.java):
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1671 abort('Java launcher does not exist: ' + self.java)
4257 32b8274f52ad Made 'mx ideinit' resolve library dependencies eagerly as well as put absolute paths into the generated Eclipse project configurations. Doug Simon <doug.simon@oracle.com> parents: 4252 diff changeset	1672
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1673 def delAtAndSplit(s):
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1674 return shlex.split(s.lstrip('@'))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1675
13952 b076b5c13c3f mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments. Gilles Duboscq <duboscq@ssw.jku.at> parents: 13951 diff changeset	1676 self.java_args = delAtAndSplit(_opts.java_args) if _opts.java_args else []
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1677 self.java_args_pfx = sum(map(delAtAndSplit, _opts.java_args_pfx), [])
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1678 self.java_args_sfx = sum(map(delAtAndSplit, _opts.java_args_sfx), [])
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1679
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1680 # Prepend the -d64 VM option only if the java command supports it
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1681 try:
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	1682 output = subprocess.check_output([self.java, '-d64', '-version'], stderr=subprocess.STDOUT)
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1683 self.java_args = ['-d64'] + self.java_args
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1684 except subprocess.CalledProcessError as e:
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1685 try:
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	1686 output = subprocess.check_output([self.java, '-version'], stderr=subprocess.STDOUT)
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1687 except subprocess.CalledProcessError as e:
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1688 print e.output
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1689 abort(e.returncode)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1690
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	1691 output = output.split()
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	1692 assert output[1] == 'version'
13471 020099961eb4 renamed JavaVersion to VersionSpec Doug Simon <doug.simon@oracle.com> parents: 13470 diff changeset	1693 self.version = VersionSpec(output[2].strip('"'))
7916 9bff64f43299 Better java version numbers support in mx Gilles Duboscq <duboscq@ssw.jku.at> parents: 7787 diff changeset	1694 self.javaCompliance = JavaCompliance(self.version.versionString)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1695
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1696 if self.debug_port is not None:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1697 self.java_args += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(self.debug_port)]
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1698
14914 a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1699 def _init_classpaths(self):
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1700 myDir = dirname(__file__)
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1701 outDir = join(dirname(__file__), '.jdk' + str(self.version))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1702 if not exists(outDir):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1703 os.makedirs(outDir)
14914 a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1704 javaSource = join(myDir, 'ClasspathDump.java')
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1705 if not exists(join(outDir, 'ClasspathDump.class')):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1706 subprocess.check_call([self.javac, '-d', outDir, javaSource])
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1707 self._bootclasspath, self._extdirs, self._endorseddirs = [x if x != 'null' else None for x in subprocess.check_output([self.java, '-cp', outDir, 'ClasspathDump']).split('\|')]
14914 a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1708 if not self._bootclasspath or not self._extdirs or not self._endorseddirs:
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1709 warn("Could not find all classpaths: boot='" + str(self._bootclasspath) + "' extdirs='" + str(self._extdirs) + "' endorseddirs='" + str(self._endorseddirs) + "'")
14940 82971f397b94 mx.JavaConfig: filter non-existant paths from bootclasspath, extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14939 diff changeset	1710 self._bootclasspath = _filter_non_existant_paths(self._bootclasspath)
82971f397b94 mx.JavaConfig: filter non-existant paths from bootclasspath, extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14939 diff changeset	1711 self._extdirs = _filter_non_existant_paths(self._extdirs)
82971f397b94 mx.JavaConfig: filter non-existant paths from bootclasspath, extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14939 diff changeset	1712 self._endorseddirs = _filter_non_existant_paths(self._endorseddirs)
14914 a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1713
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1714 def __hash__(self):
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1715 return hash(self.jdk)
14764 5823c399e28f pylint fixes Bernhard Urban <bernhard.urban@jku.at> parents: 14763 diff changeset	1716
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1717 def __cmp__(self, other):
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1718 if isinstance(other, JavaConfig):
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1719 return cmp(self.javaCompliance, other.javaCompliance)
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1720 raise TypeError()
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	1721
13951 392b6ac8da36 Allow using run_java without the arguments from -J -Ja -Jp. Factor out the argument processing of mx_graal.vm and use it to pass tested-vm args down through the jmh harness Bernhard Urban <bernhard.urban@jku.at> parents: 13950 diff changeset	1722 def format_cmd(self, args, addDefaultArgs):
392b6ac8da36 Allow using run_java without the arguments from -J -Ja -Jp. Factor out the argument processing of mx_graal.vm and use it to pass tested-vm args down through the jmh harness Bernhard Urban <bernhard.urban@jku.at> parents: 13950 diff changeset	1723 if addDefaultArgs:
13952 b076b5c13c3f mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments. Gilles Duboscq <duboscq@ssw.jku.at> parents: 13951 diff changeset	1724 return [self.java] + self.processArgs(args)
13951 392b6ac8da36 Allow using run_java without the arguments from -J -Ja -Jp. Factor out the argument processing of mx_graal.vm and use it to pass tested-vm args down through the jmh harness Bernhard Urban <bernhard.urban@jku.at> parents: 13950 diff changeset	1725 else:
392b6ac8da36 Allow using run_java without the arguments from -J -Ja -Jp. Factor out the argument processing of mx_graal.vm and use it to pass tested-vm args down through the jmh harness Bernhard Urban <bernhard.urban@jku.at> parents: 13950 diff changeset	1726 return [self.java] + args
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1727
13952 b076b5c13c3f mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments. Gilles Duboscq <duboscq@ssw.jku.at> parents: 13951 diff changeset	1728 def processArgs(self, args):
b076b5c13c3f mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments. Gilles Duboscq <duboscq@ssw.jku.at> parents: 13951 diff changeset	1729 return self.java_args_pfx + self.java_args + self.java_args_sfx + args
b076b5c13c3f mx: factor out JavaConfig.processArgs and use it in mx vm. remove default -J arguments. Gilles Duboscq <duboscq@ssw.jku.at> parents: 13951 diff changeset	1730
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1731 def bootclasspath(self):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1732 if self._bootclasspath is None:
14914 a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1733 self._init_classpaths()
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1734 return self._bootclasspath
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	1735
14914 a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1736 def extdirs(self):
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1737 if self._extdirs is None:
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1738 self._init_classpaths()
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1739 return self._extdirs
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1740
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1741 def endorseddirs(self):
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1742 if self._endorseddirs is None:
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1743 self._init_classpaths()
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1744 return self._endorseddirs
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1745
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1746 def check_get_env(key):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1747 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1748 Gets an environment variable, aborting with a useful message if it is not set.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1749 """
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4161 diff changeset	1750 value = get_env(key)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1751 if value is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1752 abort('Required environment variable ' + key + ' must be set')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1753 return value
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1754
4227 1fe200db8c30 Environment variables for HotSpot's make are only set by mx.build if they aren't already defined. Doug Simon <doug.simon@oracle.com> parents: 4226 diff changeset	1755 def get_env(key, default=None):
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4161 diff changeset	1756 """
d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4161 diff changeset	1757 Gets an environment variable.
d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4161 diff changeset	1758 """
4227 1fe200db8c30 Environment variables for HotSpot's make are only set by mx.build if they aren't already defined. Doug Simon <doug.simon@oracle.com> parents: 4226 diff changeset	1759 value = os.environ.get(key, default)
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4161 diff changeset	1760 return value
d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4161 diff changeset	1761
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	1762 def logv(msg=None):
070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	1763 if _opts.verbose:
070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	1764 log(msg)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1765
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1766 def log(msg=None):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1767 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1768 Write a message to the console.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1769 All script output goes through this method thus allowing a subclass
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1770 to redirect it.
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1771 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1772 if msg is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1773 print
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1774 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1775 print msg
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1776
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1777 def expand_project_in_class_path_arg(cpArg):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1778 cp = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1779 for part in cpArg.split(os.pathsep):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1780 if part.startswith('@'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1781 cp += classpath(part[1:]).split(os.pathsep)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1782 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1783 cp.append(part)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1784 return os.pathsep.join(cp)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1785
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1786 def expand_project_in_args(args):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1787 for i in range(len(args)):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1788 if args[i] == '-cp' or args[i] == '-classpath':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1789 if i + 1 < len(args):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1790 args[i + 1] = expand_project_in_class_path_arg(args[i + 1])
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1791 return
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1792
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1793
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1794 def gmake_cmd():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1795 for a in ['make', 'gmake', 'gnumake']:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1796 try:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1797 output = subprocess.check_output([a, '--version'])
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1798 if 'GNU' in output:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1799 return a
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1800 except:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1801 pass
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1802 abort('Could not find a GNU make executable on the current path.')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1803
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1804 def expandvars_in_property(value):
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1805 result = expandvars(value)
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1806 if '$' in result or '%' in result:
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1807 abort('Property contains an undefined environment variable: ' + value)
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1808 return result
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1809
14135 ee66410c0679 mx: add option to send sigquit before killing child Bernhard Urban <bernhard.urban@jku.at> parents: 14134 diff changeset	1810 def _send_sigquit():
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1811 for p, args in _currentSubprocesses:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1812
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1813 def _isJava():
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1814 if args:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1815 name = args[0].split(os.sep)[-1]
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1816 return name == "java"
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1817 return False
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1818
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1819 if p is not None and _isJava():
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1820 if get_os() == 'windows':
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1821 log("mx: implement me! want to send SIGQUIT to my child process")
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1822 else:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1823 _kill_process_group(p.pid, sig=signal.SIGQUIT)
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1824 time.sleep(0.1)
14781 d2038d372cd2 changed distribution dependency exclusion mechanism to be only for library dependencies Doug Simon <doug.simon@oracle.com> parents: 14775 diff changeset	1825
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1826 def abort(codeOrMessage):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1827 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1828 Aborts the program with a SystemExit exception.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1829 If 'codeOrMessage' is a plain integer, it specifies the system exit status;
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1830 if it is None, the exit status is zero; if it has another type (such as a string),
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1831 the object's value is printed and the exit status is one.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1832 """
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1833
14135 ee66410c0679 mx: add option to send sigquit before killing child Bernhard Urban <bernhard.urban@jku.at> parents: 14134 diff changeset	1834 if _opts.killwithsigquit:
ee66410c0679 mx: add option to send sigquit before killing child Bernhard Urban <bernhard.urban@jku.at> parents: 14134 diff changeset	1835 _send_sigquit()
ee66410c0679 mx: add option to send sigquit before killing child Bernhard Urban <bernhard.urban@jku.at> parents: 14134 diff changeset	1836
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1837 for p, args in _currentSubprocesses:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1838 try:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1839 if get_os() == 'windows':
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1840 p.terminate()
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1841 else:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1842 _kill_process_group(p.pid, signal.SIGKILL)
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1843 except BaseException as e:
d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	1844 log('error while killing subprocess {} "{}": {}'.format(p.pid, ' '.join(args), e))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1845
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	1846 if _opts and _opts.verbose:
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	1847 import traceback
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	1848 traceback.print_stack()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1849 raise SystemExit(codeOrMessage)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1850
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1851 def download(path, urls, verbose=False):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1852 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1853 Attempts to downloads content for each URL in a list, stopping after the first successful download.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1854 If the content cannot be retrieved from any URL, the program is aborted. The downloaded content
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1855 is written to the file indicated by 'path'.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1856 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1857 d = dirname(path)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1858 if d != '' and not exists(d):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1859 os.makedirs(d)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1860
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1861
6350 f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1862 if not path.endswith(os.sep):
14914 a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1863 # Try it with the Java tool first since it can show a progress counter
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs Gilles Duboscq <duboscq@ssw.jku.at> parents: 14913 diff changeset	1864 myDir = dirname(__file__)
6350 f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1865 javaSource = join(myDir, 'URLConnectionDownload.java')
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1866 javaClass = join(myDir, 'URLConnectionDownload.class')
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1867 if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1868 subprocess.check_call([java().javac, '-d', myDir, javaSource])
7787 2865133eeef2 mx: When doanload fails using Java, try using python Gilles Duboscq <duboscq@ssw.jku.at> parents: 7778 diff changeset	1869 if run([java().java, '-cp', myDir, 'URLConnectionDownload', path] + urls, nonZeroIsFatal=False) == 0:
6350 f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1870 return
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1871
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1872 def url_open(url):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1873 userAgent = 'Mozilla/5.0 (compatible)'
13968 6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings Bernhard Urban <bernhard.urban@jku.at> parents: 13952 diff changeset	1874 headers = {'User-Agent' : userAgent}
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1875 req = urllib2.Request(url, headers=headers)
6350 f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1876 return urllib2.urlopen(req)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1877
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1878 for url in urls:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1879 try:
13968 6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings Bernhard Urban <bernhard.urban@jku.at> parents: 13952 diff changeset	1880 if verbose:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1881 log('Downloading ' + url + ' to ' + path)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1882 if url.startswith('zip:') or url.startswith('jar:'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1883 i = url.find('!/')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1884 if i == -1:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1885 abort('Zip or jar URL does not contain "!/": ' + url)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1886 url, _, entry = url[len('zip:'):].partition('!/')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1887 with contextlib.closing(url_open(url)) as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1888 data = f.read()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1889 zipdata = StringIO.StringIO(f.read())
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1890
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1891 zf = zipfile.ZipFile(zipdata, 'r')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1892 data = zf.read(entry)
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4161 diff changeset	1893 with open(path, 'wb') as f:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1894 f.write(data)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1895 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1896 with contextlib.closing(url_open(url)) as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1897 data = f.read()
6350 f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1898 if path.endswith(os.sep):
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1899 # Scrape directory listing for relative URLs
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1900 hrefs = re.findall(r' href="([^"]*)"', data)
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1901 if len(hrefs) != 0:
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1902 for href in hrefs:
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1903 if not '/' in href:
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1904 download(join(path, href), [url + href], verbose)
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1905 else:
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1906 log('no locals hrefs scraped from ' + url)
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1907 else:
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1908 with open(path, 'wb') as f:
f45d5cb03c3b added support for downloading dependencies that are directories Doug Simon <doug.simon@oracle.com> parents: 6335 diff changeset	1909 f.write(data)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1910 return
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1911 except IOError as e:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1912 log('Error reading from ' + url + ': ' + str(e))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1913 except zipfile.BadZipfile as e:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1914 log('Error in zip file downloaded from ' + url + ': ' + str(e))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1915
4188 148fa38782e8 Downloads are attempted via Java first since it shows a progress counter. Doug Simon <doug.simon@oracle.com> parents: 4186 diff changeset	1916 abort('Could not download to ' + path + ' from any of the following URLs:\n\n ' +
148fa38782e8 Downloads are attempted via Java first since it shows a progress counter. Doug Simon <doug.simon@oracle.com> parents: 4186 diff changeset	1917 '\n '.join(urls) + '\n\nPlease use a web browser to do the download manually')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1918
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1919 def update_file(path, content):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1920 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1921 Updates a file with some given content if the content differs from what's in
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1922 the file already. The return value indicates if the file was updated.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1923 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1924 existed = exists(path)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1925 try:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1926 old = None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1927 if existed:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1928 with open(path, 'rb') as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1929 old = f.read()
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1930
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1931 if old == content:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1932 return False
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1933
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1934 with open(path, 'wb') as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1935 f.write(content)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1936
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1937 log(('modified ' if existed else 'created ') + path)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1938 return True
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1939 except IOError as e:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	1940 abort('Error while writing to ' + path + ': ' + str(e))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1941
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1942 # Builtin commands
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	1943
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1944 def _defaultEcjPath():
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1945 return get_env('JDT', join(_primary_suite.mxDir, 'ecj.jar'))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1946
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1947 class JavaCompileTask:
15496 f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	1948 def __init__(self, args, proj, reason, javafilelist, jdk, outputDir, jdtJar, deps):
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1949 self.proj = proj
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1950 self.reason = reason
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1951 self.javafilelist = javafilelist
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1952 self.deps = deps
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1953 self.jdk = jdk
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1954 self.outputDir = outputDir
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1955 self.done = False
15496 f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	1956 self.jdtJar = jdtJar
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1957 self.args = args
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1958
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1959 def __str__(self):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1960 return self.proj.name
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1961
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1962 def logCompilation(self, compiler):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1963 log('Compiling Java sources for {} with {}... [{}]'.format(self.proj.name, compiler, self.reason))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1964
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1965 def execute(self):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1966 argfileName = join(self.proj.dir, 'javafilelist.txt')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1967 argfile = open(argfileName, 'wb')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1968 argfile.write('\n'.join(self.javafilelist))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1969 argfile.close()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1970
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1971 processorArgs = []
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1972
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1973 aps = self.proj.annotation_processors()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1974 if len(aps) > 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1975 processorPath = classpath(aps, resolve=True)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1976 genDir = self.proj.source_gen_dir()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1977 if exists(genDir):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1978 shutil.rmtree(genDir)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1979 os.mkdir(genDir)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1980 processorArgs += ['-processorpath', join(processorPath), '-s', genDir]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1981 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1982 processorArgs += ['-proc:none']
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1983
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1984 args = self.args
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1985 jdk = self.jdk
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1986 outputDir = self.outputDir
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1987 compliance = str(jdk.javaCompliance)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1988 cp = classpath(self.proj.name, includeSelf=True)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1989 toBeDeleted = [argfileName]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1990
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1991 try:
15496 f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	1992 if not self.jdtJar:
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1993 mainJava = java()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1994 if not args.error_prone:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1995 self.logCompilation('javac')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1996 javacCmd = [mainJava.javac, '-g', '-J-Xmx1g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir, '-bootclasspath', jdk.bootclasspath(), '-endorseddirs', jdk.endorseddirs(), '-extdirs', jdk.extdirs()]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1997 if jdk.debug_port is not None:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1998 javacCmd += ['-J-Xdebug', '-J-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=' + str(jdk.debug_port)]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	1999 javacCmd += processorArgs
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2000 javacCmd += ['@' + argfile.name]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2001
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2002 if not args.warnAPI:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2003 javacCmd.append('-XDignore.symbol.file')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2004 run(javacCmd)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2005 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2006 self.logCompilation('javac (with error-prone)')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2007 javaArgs = ['-Xmx1g']
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2008 javacArgs = ['-g', '-source', compliance, '-target', compliance, '-classpath', cp, '-d', outputDir, '-bootclasspath', jdk.bootclasspath(), '-endorseddirs', jdk.endorseddirs(), '-extdirs', jdk.extdirs()]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2009 javacArgs += processorArgs
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2010 javacArgs += ['@' + argfile.name]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2011 if not args.warnAPI:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2012 javacArgs.append('-XDignore.symbol.file')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2013 run_java(javaArgs + ['-cp', os.pathsep.join([mainJava.toolsjar, args.error_prone]), 'com.google.errorprone.ErrorProneCompiler'] + javacArgs)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2014 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2015 self.logCompilation('JDT')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2016
15496 f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2017 jdtVmArgs = ['-Xmx1g', '-jar', self.jdtJar]
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2018
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2019 jdtArgs = ['-' + compliance,
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2020 '-cp', cp, '-g', '-enableJavadoc',
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2021 '-d', outputDir,
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2022 '-bootclasspath', jdk.bootclasspath(),
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2023 '-endorseddirs', jdk.endorseddirs(),
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2024 '-extdirs', jdk.extdirs()]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2025 jdtArgs += processorArgs
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2026
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2027 jdtProperties = join(self.proj.dir, '.settings', 'org.eclipse.jdt.core.prefs')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2028 rootJdtProperties = join(self.proj.suite.mxDir, 'eclipse-settings', 'org.eclipse.jdt.core.prefs')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2029 if not exists(jdtProperties) or os.path.getmtime(jdtProperties) < os.path.getmtime(rootJdtProperties):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2030 # Try to fix a missing properties file by running eclipseinit
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2031 eclipseinit([], buildProcessorJars=False)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2032 if not exists(jdtProperties):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2033 log('JDT properties file {0} not found'.format(jdtProperties))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2034 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2035 with open(jdtProperties) as fp:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2036 origContent = fp.read()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2037 content = origContent
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2038 if args.jdt_warning_as_error:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2039 content = content.replace('=warning', '=error')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2040 if not args.jdt_show_task_tags:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2041 content = content + '\norg.eclipse.jdt.core.compiler.problem.tasks=ignore'
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2042 if origContent != content:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2043 jdtPropertiesTmp = jdtProperties + '.tmp'
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2044 with open(jdtPropertiesTmp, 'w') as fp:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2045 fp.write(content)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2046 toBeDeleted.append(jdtPropertiesTmp)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2047 jdtArgs += ['-properties', jdtPropertiesTmp]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2048 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2049 jdtArgs += ['-properties', jdtProperties]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2050 jdtArgs.append('@' + argfile.name)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2051
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2052 run_java(jdtVmArgs + jdtArgs)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2053 finally:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2054 for n in toBeDeleted:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2055 os.remove(n)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2056 self.done = True
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2057
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2058 def build(args, parser=None):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2059 """compile the Java and C sources, linking the latter
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2060
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2061 Compile all the Java source code using the appropriate compilers
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2062 and linkers for the various source code types."""
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2063
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4227 diff changeset	2064 suppliedParser = parser is not None
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4227 diff changeset	2065 if not suppliedParser:
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4227 diff changeset	2066 parser = ArgumentParser(prog='mx build')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2067
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4227 diff changeset	2068 parser = parser if parser is not None else ArgumentParser(prog='mx build')
5239 b9db4fee6eb2 skip a native build if all files in src and make are older than the timestamp of the previous build Doug Simon <doug.simon@oracle.com> parents: 5219 diff changeset	2069 parser.add_argument('-f', action='store_true', dest='force', help='force build (disables timestamp checking)')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2070 parser.add_argument('-c', action='store_true', dest='clean', help='removes existing build output')
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2071 parser.add_argument('-p', action='store_true', dest='parallelize', help='parallelizes Java compilation')
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	2072 parser.add_argument('--source', dest='compliance', help='Java compliance level for projects without an explicit one')
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	2073 parser.add_argument('--Wapi', action='store_true', dest='warnAPI', help='show warnings about using internal APIs')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2074 parser.add_argument('--projects', action='store', help='comma separated projects to build (omit to build all projects)')
6535 f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	2075 parser.add_argument('--only', action='store', help='comma separated projects to build, without checking their dependencies (omit to build all projects)')
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2076 parser.add_argument('--no-java', action='store_false', dest='java', help='do not build Java projects')
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	2077 parser.add_argument('--no-native', action='store_false', dest='native', help='do not build native projects')
5778 74c802348d1f added --jdt-warning-as-error option to 'mx build' Doug Simon <doug.simon@oracle.com> parents: 5771 diff changeset	2078 parser.add_argument('--jdt-warning-as-error', action='store_true', help='convert all Eclipse batch compiler warnings to errors')
15118 3a1f48125f53 added --jdt-show-task-tags option to build command Doug Simon <doug.simon@oracle.com> parents: 15087 diff changeset	2079 parser.add_argument('--jdt-show-task-tags', action='store_true', help='show task tags as Eclipse batch compiler warnings')
15376 b3cd96f137a6 mx build: make --error-prone, --jdt and --force-javac mutually exclusive Gilles Duboscq <duboscq@ssw.jku.at> parents: 15364 diff changeset	2080 compilerSelect = parser.add_mutually_exclusive_group()
b3cd96f137a6 mx build: make --error-prone, --jdt and --force-javac mutually exclusive Gilles Duboscq <duboscq@ssw.jku.at> parents: 15364 diff changeset	2081 compilerSelect.add_argument('--error-prone', dest='error_prone', help='path to error-prone.jar', metavar='<path>')
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2082 compilerSelect.add_argument('--jdt', help='path to ecj.jar, the Eclipse batch compiler', default=_defaultEcjPath(), metavar='<path>')
15376 b3cd96f137a6 mx build: make --error-prone, --jdt and --force-javac mutually exclusive Gilles Duboscq <duboscq@ssw.jku.at> parents: 15364 diff changeset	2083 compilerSelect.add_argument('--force-javac', action='store_true', dest='javac', help='use javac despite ecj.jar is found or not')
15378 dea98caac669 Fix help text for ideinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 15376 diff changeset	2084
4234 057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4227 diff changeset	2085 if suppliedParser:
057620486c90 Improved time stamps of gate tasks to show duration of each task explicitly. Doug Simon <doug.simon@oracle.com> parents: 4227 diff changeset	2086 parser.add_argument('remainder', nargs=REMAINDER, metavar='...')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2087
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2088 args = parser.parse_args(args)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2089
15496 f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2090 jdtJar = None
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2091 if not args.javac and args.jdt is not None:
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2092 if not args.jdt.endswith('.jar'):
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2093 abort('Path for Eclipse batch compiler does not look like a jar file: ' + args.jdt)
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2094 jdtJar = args.jdt
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2095 if not exists(jdtJar):
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2096 if os.path.abspath(jdtJar) == os.path.abspath(_defaultEcjPath()) and get_env('JDT', None) is None:
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2097 # Silently ignore JDT if default location is used but does not exist
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2098 jdtJar = None
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2099 else:
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2100 abort('Eclipse batch compiler jar does not exist: ' + args.jdt)
f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2101
6535 f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	2102 if args.only is not None:
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2103 # N.B. This build will not include dependencies including annotation processor dependencies
6535 f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	2104 sortedProjects = [project(name) for name in args.only.split(',')]
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	2105 else:
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2106 if args.projects is not None:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2107 projectNames = args.projects.split(',')
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2108 else:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2109 projectNames = None
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	2110
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2111 projects = _projects_opt_limit_to_suites(projects_from_names(projectNames))
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2112 # N.B. Limiting to a suite only affects the starting set of projects. Dependencies in other suites will still be compiled
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2113 sortedProjects = sorted_project_deps(projects, includeAnnotationProcessors=True)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2114
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2115 if args.java:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2116 ideinit([], refreshOnly=True, buildProcessorJars=False)
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2117
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2118 def prepareOutputDirs(p, clean):
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2119 outputDir = p.output_dir()
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2120 if exists(outputDir):
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2121 if clean:
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2122 log('Cleaning {0}...'.format(outputDir))
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2123 shutil.rmtree(outputDir)
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2124 os.mkdir(outputDir)
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2125 else:
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2126 os.mkdir(outputDir)
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2127 genDir = p.source_gen_dir()
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2128 if genDir != '' and exists(genDir) and clean:
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2129 log('Cleaning {0}...'.format(genDir))
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2130 for f in os.listdir(genDir):
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2131 shutil.rmtree(join(genDir, f))
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2132 return outputDir
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2133
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2134 tasks = {}
6535 f938212e56ab Improvements of annotation processor functionality in mx script; allow javac to be run in debugger in order to debug annotation processor Christian Wimmer <christian.wimmer@oracle.com> parents: 6533 diff changeset	2135 for p in sortedProjects:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2136 if p.native:
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2137 if args.native:
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2138 log('Calling GNU make {0}...'.format(p.dir))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2139
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2140 if args.clean:
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2141 run([gmake_cmd(), 'clean'], cwd=p.dir)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2142
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2143 run([gmake_cmd()], cwd=p.dir)
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2144 continue
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2145 else:
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2146 if not args.java:
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2147 continue
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2148 if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	2149 continue
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2150
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2151 # skip building this Java project if its Java compliance level is "higher" than the configured JDK
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	2152 requiredCompliance = p.javaCompliance if p.javaCompliance else JavaCompliance(args.compliance) if args.compliance else None
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	2153 jdk = java(requiredCompliance)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	2154 assert jdk
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2155
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2156 outputDir = prepareOutputDirs(p, args.clean)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2157
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2158 sourceDirs = p.source_dirs()
15386 1439685d06e4 mx: log reason why Java classes are being (re)built Doug Simon <doug.simon@oracle.com> parents: 15378 diff changeset	2159 buildReason = 'forced build' if args.force else None
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2160 taskDeps = []
15386 1439685d06e4 mx: log reason why Java classes are being (re)built Doug Simon <doug.simon@oracle.com> parents: 15378 diff changeset	2161 if not buildReason:
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2162 for dep in p.all_deps([], includeLibs=False, includeAnnotationProcessors=True):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2163 taskDep = tasks.get(dep.name)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2164 if taskDep:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2165 if not buildReason:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2166 buildReason = dep.name + ' rebuilt'
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2167 taskDeps.append(taskDep)
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2168
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2169 jasminAvailable = None
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2170 javafilelist = []
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2171 for sourceDir in sourceDirs:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2172 for root, _, files in os.walk(sourceDir):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2173 javafiles = [join(root, name) for name in files if name.endswith('.java') and name != 'package-info.java']
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2174 javafilelist += javafiles
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2175
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2176 # Copy all non Java resources or assemble Jasmin files
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2177 nonjavafilelist = [join(root, name) for name in files if not name.endswith('.java')]
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2178 for src in nonjavafilelist:
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2179 if src.endswith('.jasm'):
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2180 className = None
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2181 with open(src) as f:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2182 for line in f:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2183 if line.startswith('.class '):
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2184 className = line.split()[-1]
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2185 break
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2186
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2187 if className is not None:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2188 jasminOutputDir = p.jasmin_output_dir()
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2189 classFile = join(jasminOutputDir, className.replace('/', os.sep) + '.class')
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2190 if exists(dirname(classFile)) and (not exists(classFile) or os.path.getmtime(classFile) < os.path.getmtime(src)):
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2191 if jasminAvailable is None:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2192 try:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2193 with open(os.devnull) as devnull:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2194 subprocess.call('jasmin', stdout=devnull, stderr=subprocess.STDOUT)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2195 jasminAvailable = True
5071 9d055af068a8 Made Java builds look for mx/ecj.jar to use Eclipse batch compiler by default. Doug Simon <doug.simon@oracle.com> parents: 5032 diff changeset	2196 except OSError:
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2197 jasminAvailable = False
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2198
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2199 if jasminAvailable:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2200 log('Assembling Jasmin file ' + src)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2201 run(['jasmin', '-d', jasminOutputDir, src])
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2202 else:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2203 log('The jasmin executable could not be found - skipping ' + src)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2204 with file(classFile, 'a'):
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2205 os.utime(classFile, None)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2206
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2207 else:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2208 log('could not file .class directive in Jasmin source: ' + src)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2209 else:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2210 dst = join(outputDir, src[len(sourceDir) + 1:])
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	2211 if not exists(dirname(dst)):
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	2212 os.makedirs(dirname(dst))
7299 57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	2213 if exists(dirname(dst)) and (not exists(dst) or os.path.getmtime(dst) < os.path.getmtime(src)):
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2214 shutil.copyfile(src, dst)
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2215
15386 1439685d06e4 mx: log reason why Java classes are being (re)built Doug Simon <doug.simon@oracle.com> parents: 15378 diff changeset	2216 if not buildReason:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2217 for javafile in javafiles:
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2218 classfile = TimeStampFile(outputDir + javafile[len(sourceDir):-len('java')] + 'class')
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2219 if not classfile.exists() or classfile.isOlderThan(javafile):
15386 1439685d06e4 mx: log reason why Java classes are being (re)built Doug Simon <doug.simon@oracle.com> parents: 15378 diff changeset	2220 buildReason = 'class file(s) out of date'
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2221 break
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2222
12631 2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2223 apsOutOfDate = p.update_current_annotation_processors_file()
2303d9e199e3 rebuild projects if their annotation processor dependencies change; clean output directories before (re)compiling a Java project Doug Simon <doug.simon@oracle.com> parents: 12630 diff changeset	2224 if apsOutOfDate:
15386 1439685d06e4 mx: log reason why Java classes are being (re)built Doug Simon <doug.simon@oracle.com> parents: 15378 diff changeset	2225 buildReason = 'annotation processor(s) changed'
1439685d06e4 mx: log reason why Java classes are being (re)built Doug Simon <doug.simon@oracle.com> parents: 15378 diff changeset	2226
1439685d06e4 mx: log reason why Java classes are being (re)built Doug Simon <doug.simon@oracle.com> parents: 15378 diff changeset	2227 if not buildReason:
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	2228 logv('[all class files for {0} are up to date - skipping]'.format(p.name))
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2229 continue
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2230
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2231 if len(javafilelist) == 0:
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	2232 logv('[no Java sources for {0} - skipping]'.format(p.name))
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2233 continue
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2234
15496 f5eba273a4f2 mx: factored out detection of JDT compilation Doug Simon <doug.simon@oracle.com> parents: 15490 diff changeset	2235 task = JavaCompileTask(args, p, buildReason, javafilelist, jdk, outputDir, jdtJar, taskDeps)
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2236
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2237 if args.parallelize:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2238 # Best to initialize class paths on main process
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2239 jdk.bootclasspath()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2240 task.proc = None
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2241 tasks[p.name] = task
5876 c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	2242 else:
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2243 task.execute()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2244
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2245 if args.parallelize:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2246
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2247 def joinTasks(tasks):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2248 failed = []
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2249 for t in tasks:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2250 t.proc.join()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2251 if t.proc.exitcode != 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2252 failed.append(t)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2253 return failed
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2254
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2255 def checkTasks(tasks):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2256 active = []
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2257 for t in tasks:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2258 if t.proc.is_alive():
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2259 active.append(t)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2260 else:
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	2261 _removeSubprocess(t.sub)
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2262 if t.proc.exitcode != 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2263 return ([], joinTasks(tasks))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2264 return (active, [])
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2265
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2266 def remainingDepsDepth(task):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2267 if task._d is None:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2268 incompleteDeps = [d for d in task.deps if d.proc is None or d.proc.is_alive()]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2269 if len(incompleteDeps) == 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2270 task._d = 0
14913 2d1cc640512c Add possibility to build using error-prone instead of javac. Gilles Duboscq <duboscq@ssw.jku.at> parents: 14907 diff changeset	2271 else:
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2272 task._d = max([remainingDepsDepth(t) for t in incompleteDeps]) + 1
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2273 return task._d
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2274
15490 5d0dd6a6f6b3 mx: improved heuristics for sorting remaining tasks in parallel Java build worklist Doug Simon <doug.simon@oracle.com> parents: 15489 diff changeset	2275 def compareTasks(t1, t2):
5d0dd6a6f6b3 mx: improved heuristics for sorting remaining tasks in parallel Java build worklist Doug Simon <doug.simon@oracle.com> parents: 15489 diff changeset	2276 d = remainingDepsDepth(t1) - remainingDepsDepth(t2)
5d0dd6a6f6b3 mx: improved heuristics for sorting remaining tasks in parallel Java build worklist Doug Simon <doug.simon@oracle.com> parents: 15489 diff changeset	2277 if d == 0:
15497 1f28c463e452 mx: slight tweak of parallel Java build heuristics Doug Simon <doug.simon@oracle.com> parents: 15496 diff changeset	2278 t1Work = (1 + len(t1.proj.annotation_processors())) * len(t1.javafilelist)
1f28c463e452 mx: slight tweak of parallel Java build heuristics Doug Simon <doug.simon@oracle.com> parents: 15496 diff changeset	2279 t2Work = (1 + len(t2.proj.annotation_processors())) * len(t2.javafilelist)
1f28c463e452 mx: slight tweak of parallel Java build heuristics Doug Simon <doug.simon@oracle.com> parents: 15496 diff changeset	2280 d = t1Work - t2Work
15490 5d0dd6a6f6b3 mx: improved heuristics for sorting remaining tasks in parallel Java build worklist Doug Simon <doug.simon@oracle.com> parents: 15489 diff changeset	2281 return d
5d0dd6a6f6b3 mx: improved heuristics for sorting remaining tasks in parallel Java build worklist Doug Simon <doug.simon@oracle.com> parents: 15489 diff changeset	2282
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2283 def sortWorklist(tasks):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2284 for t in tasks:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2285 t._d = None
15490 5d0dd6a6f6b3 mx: improved heuristics for sorting remaining tasks in parallel Java build worklist Doug Simon <doug.simon@oracle.com> parents: 15489 diff changeset	2286 return sorted(tasks, compareTasks)
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2287
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2288 import multiprocessing
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2289 cpus = multiprocessing.cpu_count()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2290 worklist = sortWorklist(tasks.values())
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2291 active = []
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2292 while len(worklist) != 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2293 while True:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2294 active, failed = checkTasks(active)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2295 if len(failed) != 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2296 assert not active, active
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2297 break
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2298 if len(active) == cpus:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2299 # Sleep for 1 second
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2300 time.sleep(1)
5071 9d055af068a8 Made Java builds look for mx/ecj.jar to use Eclipse batch compiler by default. Doug Simon <doug.simon@oracle.com> parents: 5032 diff changeset	2301 else:
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2302 break
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2303
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2304 def executeTask(task):
15781 8b9e7f235d85 mx: fixed spurious "error while killing subprocess" messages (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15701 diff changeset	2305 # Clear sub-process list cloned from parent process
8b9e7f235d85 mx: fixed spurious "error while killing subprocess" messages (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15701 diff changeset	2306 del _currentSubprocesses[:]
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2307 task.execute()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2308
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2309 def depsDone(task):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2310 for d in task.deps:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2311 if d.proc is None or d.proc.exitcode is None:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2312 return False
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2313 return True
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2314
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2315 for task in worklist:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2316 if depsDone(task):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2317 worklist.remove(task)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2318 task.proc = multiprocessing.Process(target=executeTask, args=(task,))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2319 task.proc.start()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2320 active.append(task)
15489 d0e3f6963ed7 mx: made parallel Java builds interact correctly with management of subprocesses upon abort/quit Doug Simon <doug.simon@oracle.com> parents: 15462 diff changeset	2321 task.sub = _addSubprocess(task.proc, ['JavaCompileTask', str(task)])
15460 7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2322 if len(active) == cpus:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2323 break
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2324
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2325 worklist = sortWorklist(worklist)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350) Doug Simon <doug.simon@oracle.com> parents: 15457 diff changeset	2326 joinTasks(active)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2327
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2328 for dist in _dists.values():
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2329 archive(['@' + dist.name])
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2330
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2331 if suppliedParser:
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2332 return args
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2333 return None
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2334
15274 1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2335 def _chunk_files_for_command_line(files, limit=None, pathFunction=None):
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2336 """
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2337 Returns a generator for splitting up a list of files into chunks such that the
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2338 size of the space separated file paths in a chunk is less than a given limit.
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2339 This is used to work around system command line length limits.
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2340 """
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2341 chunkSize = 0
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2342 chunkStart = 0
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2343 if limit is None:
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2344 commandLinePrefixAllowance = 3000
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2345 if get_os() == 'windows':
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2346 # The CreateProcess function on Windows limits the length of a command line to
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2347 # 32,768 characters (http://msdn.microsoft.com/en-us/library/ms682425%28VS.85%29.aspx)
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2348 limit = 32768 - commandLinePrefixAllowance
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2349 else:
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2350 # Using just SC_ARG_MAX without extra downwards adjustment
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2351 # results in "[Errno 7] Argument list too long" on MacOS.
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2352 syslimit = os.sysconf('SC_ARG_MAX') - 20000
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2353 limit = syslimit - commandLinePrefixAllowance
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2354 for i in range(len(files)):
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2355 path = files[i] if pathFunction is None else pathFunction(files[i])
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2356 size = len(path) + 1
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2357 if chunkSize + size < limit:
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2358 chunkSize += size
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2359 else:
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2360 assert i > chunkStart
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2361 yield files[chunkStart:i]
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2362 chunkStart = i
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2363 chunkSize = 0
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2364 if chunkStart == 0:
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2365 assert chunkSize < limit
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2366 yield files
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2367
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2368 def eclipseformat(args):
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2369 """run the Eclipse Code Formatter on the Java sources
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2370
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2371 The exit code 1 denotes that at least one file was modified."""
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2372
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2373 parser = ArgumentParser(prog='mx eclipseformat')
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2374 parser.add_argument('-e', '--eclipse-exe', help='location of the Eclipse executable')
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2375 parser.add_argument('-C', '--no-backup', action='store_false', dest='backup', help='do not save backup of modified files')
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2376 parser.add_argument('--projects', action='store', help='comma separated projects to process (omit to process all projects)')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2377
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2378 args = parser.parse_args(args)
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2379 if args.eclipse_exe is None:
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2380 args.eclipse_exe = os.environ.get('ECLIPSE_EXE')
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2381 if args.eclipse_exe is None:
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2382 abort('Could not find Eclipse executable. Use -e option or ensure ECLIPSE_EXE environment variable is set.')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2383
8991 096725f4da58 the -e option to the eclipseformat can now also accept an Eclipse installation directory Doug Simon <doug.simon@oracle.com> parents: 8958 diff changeset	2384 # Maybe an Eclipse installation dir was specified - look for the executable in it
14553 6fb61ad67962 Fix mx eclipseformat always adds the 'eclipse' suffix Gilles Duboscq <duboscq@ssw.jku.at> parents: 14539 diff changeset	2385 if isdir(args.eclipse_exe):
8991 096725f4da58 the -e option to the eclipseformat can now also accept an Eclipse installation directory Doug Simon <doug.simon@oracle.com> parents: 8958 diff changeset	2386 args.eclipse_exe = join(args.eclipse_exe, exe_suffix('eclipse'))
14553 6fb61ad67962 Fix mx eclipseformat always adds the 'eclipse' suffix Gilles Duboscq <duboscq@ssw.jku.at> parents: 14539 diff changeset	2387 warn("The eclipse-exe was a directory, now using " + args.eclipse_exe)
6fb61ad67962 Fix mx eclipseformat always adds the 'eclipse' suffix Gilles Duboscq <duboscq@ssw.jku.at> parents: 14539 diff changeset	2388
6fb61ad67962 Fix mx eclipseformat always adds the 'eclipse' suffix Gilles Duboscq <duboscq@ssw.jku.at> parents: 14539 diff changeset	2389 if not os.path.isfile(args.eclipse_exe):
6fb61ad67962 Fix mx eclipseformat always adds the 'eclipse' suffix Gilles Duboscq <duboscq@ssw.jku.at> parents: 14539 diff changeset	2390 abort('File does not exist: ' + args.eclipse_exe)
6fb61ad67962 Fix mx eclipseformat always adds the 'eclipse' suffix Gilles Duboscq <duboscq@ssw.jku.at> parents: 14539 diff changeset	2391 if not os.access(args.eclipse_exe, os.X_OK):
8991 096725f4da58 the -e option to the eclipseformat can now also accept an Eclipse installation directory Doug Simon <doug.simon@oracle.com> parents: 8958 diff changeset	2392 abort('Not an executable file: ' + args.eclipse_exe)
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2393
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2394 eclipseinit([], buildProcessorJars=False)
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2395
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2396 # build list of projects to be processed
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2397 projects = sorted_deps()
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2398 if args.projects is not None:
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2399 projects = [project(name) for name in args.projects.split(',')]
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2400
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2401 class Batch:
14874 7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2402 def __init__(self, settingsDir, javaCompliance):
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2403 self.path = join(settingsDir, 'org.eclipse.jdt.core.prefs')
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	2404 self.javaCompliance = javaCompliance
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2405 self.javafiles = list()
14874 7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2406 with open(join(settingsDir, 'org.eclipse.jdt.ui.prefs')) as fp:
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2407 jdtUiPrefs = fp.read()
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2408 self.removeTrailingWhitespace = 'sp_cleanup.remove_trailing_whitespaces_all=true' in jdtUiPrefs
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2409 if self.removeTrailingWhitespace:
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2410 assert 'sp_cleanup.remove_trailing_whitespaces=true' in jdtUiPrefs and 'sp_cleanup.remove_trailing_whitespaces_ignore_empty=false' in jdtUiPrefs
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2411
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2412 def settings(self):
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2413 with open(self.path) as fp:
14874 7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2414 return fp.read() + java(self.javaCompliance).java + str(self.removeTrailingWhitespace)
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2415
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2416 class FileInfo:
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2417 def __init__(self, path):
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2418 self.path = path
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2419 with open(path) as fp:
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2420 self.content = fp.read()
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2421 self.times = (os.path.getatime(path), os.path.getmtime(path))
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2422
14874 7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2423 def update(self, removeTrailingWhitespace):
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2424 with open(self.path) as fp:
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2425 content = fp.read()
14874 7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2426
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2427 if self.content != content:
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2428 # Only apply after formatting to match the order in which the IDE does it
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2429 if removeTrailingWhitespace:
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2430 content, n = re.subn(r'[ \t]+$', '', content, flags=re.MULTILINE)
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2431 if n != 0 and self.content == content:
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2432 # undo on-disk changes made by the Eclipse formatter
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2433 with open(self.path, 'w') as fp:
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2434 fp.write(content)
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2435
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2436 if self.content != content:
14626 4f8268dee8aa mx: eclipseformat now prints all the changes that were found to the console. Christian Humer <christian.humer@gmail.com> parents: 14553 diff changeset	2437 self.diff = difflib.unified_diff(self.content.splitlines(1), content.splitlines(1))
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2438 self.content = content
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2439 return True
14874 7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2440
7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2441 # reset access and modification time of file
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2442 os.utime(self.path, self.times)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2443
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2444 modified = list()
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2445 batches = dict() # all sources with the same formatting settings are formatted together
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2446 for p in projects:
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2447 if p.native:
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2448 continue
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2449 sourceDirs = p.source_dirs()
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2450
14874 7dfc0e9fd45a added removal of trailing whitespace to eclipseformat to emulate the actions performed by the IDE Doug Simon <doug.simon@oracle.com> parents: 14785 diff changeset	2451 batch = Batch(join(p.dir, '.settings'), p.javaCompliance)
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2452
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2453 if not exists(batch.path):
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	2454 if _opts.verbose:
070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	2455 log('[no Eclipse Code Formatter preferences at {0} - skipping]'.format(batch.path))
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2456 continue
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2457
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2458 for sourceDir in sourceDirs:
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2459 for root, _, files in os.walk(sourceDir):
7532 780269e56ddd eclipseformat is also applied to package-info.java files Doug Simon <doug.simon@oracle.com> parents: 7528 diff changeset	2460 for f in [join(root, name) for name in files if name.endswith('.java')]:
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2461 batch.javafiles.append(FileInfo(f))
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2462 if len(batch.javafiles) == 0:
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	2463 logv('[no Java sources in {0} - skipping]'.format(p.name))
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2464 continue
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2465
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2466 res = batches.setdefault(batch.settings(), batch)
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2467 if res is not batch:
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2468 res.javafiles = res.javafiles + batch.javafiles
4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2469
15274 1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2470 log("we have: " + str(len(batches)) + " batches")
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2471 for batch in batches.itervalues():
15274 1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2472 for chunk in _chunk_files_for_command_line(batch.javafiles, pathFunction=lambda f: f.path):
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2473 run([args.eclipse_exe,
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2474 '-nosplash',
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2475 '-application',
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2476 'org.eclipse.jdt.core.JavaCodeFormatter',
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2477 '-vm', java(batch.javaCompliance).java,
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2478 '-config', batch.path]
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2479 + [f.path for f in chunk])
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2480 for fi in chunk:
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2481 if fi.update(batch.removeTrailingWhitespace):
1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2482 modified.append(fi)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2483
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2484 log('{0} files were modified'.format(len(modified)))
14626 4f8268dee8aa mx: eclipseformat now prints all the changes that were found to the console. Christian Humer <christian.humer@gmail.com> parents: 14553 diff changeset	2485
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2486 if len(modified) != 0:
13288 9c3c915b5f56 Log modiffied files during eclipseformat Gilles Duboscq <duboscq@ssw.jku.at> parents: 13266 diff changeset	2487 arcbase = _primary_suite.dir
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2488 if args.backup:
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2489 backup = os.path.abspath('eclipseformat.backup.zip')
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2490 zf = zipfile.ZipFile(backup, 'w', zipfile.ZIP_DEFLATED)
13288 9c3c915b5f56 Log modiffied files during eclipseformat Gilles Duboscq <duboscq@ssw.jku.at> parents: 13266 diff changeset	2491 for fi in modified:
9c3c915b5f56 Log modiffied files during eclipseformat Gilles Duboscq <duboscq@ssw.jku.at> parents: 13266 diff changeset	2492 name = os.path.relpath(fi.path, arcbase)
9c3c915b5f56 Log modiffied files during eclipseformat Gilles Duboscq <duboscq@ssw.jku.at> parents: 13266 diff changeset	2493 log(' - {0}'.format(name))
14626 4f8268dee8aa mx: eclipseformat now prints all the changes that were found to the console. Christian Humer <christian.humer@gmail.com> parents: 14553 diff changeset	2494 log('Changes:')
4f8268dee8aa mx: eclipseformat now prints all the changes that were found to the console. Christian Humer <christian.humer@gmail.com> parents: 14553 diff changeset	2495 log(''.join(fi.diff))
13288 9c3c915b5f56 Log modiffied files during eclipseformat Gilles Duboscq <duboscq@ssw.jku.at> parents: 13266 diff changeset	2496 if args.backup:
9c3c915b5f56 Log modiffied files during eclipseformat Gilles Duboscq <duboscq@ssw.jku.at> parents: 13266 diff changeset	2497 arcname = name.replace(os.sep, '/')
7528 4584ca2618d5 made eclipseformat command use batching Doug Simon <doug.simon@oracle.com> parents: 7524 diff changeset	2498 zf.writestr(arcname, fi.content)
13288 9c3c915b5f56 Log modiffied files during eclipseformat Gilles Duboscq <duboscq@ssw.jku.at> parents: 13266 diff changeset	2499 if args.backup:
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2500 zf.close()
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2501 log('Wrote backup of {0} modified files to {1}'.format(len(modified), backup))
bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2502 return 1
7533 29b0768b7ba6 added eclipseformat to the gate Doug Simon <doug.simon@oracle.com> parents: 7532 diff changeset	2503 return 0
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	2504
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	2505 def processorjars():
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2506 for s in suites(True):
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2507 _processorjars_suite(s)
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2508
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2509 def _processorjars_suite(s):
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	2510 projs = set()
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2511 candidates = sorted_project_deps(s.projects)
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2512 for p in candidates:
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2513 if _isAnnotationProcessorDependency(p):
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	2514 projs.add(p)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2515
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2516 if len(projs) <= 0:
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2517 return []
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2518
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	2519 pnames = [p.name for p in projs]
15457 c0e1a8693e0e mx: added --jdt-warning-as-error when building annotation processor jars Doug Simon <doug.simon@oracle.com> parents: 15419 diff changeset	2520 build(['--jdt-warning-as-error', '--projects', ",".join(pnames)])
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2521 return archive(pnames)
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2522
11777 f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2523 def pylint(args):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2524 """run pylint (if available) over Python source files (found by 'hg locate' or by tree walk with -walk)"""
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2525
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2526 parser = ArgumentParser(prog='mx pylint')
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2527 parser.add_argument('--walk', action='store_true', help='use tree walk find .py files')
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2528 args = parser.parse_args(args)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2529
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2530 rcfile = join(dirname(__file__), '.pylintrc')
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2531 if not exists(rcfile):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2532 log('pylint configuration file does not exist: ' + rcfile)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2533 return
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2534
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2535 try:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2536 output = subprocess.check_output(['pylint', '--version'], stderr=subprocess.STDOUT)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2537 m = re.match(r'.pylint (\d+)\.(\d+)\.(\d+).', output, re.DOTALL)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2538 if not m:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2539 log('could not determine pylint version from ' + output)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2540 return
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2541 major, minor, micro = (int(m.group(1)), int(m.group(2)), int(m.group(3)))
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2542 if major < 1:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2543 log('require pylint version >= 1 (got {0}.{1}.{2})'.format(major, minor, micro))
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2544 return
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2545 except BaseException:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2546 log('pylint is not available')
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2547 return
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2548
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2549 def findfiles_by_walk():
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2550 result = []
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2551 for suite in suites(True):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2552 for root, dirs, files in os.walk(suite.dir):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2553 for f in files:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2554 if f.endswith('.py'):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2555 pyfile = join(root, f)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2556 result.append(pyfile)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2557 if 'bin' in dirs:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2558 dirs.remove('bin')
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2559 if 'lib' in dirs:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2560 # avoids downloaded .py files
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2561 dirs.remove('lib')
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2562 return result
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2563
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2564 def findfiles_by_hg():
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2565 result = []
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2566 for suite in suites(True):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2567 versioned = subprocess.check_output(['hg', 'locate', '-f'], stderr=subprocess.STDOUT, cwd=suite.dir).split(os.linesep)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2568 for f in versioned:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2569 if f.endswith('.py') and exists(f):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2570 result.append(f)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2571 return result
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2572
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2573 # Perhaps we should just look in suite.mxDir directories for .py files?
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2574 if args.walk:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2575 pyfiles = findfiles_by_walk()
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2576 else:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2577 pyfiles = findfiles_by_hg()
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2578
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2579 env = os.environ.copy()
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2580
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2581 pythonpath = dirname(__file__)
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2582 for suite in suites(True):
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2583 pythonpath = os.pathsep.join([pythonpath, suite.mxDir])
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2584
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2585 env['PYTHONPATH'] = pythonpath
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2586
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2587 for pyfile in pyfiles:
f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2588 log('Running pylint on ' + pyfile + '...')
13266 78ed696884b3 fixed regression in pylint command (exit code must be non-zero if at least one warning/error was found) Doug Simon <doug.simon@oracle.com> parents: 13247 diff changeset	2589 run(['pylint', '--reports=n', '--rcfile=' + rcfile, pyfile], env=env)
11777 f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	2590
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2591 """
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2592 Utility for creating and updating a zip file atomically.
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2593 """
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2594 class Archiver:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2595 def __init__(self, path):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2596 self.path = path
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2597
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2598 def __enter__(self):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2599 if self.path:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2600 fd, tmp = tempfile.mkstemp(suffix='', prefix=basename(self.path) + '.', dir=dirname(self.path))
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2601 self.tmpFd = fd
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2602 self.tmpPath = tmp
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2603 self.zf = zipfile.ZipFile(tmp, 'w')
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2604 else:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2605 self.tmpFd = None
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2606 self.tmpPath = None
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2607 self.zf = None
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2608 return self
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2609
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2610 def __exit__(self, exc_type, exc_value, traceback):
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2611 if self.zf:
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2612 self.zf.close()
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2613 os.close(self.tmpFd)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2614 # Correct the permissions on the temporary file which is created with restrictive permissions
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2615 os.chmod(self.tmpPath, 0o666 & ~currentUmask)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2616 # Atomic on Unix
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2617 shutil.move(self.tmpPath, self.path)
f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2618
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2619 def archive(args):
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2620 """create jar files for projects and distributions"""
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2621 parser = ArgumentParser(prog='mx archive')
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2622 parser.add_argument('names', nargs=REMAINDER, metavar='[<project>\|@<distribution>]...')
7925 c7d7d9936809 use zipfile module instead of an external call to jar for creating jar files from projects Doug Simon <doug.simon@oracle.com> parents: 7918 diff changeset	2623 args = parser.parse_args(args)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2624
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2625 archives = []
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2626 for name in args.names:
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2627 if name.startswith('@'):
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2628 dname = name[1:]
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2629 d = distribution(dname)
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2630 d.make_archive()
14964 e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	2631 archives.append(d.path)
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2632 else:
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	2633 p = project(name)
15226 f1c66b738dae mx: refactored archive command Doug Simon <doug.simon@oracle.com> parents: 15149 diff changeset	2634 archives.append(p.make_archive())
14964 e1ce6c66f56e refactored archive command to use "with" statement Doug Simon <doug.simon@oracle.com> parents: 14940 diff changeset	2635
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2636 return archives
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	2637
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2638 def canonicalizeprojects(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2639 """process all project files to canonicalize the dependencies
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2640
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2641 The exit code of this command reflects how many files were updated."""
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2642
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2643 changedFiles = 0
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	2644 for s in suites(True):
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2645 projectsFile = join(s.mxDir, 'projects')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2646 if not exists(projectsFile):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2647 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2648 with open(projectsFile) as f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2649 out = StringIO.StringIO()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2650 pattern = re.compile('project@([^@]+)@dependencies=.*')
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2651 lineNo = 1
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2652 for line in f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2653 line = line.strip()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2654 m = pattern.match(line)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2655 if m is None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2656 out.write(line + '\n')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2657 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2658 p = project(m.group(1))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2659
6533 250babea75d5 modified canonicalizeprojects to ensure all package prefixes match the enclosing project Doug Simon <doug.simon@oracle.com> parents: 6527 diff changeset	2660 for pkg in p.defined_java_packages():
250babea75d5 modified canonicalizeprojects to ensure all package prefixes match the enclosing project Doug Simon <doug.simon@oracle.com> parents: 6527 diff changeset	2661 if not pkg.startswith(p.name):
250babea75d5 modified canonicalizeprojects to ensure all package prefixes match the enclosing project Doug Simon <doug.simon@oracle.com> parents: 6527 diff changeset	2662 abort('package in {0} does not have prefix matching project name: {1}'.format(p, pkg))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2663
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2664 ignoredDeps = set([name for name in p.deps if project(name, False) is not None])
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2665 for pkg in p.imported_java_packages():
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2666 for name in p.deps:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2667 dep = project(name, False)
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2668 if dep is None:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2669 ignoredDeps.discard(name)
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2670 else:
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2671 if pkg in dep.defined_java_packages():
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2672 ignoredDeps.discard(name)
8439 39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	2673 if pkg in dep.extended_java_packages():
39c7142e7aef added support for projects that extend a package defined in another project when canonicalizing projects Doug Simon <doug.simon@oracle.com> parents: 8391 diff changeset	2674 ignoredDeps.discard(name)
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2675 if len(ignoredDeps) != 0:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2676 candidates = set()
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2677 # Compute dependencies based on projects required by p
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2678 for d in sorted_deps():
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2679 if not d.defined_java_packages().isdisjoint(p.imported_java_packages()):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2680 candidates.add(d)
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2681 # Remove non-canonical candidates
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2682 for c in list(candidates):
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2683 candidates.difference_update(c.all_deps([], False, False))
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2684 candidates = [d.name for d in candidates]
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2685
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2686 abort('{0}:{1}: {2} does not use any packages defined in these projects: {3}\nComputed project dependencies: {4}'.format(
3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2687 projectsFile, lineNo, p, ', '.join(ignoredDeps), ','.join(candidates)))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2688
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2689 out.write('project@' + m.group(1) + '@dependencies=' + ','.join(p.canonical_deps()) + '\n')
6527 3c5b19e8f2a3 modified canonicalizeprojects to detect imprecise dependencies (e.g., A specifies that it depends on B but only imports packages from B's dependencies) Doug Simon <doug.simon@oracle.com> parents: 6509 diff changeset	2690 lineNo = lineNo + 1
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2691 content = out.getvalue()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2692 if update_file(projectsFile, content):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2693 changedFiles += 1
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2694 return changedFiles
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2695
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2696 class TimeStampFile:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2697 def __init__(self, path):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2698 self.path = path
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2699 self.timestamp = os.path.getmtime(path) if exists(path) else None
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2700
12524 2583afcd26ee fixed bug in creation of CreateGRAALDist.launch files Doug Simon <doug.simon@oracle.com> parents: 12522 diff changeset	2701 def isOlderThan(self, arg):
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2702 if not self.timestamp:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2703 return True
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2704 if isinstance(arg, TimeStampFile):
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2705 if arg.timestamp is None:
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2706 return False
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2707 else:
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2708 return arg.timestamp > self.timestamp
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2709 elif isinstance(arg, types.ListType):
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2710 files = arg
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2711 else:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2712 files = [arg]
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2713 for f in files:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2714 if os.path.getmtime(f) > self.timestamp:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2715 return True
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2716 return False
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2717
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2718 def exists(self):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2719 return exists(self.path)
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2720
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2721 def touch(self):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2722 if exists(self.path):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2723 os.utime(self.path, None)
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2724 else:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2725 if not isdir(dirname(self.path)):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2726 os.makedirs(dirname(self.path))
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2727 file(self.path, 'a')
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2728
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2729 def checkstyle(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2730 """run Checkstyle on the Java sources
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2731
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2732 Run Checkstyle over the Java sources. Any errors or warnings
6284 e952911afd2f made mx help command accept abbreviations Doug Simon <doug.simon@oracle.com> parents: 5876 diff changeset	2733 produced by Checkstyle result in a non-zero exit code."""
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2734
10059 4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2735 parser = ArgumentParser(prog='mx checkstyle')
4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2736
4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2737 parser.add_argument('-f', action='store_true', dest='force', help='force checking (disables timestamp checking)')
4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2738 args = parser.parse_args(args)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2739
10059 4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2740 totalErrors = 0
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2741 for p in projects_opt_limit_to_suites():
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2742 if p.native:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2743 continue
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2744 sourceDirs = p.source_dirs()
14918 31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	2745
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	2746 csConfig = join(p.dir, '.checkstyle_checks.xml')
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	2747 if not exists(csConfig):
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	2748 abort('ERROR: Checkstyle configuration for project {} is missing: {}'.format(p.name, csConfig))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2749
10060 193d5163a94a exclude projects from mx checkstyle if their Java compliance level is higher than the configured JDK Doug Simon <doug.simon@oracle.com> parents: 10059 diff changeset	2750 # skip checking this Java project if its Java compliance level is "higher" than the configured JDK
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	2751 jdk = java(p.javaCompliance)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	2752 assert jdk
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2753
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2754 for sourceDir in sourceDirs:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2755 javafilelist = []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2756 for root, _, files in os.walk(sourceDir):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2757 javafilelist += [join(root, name) for name in files if name.endswith('.java') and name != 'package-info.java']
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2758 if len(javafilelist) == 0:
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	2759 logv('[no Java sources in {0} - skipping]'.format(sourceDir))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2760 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2761
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2762 timestamp = TimeStampFile(join(p.suite.mxDir, 'checkstyle-timestamps', sourceDir[len(p.suite.dir) + 1:].replace(os.sep, '_') + '.timestamp'))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2763 mustCheck = False
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2764 if not args.force and timestamp.exists():
12524 2583afcd26ee fixed bug in creation of CreateGRAALDist.launch files Doug Simon <doug.simon@oracle.com> parents: 12522 diff changeset	2765 mustCheck = timestamp.isOlderThan(javafilelist)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2766 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2767 mustCheck = True
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2768
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2769 if not mustCheck:
10059 4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2770 if _opts.verbose:
4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2771 log('[all Java sources in {0} already checked - skipping]'.format(sourceDir))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2772 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2773
14918 31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	2774 dotCheckstyleXML = xml.dom.minidom.parse(csConfig)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2775 localCheckConfig = dotCheckstyleXML.getElementsByTagName('local-check-config')[0]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2776 configLocation = localCheckConfig.getAttribute('location')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2777 configType = localCheckConfig.getAttribute('type')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2778 if configType == 'project':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2779 # Eclipse plugin "Project Relative Configuration" format:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2780 #
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2781 # '/<project_name>/<suffix>'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2782 #
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2783 if configLocation.startswith('/'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2784 name, _, suffix = configLocation.lstrip('/').partition('/')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2785 config = join(project(name).dir, suffix)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2786 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2787 config = join(p.dir, configLocation)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2788 else:
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	2789 logv('[unknown Checkstyle configuration type "' + configType + '" in {0} - skipping]'.format(sourceDir))
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2790 continue
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2791
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2792 exclude = join(p.dir, '.checkstyle.exclude')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2793
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2794 if exists(exclude):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2795 with open(exclude) as f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2796 # Convert patterns to OS separators
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2797 patterns = [name.rstrip().replace('/', os.sep) for name in f.readlines()]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2798 def match(name):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2799 for p in patterns:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2800 if p in name:
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2801 if _opts.verbose:
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2802 log('excluding: ' + name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2803 return True
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2804 return False
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2805
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2806 javafilelist = [name for name in javafilelist if not match(name)]
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2807
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2808 auditfileName = join(p.dir, 'checkstyleOutput.txt')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2809 log('Running Checkstyle on {0} using {1}...'.format(sourceDir, config))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2810
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2811 try:
15274 1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2812 for chunk in _chunk_files_for_command_line(javafilelist):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2813 try:
15274 1ea79f17ab95 mx: generalized workaround for system command line length limits and used it to fix issue with eclipseformat command Doug Simon <doug.simon@oracle.com> parents: 15227 diff changeset	2814 run_java(['-Xmx1g', '-jar', library('CHECKSTYLE').get_path(True), '-f', 'xml', '-c', config, '-o', auditfileName] + chunk, nonZeroIsFatal=False)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2815 finally:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2816 if exists(auditfileName):
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2817 errors = []
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2818 source = [None]
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2819 def start_element(name, attrs):
cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2820 if name == 'file':
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2821 source[0] = attrs['name']
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2822 elif name == 'error':
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2823 errors.append('{}:{}: {}'.format(source[0], attrs['line'], attrs['message']))
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2824
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	2825 xp = xml.parsers.expat.ParserCreate()
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	2826 xp.StartElementHandler = start_element
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2827 with open(auditfileName) as fp:
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	2828 xp.ParseFile(fp)
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2829 if len(errors) != 0:
cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2830 map(log, errors)
10059 4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2831 totalErrors = totalErrors + len(errors)
9826 cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293) Doug Simon <doug.simon@oracle.com> parents: 9262 diff changeset	2832 else:
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	2833 timestamp.touch()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2834 finally:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2835 if exists(auditfileName):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2836 os.unlink(auditfileName)
10059 4dada3ec9c58 mx checkstyle command no longer exits on first error Doug Simon <doug.simon@oracle.com> parents: 10058 diff changeset	2837 return totalErrors
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2838
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2839 def clean(args, parser=None):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2840 """remove all class files, images, and executables
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2841
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2842 Removes all files created by a build, including Java class files, executables, and
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2843 generated images.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2844 """
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2845
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2846 suppliedParser = parser is not None
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2847
12620 a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2848 parser = parser if suppliedParser else ArgumentParser(prog='mx clean')
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2849 parser.add_argument('--no-native', action='store_false', dest='native', help='do not clean native projects')
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2850 parser.add_argument('--no-java', action='store_false', dest='java', help='do not clean Java projects')
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2851
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2852 args = parser.parse_args(args)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2853
15579 c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2854 def _rmtree(dirPath):
c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2855 path = dirPath
c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2856 if get_os() == 'windows':
c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2857 path = unicode("\\\\?\\" + dirPath)
c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2858 shutil.rmtree(path)
c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2859
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	2860 for p in projects_opt_limit_to_suites():
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2861 if p.native:
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2862 if args.native:
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2863 run([gmake_cmd(), '-C', p.dir, 'clean'])
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2864 else:
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2865 if args.java:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2866 genDir = p.source_gen_dir()
7778 6b540bb82312 Fixed clean should clean also generated source directories. Christian Humer <christian.humer@gmail.com> parents: 7681 diff changeset	2867 if genDir != '' and exists(genDir):
6b540bb82312 Fixed clean should clean also generated source directories. Christian Humer <christian.humer@gmail.com> parents: 7681 diff changeset	2868 log('Clearing {0}...'.format(genDir))
6b540bb82312 Fixed clean should clean also generated source directories. Christian Humer <christian.humer@gmail.com> parents: 7681 diff changeset	2869 for f in os.listdir(genDir):
15579 c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2870 _rmtree(join(genDir, f))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2871
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2872
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2873 outputDir = p.output_dir()
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2874 if outputDir != '' and exists(outputDir):
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	2875 log('Removing {0}...'.format(outputDir))
15579 c3869fe3d917 mx clean: make it more reliable on windows Bernhard Urban <bernhard.urban@jku.at> parents: 15577 diff changeset	2876 _rmtree(outputDir)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2877
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2878 for configName in ['netbeans-config.zip', 'eclipse-config.zip']:
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2879 config = TimeStampFile(join(p.suite.mxDir, configName))
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2880 if config.exists():
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2881 os.unlink(config.path)
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	2882
4247 3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2883 if suppliedParser:
3f6c6e61614e Changed 'mx build' such that all Java sources for a project are compiled together instead of by source directory. Doug Simon <doug.simon@oracle.com> parents: 4242 diff changeset	2884 return args
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2885
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2886 def about(args):
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2887 """show the 'man page' for mx"""
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2888 print __doc__
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2889
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2890 def help_(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2891 """show help for a given command
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2892
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2893 With no arguments, print a list of commands and short help for each command.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2894
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2895 Given a command name, print help for that command."""
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2896 if len(args) == 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2897 _argParser.print_help()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2898 return
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2899
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2900 name = args[0]
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2901 if not _commands.has_key(name):
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2902 hits = [c for c in _commands.iterkeys() if c.startswith(name)]
6284 e952911afd2f made mx help command accept abbreviations Doug Simon <doug.simon@oracle.com> parents: 5876 diff changeset	2903 if len(hits) == 1:
e952911afd2f made mx help command accept abbreviations Doug Simon <doug.simon@oracle.com> parents: 5876 diff changeset	2904 name = hits[0]
e952911afd2f made mx help command accept abbreviations Doug Simon <doug.simon@oracle.com> parents: 5876 diff changeset	2905 elif len(hits) == 0:
e952911afd2f made mx help command accept abbreviations Doug Simon <doug.simon@oracle.com> parents: 5876 diff changeset	2906 abort('mx: unknown command \'{0}\'\n{1}use "mx help" for more options'.format(name, _format_commands()))
e952911afd2f made mx help command accept abbreviations Doug Simon <doug.simon@oracle.com> parents: 5876 diff changeset	2907 else:
e952911afd2f made mx help command accept abbreviations Doug Simon <doug.simon@oracle.com> parents: 5876 diff changeset	2908 abort('mx: command \'{0}\' is ambiguous\n {1}'.format(name, ' '.join(hits)))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	2909
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	2910 value = _commands[name]
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2911 (func, usage) = value[:2]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2912 doc = func.__doc__
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2913 if len(value) > 2:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2914 docArgs = value[2:]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2915 fmtArgs = []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2916 for d in docArgs:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2917 if isinstance(d, Callable):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	2918 fmtArgs += [d()]
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2919 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2920 fmtArgs += [str(d)]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2921 doc = doc.format(*fmtArgs)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2922 print 'mx {0} {1}\n\n{2}\n'.format(name, usage, doc)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2923
4301 fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2924 def projectgraph(args, suite=None):
12620 a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2925 """create graph for project structure ("mx projectgraph \| dot -Tpdf -oprojects.pdf" or "mx projectgraph --igv")"""
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2926
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2927 parser = ArgumentParser(prog='mx projectgraph')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2928 parser.add_argument('--igv', action='store_true', help='output to IGV listening on 127.0.0.1:4444')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2929 parser.add_argument('--igv-format', action='store_true', help='output graph in IGV format')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2930
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2931 args = parser.parse_args(args)
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2932
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2933 if args.igv or args.igv_format:
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2934 ids = {}
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2935 nextToIndex = {}
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2936 igv = XMLDoc()
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2937 igv.open('graphDocument')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2938 igv.open('group')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2939 igv.open('properties')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2940 igv.element('p', {'name' : 'name'}, 'GraalProjectDependencies')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2941 igv.close('properties')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2942 igv.open('graph', {'name' : 'dependencies'})
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2943 igv.open('nodes')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2944 for p in sorted_deps(includeLibs=True):
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2945 ident = len(ids)
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2946 ids[p.name] = str(ident)
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2947 igv.open('node', {'id' : str(ident)})
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2948 igv.open('properties')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2949 igv.element('p', {'name' : 'name'}, p.name)
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2950 igv.close('properties')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2951 igv.close('node')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2952 igv.close('nodes')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2953 igv.open('edges')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2954 for p in projects():
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2955 fromIndex = 0
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2956 for dep in p.canonical_deps():
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2957 toIndex = nextToIndex.get(dep, 0)
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2958 nextToIndex[dep] = toIndex + 1
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2959 igv.element('edge', {'from' : ids[p.name], 'fromIndex' : str(fromIndex), 'to' : ids[dep], 'toIndex' : str(toIndex), 'label' : 'dependsOn'})
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2960 fromIndex = fromIndex + 1
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2961 igv.close('edges')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2962 igv.close('graph')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2963 igv.close('group')
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2964 igv.close('graphDocument')
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2965
12620 a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2966 if args.igv:
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2967 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2968 s.connect(('127.0.0.1', 4444))
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2969 s.send(igv.xml())
a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2970 else:
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2971 print igv.xml(indent=' ', newl='\n')
12620 a9f750305a38 added --igv option to "mx projectgraph" command for sending output to IGV instead Doug Simon <doug.simon@oracle.com> parents: 12571 diff changeset	2972 return
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	2973
4301 fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2974 print 'digraph projects {'
fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2975 print 'rankdir=BT;'
fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2976 print 'node [shape=rect];'
fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2977 for p in projects():
fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2978 for dep in p.canonical_deps():
fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2979 print '"' + p.name + '"->"' + dep + '"'
fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	2980 print '}'
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	2981
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2982 def _source_locator_memento(deps):
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	2983 slm = XMLDoc()
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2984 slm.open('sourceLookupDirector')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2985 slm.open('sourceContainers', {'duplicates' : 'false'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2986
13775 43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	2987 javaCompliance = None
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2988 for dep in deps:
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2989 if dep.isLibrary():
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2990 if hasattr(dep, 'eclipse.container'):
8633 c4bca84d86d7 ensure generated Jar.launch files have the same format as that produced when refreshing in Eclipse Doug Simon <doug.simon@oracle.com> parents: 8607 diff changeset	2991 memento = XMLDoc().element('classpathContainer', {'path' : getattr(dep, 'eclipse.container')}).xml(standalone='no')
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2992 slm.element('classpathContainer', {'memento' : memento, 'typeId':'org.eclipse.jdt.launching.sourceContainer.classpathContainer'})
13727 10e6f192631f added library sources (if available) to generated Eclipse attach launcher Doug Simon <doug.simon@oracle.com> parents: 13682 diff changeset	2993 elif dep.get_source_path(resolve=True):
10e6f192631f added library sources (if available) to generated Eclipse attach launcher Doug Simon <doug.simon@oracle.com> parents: 13682 diff changeset	2994 memento = XMLDoc().element('archive', {'detectRoot' : 'true', 'path' : dep.get_source_path(resolve=True)}).xml(standalone='no')
10e6f192631f added library sources (if available) to generated Eclipse attach launcher Doug Simon <doug.simon@oracle.com> parents: 13682 diff changeset	2995 slm.element('container', {'memento' : memento, 'typeId':'org.eclipse.debug.core.containerType.externalArchive'})
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	2996 elif dep.isProject():
8633 c4bca84d86d7 ensure generated Jar.launch files have the same format as that produced when refreshing in Eclipse Doug Simon <doug.simon@oracle.com> parents: 8607 diff changeset	2997 memento = XMLDoc().element('javaProject', {'name' : dep.name}).xml(standalone='no')
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	2998 slm.element('container', {'memento' : memento, 'typeId':'org.eclipse.jdt.launching.sourceContainer.javaProject'})
15693 807090ddbbf2 use JDK with highest compliance level for generated Eclipse attach launcher Doug Simon <doug.simon@oracle.com> parents: 15662 diff changeset	2999 if javaCompliance is None or dep.javaCompliance > javaCompliance:
13775 43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3000 javaCompliance = dep.javaCompliance
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3001
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3002 if javaCompliance:
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3003 memento = XMLDoc().element('classpathContainer', {'path' : 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-' + str(javaCompliance)}).xml(standalone='no')
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3004 slm.element('classpathContainer', {'memento' : memento, 'typeId':'org.eclipse.jdt.launching.sourceContainer.classpathContainer'})
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3005 else:
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3006 memento = XMLDoc().element('classpathContainer', {'path' : 'org.eclipse.jdt.launching.JRE_CONTAINER'}).xml(standalone='no')
43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3007 slm.element('classpathContainer', {'memento' : memento, 'typeId':'org.eclipse.jdt.launching.sourceContainer.classpathContainer'})
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3008
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3009 slm.close('sourceContainers')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3010 slm.close('sourceLookupDirector')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3011 return slm
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3012
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3013 def make_eclipse_attach(suite, hostname, port, name=None, deps=None):
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3014 """
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3015 Creates an Eclipse launch configuration file for attaching to a Java process.
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3016 """
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3017 if deps is None:
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3018 deps = []
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3019 slm = _source_locator_memento(deps)
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	3020 launch = XMLDoc()
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3021 launch.open('launchConfiguration', {'type' : 'org.eclipse.jdt.launching.remoteJavaApplication'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3022 launch.element('stringAttribute', {'key' : 'org.eclipse.debug.core.source_locator_id', 'value' : 'org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3023 launch.element('stringAttribute', {'key' : 'org.eclipse.debug.core.source_locator_memento', 'value' : '%s'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3024 launch.element('booleanAttribute', {'key' : 'org.eclipse.jdt.launching.ALLOW_TERMINATE', 'value' : 'true'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3025 launch.open('mapAttribute', {'key' : 'org.eclipse.jdt.launching.CONNECT_MAP'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3026 launch.element('mapEntry', {'key' : 'hostname', 'value' : hostname})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3027 launch.element('mapEntry', {'key' : 'port', 'value' : port})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3028 launch.close('mapAttribute')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3029 launch.element('stringAttribute', {'key' : 'org.eclipse.jdt.launching.PROJECT_ATTR', 'value' : ''})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3030 launch.element('stringAttribute', {'key' : 'org.eclipse.jdt.launching.VM_CONNECTOR_ID', 'value' : 'org.eclipse.jdt.launching.socketAttachConnector'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3031 launch.close('launchConfiguration')
8633 c4bca84d86d7 ensure generated Jar.launch files have the same format as that produced when refreshing in Eclipse Doug Simon <doug.simon@oracle.com> parents: 8607 diff changeset	3032 launch = launch.xml(newl='\n', standalone='no') % slm.xml(escape=True, standalone='no')
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3033
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3034 if name is None:
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3035 if len(suites()) == 1:
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	3036 suitePrefix = ''
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3037 else:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3038 suitePrefix = suite.name + '-'
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3039 name = suitePrefix + 'attach-' + hostname + '-' + port
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3040 eclipseLaunches = join(suite.mxDir, 'eclipse-launches')
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3041 if not exists(eclipseLaunches):
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3042 os.makedirs(eclipseLaunches)
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3043 launchFile = join(eclipseLaunches, name + '.launch')
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3044 return update_file(launchFile, launch), launchFile
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3045
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3046 def make_eclipse_launch(javaArgs, jre, name=None, deps=None):
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3047 """
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3048 Creates an Eclipse launch configuration file for running/debugging a Java command.
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3049 """
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3050 if deps is None:
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3051 deps = []
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3052 mainClass = None
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3053 vmArgs = []
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3054 appArgs = []
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3055 cp = None
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3056 argsCopy = list(reversed(javaArgs))
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3057 while len(argsCopy) != 0:
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3058 a = argsCopy.pop()
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3059 if a == '-jar':
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3060 mainClass = '-jar'
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3061 appArgs = list(reversed(argsCopy))
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3062 break
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3063 if a == '-cp' or a == '-classpath':
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3064 assert len(argsCopy) != 0
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3065 cp = argsCopy.pop()
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3066 vmArgs.append(a)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3067 vmArgs.append(cp)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3068 elif a.startswith('-'):
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3069 vmArgs.append(a)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3070 else:
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3071 mainClass = a
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3072 appArgs = list(reversed(argsCopy))
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3073 break
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3074
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3075 if mainClass is None:
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3076 log('Cannot create Eclipse launch configuration without main class or jar file: java ' + ' '.join(javaArgs))
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3077 return False
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3078
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3079 if name is None:
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3080 if mainClass == '-jar':
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3081 name = basename(appArgs[0])
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3082 if len(appArgs) > 1 and not appArgs[1].startswith('-'):
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3083 name = name + '_' + appArgs[1]
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3084 else:
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3085 name = mainClass
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3086 name = time.strftime('%Y-%m-%d-%H%M%S_' + name)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3087
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3088 if cp is not None:
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3089 for e in cp.split(os.pathsep):
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3090 for s in suites():
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3091 deps += [p for p in s.projects if e == p.output_dir()]
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3092 deps += [l for l in s.libs if e == l.get_path(False)]
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3093
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3094 slm = _source_locator_memento(deps)
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3095
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	3096 launch = XMLDoc()
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3097 launch.open('launchConfiguration', {'type' : 'org.eclipse.jdt.launching.localJavaApplication'})
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3098 launch.element('stringAttribute', {'key' : 'org.eclipse.debug.core.source_locator_id', 'value' : 'org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector'})
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3099 launch.element('stringAttribute', {'key' : 'org.eclipse.debug.core.source_locator_memento', 'value' : '%s'})
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3100 launch.element('stringAttribute', {'key' : 'org.eclipse.jdt.launching.JRE_CONTAINER', 'value' : 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/' + jre})
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3101 launch.element('stringAttribute', {'key' : 'org.eclipse.jdt.launching.MAIN_TYPE', 'value' : mainClass})
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3102 launch.element('stringAttribute', {'key' : 'org.eclipse.jdt.launching.PROGRAM_ARGUMENTS', 'value' : ' '.join(appArgs)})
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3103 launch.element('stringAttribute', {'key' : 'org.eclipse.jdt.launching.PROJECT_ATTR', 'value' : ''})
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3104 launch.element('stringAttribute', {'key' : 'org.eclipse.jdt.launching.VM_ARGUMENTS', 'value' : ' '.join(vmArgs)})
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3105 launch.close('launchConfiguration')
8633 c4bca84d86d7 ensure generated Jar.launch files have the same format as that produced when refreshing in Eclipse Doug Simon <doug.simon@oracle.com> parents: 8607 diff changeset	3106 launch = launch.xml(newl='\n', standalone='no') % slm.xml(escape=True, standalone='no')
5194 a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3107
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3108 eclipseLaunches = join('mx', 'eclipse-launches')
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3109 if not exists(eclipseLaunches):
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3110 os.makedirs(eclipseLaunches)
a6eceb5efb0e added --ecl option to mx for saving VM execution(s) as Eclipse launch configurations Doug Simon <doug.simon@oracle.com> parents: 5189 diff changeset	3111 return update_file(join(eclipseLaunches, name + '.launch'), launch)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	3112
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3113 def eclipseinit(args, buildProcessorJars=True, refreshOnly=False):
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3114 """(re)generate Eclipse project configurations and working sets"""
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3115 for s in suites(True):
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3116 _eclipseinit_suite(args, s, buildProcessorJars, refreshOnly)
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	3117
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3118 generate_eclipse_workingsets()
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3119
13682 c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3120 def _check_ide_timestamp(suite, configZip, ide):
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	3121 """return True if and only if the projects file, eclipse-settings files, and mx itself are all older than configZip"""
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	3122 projectsFile = join(suite.mxDir, 'projects')
13682 c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3123 if configZip.isOlderThan(projectsFile):
13243 68529068f08e Update eclipse config when files in eclipse-settings have changed Gilles Duboscq <duboscq@ssw.jku.at> parents: 12689 diff changeset	3124 return False
12630 aadb188e4258 mxtool: regenerate IDE files when suite imports file changes Mick Jordan <mick.jordan@oracle.com> parents: 12620 diff changeset	3125 # Assume that any mx change might imply changes to the generated IDE files
13682 c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3126 if configZip.isOlderThan(__file__):
13243 68529068f08e Update eclipse config when files in eclipse-settings have changed Gilles Duboscq <duboscq@ssw.jku.at> parents: 12689 diff changeset	3127 return False
13266 78ed696884b3 fixed regression in pylint command (exit code must be non-zero if at least one warning/error was found) Doug Simon <doug.simon@oracle.com> parents: 13247 diff changeset	3128
13682 c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3129 if ide == 'eclipse':
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3130 eclipseSettingsDir = join(suite.mxDir, 'eclipse-settings')
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3131 if exists(eclipseSettingsDir):
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3132 for name in os.listdir(eclipseSettingsDir):
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3133 path = join(eclipseSettingsDir, name)
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3134 if configZip.isOlderThan(path):
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3135 return False
13266 78ed696884b3 fixed regression in pylint command (exit code must be non-zero if at least one warning/error was found) Doug Simon <doug.simon@oracle.com> parents: 13247 diff changeset	3136 return True
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3137
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3138 def _eclipseinit_suite(args, suite, buildProcessorJars=True, refreshOnly=False):
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3139 configZip = TimeStampFile(join(suite.mxDir, 'eclipse-config.zip'))
13475 4a3628c79ff9 separated external libs out from zipped up IDE configs Doug Simon <doug.simon@oracle.com> parents: 13473 diff changeset	3140 configLibsZip = join(suite.mxDir, 'eclipse-config-libs.zip')
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3141 if refreshOnly and not configZip.exists():
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3142 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3143
13682 c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3144 if _check_ide_timestamp(suite, configZip, 'eclipse'):
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3145 logv('[Eclipse configurations are up to date - skipping]')
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3146 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3147
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3148 files = []
13475 4a3628c79ff9 separated external libs out from zipped up IDE configs Doug Simon <doug.simon@oracle.com> parents: 13473 diff changeset	3149 libFiles = []
7293 4974776828ec Avoid recursive calls of build Christian Wimmer <christian.wimmer@oracle.com> parents: 7291 diff changeset	3150 if buildProcessorJars:
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3151 files += _processorjars_suite(suite)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3152
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3153 projToDist = dict()
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3154 for dist in _dists.values():
14775 40aa1eb176db mx: added support for excluding dependencies from distributions Doug Simon <doug.simon@oracle.com> parents: 14764 diff changeset	3155 distDeps = dist.sorted_deps()
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3156 for p in distDeps:
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3157 projToDist[p.name] = (dist, [dep.name for dep in distDeps])
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3158
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3159 for p in suite.projects:
5071 9d055af068a8 Made Java builds look for mx/ecj.jar to use Eclipse batch compiler by default. Doug Simon <doug.simon@oracle.com> parents: 5032 diff changeset	3160 if p.native:
9d055af068a8 Made Java builds look for mx/ecj.jar to use Eclipse batch compiler by default. Doug Simon <doug.simon@oracle.com> parents: 5032 diff changeset	3161 continue
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3162
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3163 assert java(p.javaCompliance)
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3164
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3165 if not exists(p.dir):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3166 os.makedirs(p.dir)
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3167
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	3168 out = XMLDoc()
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3169 out.open('classpath')
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3170
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3171 for src in p.srcDirs:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3172 srcDir = join(p.dir, src)
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3173 if not exists(srcDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3174 os.mkdir(srcDir)
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3175 out.element('classpathentry', {'kind' : 'src', 'path' : src})
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3176
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	3177 if len(p.annotation_processors()) > 0:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3178 genDir = p.source_gen_dir()
7299 57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3179 if not exists(genDir):
57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3180 os.mkdir(genDir)
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3181 out.element('classpathentry', {'kind' : 'src', 'path' : 'src_gen'})
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3182 files.append(genDir)
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3183
13775 43c7df32d5ab use lowest version JRE specified by any project for source path in Eclipse attach/launch configuration Doug Simon <doug.simon@oracle.com> parents: 13727 diff changeset	3184 # Every Java program depends on a JRE
13247 e709633d87c6 Use java compilance from project in eclipse settings for compilance, source and target Gilles Duboscq <duboscq@ssw.jku.at> parents: 13243 diff changeset	3185 out.element('classpathentry', {'kind' : 'con', 'path' : 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-' + str(p.javaCompliance)})
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3186
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3187 if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3188 out.element('classpathentry', {'kind' : 'con', 'path' : 'org.eclipse.pde.core.requiredPlugins'})
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3189
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3190 containerDeps = set()
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3191 libraryDeps = set()
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3192 projectDeps = set()
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3193
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3194 for dep in p.all_deps([], True):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3195 if dep == p:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3196 continue
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3197 if dep.isLibrary():
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3198 if hasattr(dep, 'eclipse.container'):
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3199 container = getattr(dep, 'eclipse.container')
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3200 containerDeps.add(container)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3201 libraryDeps -= set(dep.all_deps([], True))
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3202 else:
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3203 libraryDeps.add(dep)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3204 elif dep.isProject():
15149 2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3205 projectDeps.add(dep)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3206
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3207 for dep in containerDeps:
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3208 out.element('classpathentry', {'exported' : 'true', 'kind' : 'con', 'path' : dep})
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3209
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3210 for dep in libraryDeps:
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3211 path = dep.path
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3212 dep.get_path(resolve=True)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3213
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3214 # Relative paths for "lib" class path entries have various semantics depending on the Eclipse
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3215 # version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3216 # safest to simply use absolute paths.
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3217 path = _make_absolute(path, p.suite.dir)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3218
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3219 attributes = {'exported' : 'true', 'kind' : 'lib', 'path' : path}
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3220
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3221 sourcePath = dep.get_source_path(resolve=True)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3222 if sourcePath is not None:
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3223 attributes['sourcepath'] = sourcePath
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3224 out.element('classpathentry', attributes)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3225 libFiles.append(path)
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3226
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3227 for dep in projectDeps:
2c7b18ae25d2 Add support for library dependencies Gilles Duboscq <duboscq@ssw.jku.at> parents: 15148 diff changeset	3228 out.element('classpathentry', {'combineaccessrules' : 'false', 'exported' : 'true', 'kind' : 'src', 'path' : '/' + dep.name})
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3229
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3230 out.element('classpathentry', {'kind' : 'output', 'path' : getattr(p, 'eclipse.output', 'bin')})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3231 out.close('classpath')
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3232 classpathFile = join(p.dir, '.classpath')
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3233 update_file(classpathFile, out.xml(indent='\t', newl='\n'))
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3234 files.append(classpathFile)
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3235
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3236 csConfig = join(project(p.checkstyleProj).dir, '.checkstyle_checks.xml')
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3237 if exists(csConfig):
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	3238 out = XMLDoc()
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3239
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3240 dotCheckstyle = join(p.dir, ".checkstyle")
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3241 checkstyleConfigPath = '/' + p.checkstyleProj + '/.checkstyle_checks.xml'
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3242 out.open('fileset-config', {'file-format-version' : '1.2.0', 'simple-config' : 'true'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3243 out.open('local-check-config', {'name' : 'Checks', 'location' : checkstyleConfigPath, 'type' : 'project', 'description' : ''})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3244 out.element('additional-data', {'name' : 'protect-config-file', 'value' : 'false'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3245 out.close('local-check-config')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3246 out.open('fileset', {'name' : 'all', 'enabled' : 'true', 'check-config-name' : 'Checks', 'local' : 'true'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3247 out.element('file-match-pattern', {'match-pattern' : '.', 'include-pattern' : 'true'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3248 out.close('fileset')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3249 out.open('filter', {'name' : 'all', 'enabled' : 'true', 'check-config-name' : 'Checks', 'local' : 'true'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3250 out.element('filter-data', {'value' : 'java'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3251 out.close('filter')
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3252
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3253 exclude = join(p.dir, '.checkstyle.exclude')
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3254 if exists(exclude):
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3255 out.open('filter', {'name' : 'FilesFromPackage', 'enabled' : 'true'})
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3256 with open(exclude) as f:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3257 for line in f:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3258 if not line.startswith('#'):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3259 line = line.strip()
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3260 exclDir = join(p.dir, line)
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3261 assert isdir(exclDir), 'excluded source directory listed in ' + exclude + ' does not exist or is not a directory: ' + exclDir
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3262 out.element('filter-data', {'value' : line})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3263 out.close('filter')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3264
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3265 out.close('fileset-config')
5219 ddccd4abdb09 configured test source directory for graal.graph project Doug Simon <doug.simon@oracle.com> parents: 5217 diff changeset	3266 update_file(dotCheckstyle, out.xml(indent=' ', newl='\n'))
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3267 files.append(dotCheckstyle)
14918 31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	3268 else:
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	3269 # clean up existing .checkstyle file
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	3270 dotCheckstyle = join(p.dir, ".checkstyle")
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	3271 if exists(dotCheckstyle):
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	3272 os.unlink(dotCheckstyle)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3273
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	3274 out = XMLDoc()
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3275 out.open('projectDescription')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3276 out.element('name', data=p.name)
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3277 out.element('comment', data='')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3278 out.element('projects', data='')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3279 out.open('buildSpec')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3280 out.open('buildCommand')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3281 out.element('name', data='org.eclipse.jdt.core.javabuilder')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3282 out.element('arguments', data='')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3283 out.close('buildCommand')
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3284 if exists(csConfig):
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3285 out.open('buildCommand')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3286 out.element('name', data='net.sf.eclipsecs.core.CheckstyleBuilder')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3287 out.element('arguments', data='')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3288 out.close('buildCommand')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3289 if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3290 for buildCommand in ['org.eclipse.pde.ManifestBuilder', 'org.eclipse.pde.SchemaBuilder']:
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3291 out.open('buildCommand')
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3292 out.element('name', data=buildCommand)
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3293 out.element('arguments', data='')
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3294 out.close('buildCommand')
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3295
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3296 # The path should always be p.name/dir. independent of where the workspace actually is.
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3297 # So we use the parent folder of the project, whatever that is, to generate such a relative path.
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3298 logicalWorkspaceRoot = os.path.dirname(p.dir)
12684 ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3299 binFolder = os.path.relpath(p.output_dir(), logicalWorkspaceRoot)
ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3300
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3301 if _isAnnotationProcessorDependency(p):
12684 ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3302 refreshFile = os.path.relpath(join(p.dir, p.name + '.jar'), logicalWorkspaceRoot)
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3303 _genEclipseBuilder(out, p, 'Jar', 'archive ' + p.name, refresh=True, refreshFile=refreshFile, relevantResources=[binFolder], async=True, xmlIndent='', xmlStandalone='no')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3304
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3305 if projToDist.has_key(p.name):
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3306 dist, distDeps = projToDist[p.name]
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3307 _genEclipseBuilder(out, p, 'Create' + dist.name + 'Dist', 'archive @' + dist.name, relevantResources=[binFolder], logToFile=True, refresh=False, async=True)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3308
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3309 out.close('buildSpec')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3310 out.open('natures')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3311 out.element('nature', data='org.eclipse.jdt.core.javanature')
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3312 if exists(csConfig):
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3313 out.element('nature', data='net.sf.eclipsecs.core.CheckstyleNature')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3314 if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3315 out.element('nature', data='org.eclipse.pde.PluginNature')
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3316 out.close('natures')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3317 out.close('projectDescription')
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3318 projectFile = join(p.dir, '.project')
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3319 update_file(projectFile, out.xml(indent='\t', newl='\n'))
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3320 files.append(projectFile)
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3321
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3322 settingsDir = join(p.dir, ".settings")
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3323 if not exists(settingsDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3324 os.mkdir(settingsDir)
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3325
14745 65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3326 # collect the defaults from mxtool
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3327 defaultEclipseSettingsDir = join(dirname(__file__), 'eclipse-settings')
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3328 esdict = {}
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3329 if exists(defaultEclipseSettingsDir):
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3330 for name in os.listdir(defaultEclipseSettingsDir):
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3331 if isfile(join(defaultEclipseSettingsDir, name)):
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3332 esdict[name] = os.path.abspath(join(defaultEclipseSettingsDir, name))
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3333
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3334 # check for suite overrides
11620 60e3fe0fe939 mxtool: fix eclipseinit to use project suite dir for included suites Mick Jordan <mick.jordan@oracle.com> parents: 11605 diff changeset	3335 eclipseSettingsDir = join(p.suite.mxDir, 'eclipse-settings')
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3336 if exists(eclipseSettingsDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3337 for name in os.listdir(eclipseSettingsDir):
14745 65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3338 if isfile(join(eclipseSettingsDir, name)):
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3339 esdict[name] = os.path.abspath(join(eclipseSettingsDir, name))
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3340
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3341 # check for project overrides
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3342 projectSettingsDir = join(p.dir, 'eclipse-settings')
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3343 if exists(projectSettingsDir):
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3344 for name in os.listdir(projectSettingsDir):
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3345 if isfile(join(projectSettingsDir, name)):
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3346 esdict[name] = os.path.abspath(join(projectSettingsDir, name))
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3347
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3348 # copy a possibly modified file to the project's .settings directory
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3349 for name, path in esdict.iteritems():
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3350 # ignore this file altogether if this project has no annotation processors
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3351 if name == "org.eclipse.jdt.apt.core.prefs" and not len(p.annotation_processors()) > 0:
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3352 continue
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3353
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3354 with open(path) as f:
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3355 content = f.read()
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3356 content = content.replace('${javaCompliance}', str(p.javaCompliance))
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3357 if len(p.annotation_processors()) > 0:
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3358 content = content.replace('org.eclipse.jdt.core.compiler.processAnnotations=disabled', 'org.eclipse.jdt.core.compiler.processAnnotations=enabled')
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3359 update_file(join(settingsDir, name), content)
65b005b58825 Allow project-specific overrides of Eclipse configuration files Christian Wimmer <christian.wimmer@oracle.com> parents: 14626 diff changeset	3360 files.append(join(settingsDir, name))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3361
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	3362 if len(p.annotation_processors()) > 0:
5876 c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	3363 out = XMLDoc()
c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	3364 out.open('factorypath')
11701 e29743466d00 fixed regression in mx.py Doug Simon <doug.simon@oracle.com> parents: 11687 diff changeset	3365 out.element('factorypathentry', {'kind' : 'PLUGIN', 'id' : 'org.eclipse.jst.ws.annotations.core', 'enabled' : 'true', 'runInBatchMode' : 'false'})
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	3366 for ap in p.annotation_processors():
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	3367 for dep in dependency(ap).all_deps([], True):
5876 c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	3368 if dep.isLibrary():
c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	3369 if not hasattr(dep, 'eclipse.container') and not hasattr(dep, 'eclipse.project'):
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3370 # Relative paths for "lib" class path entries have various semantics depending on the Eclipse
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3371 # version being used (e.g. see https://bugs.eclipse.org/bugs/show_bug.cgi?id=274737) so it's
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3372 # safest to simply use absolute paths.
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3373 path = _make_absolute(dep.get_path(resolve=True), p.suite.dir)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3374 out.element('factorypathentry', {'kind' : 'EXTJAR', 'id' : path, 'enabled' : 'true', 'runInBatchMode' : 'false'})
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3375 files.append(path)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3376 elif dep.isProject():
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3377 out.element('factorypathentry', {'kind' : 'WKSPJAR', 'id' : '/' + dep.name + '/' + dep.name + '.jar', 'enabled' : 'true', 'runInBatchMode' : 'false'})
5876 c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	3378 out.close('factorypath')
c21886d4e125 Annotation Processor support in mx : use annotationProcessorClasses property on projects that contain annotation processors and annotationProcessors on projects that require annotation processing Gilles Duboscq <duboscq@ssw.jku.at> parents: 5854 diff changeset	3379 update_file(join(p.dir, '.factorypath'), out.xml(indent='\t', newl='\n'))
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3380 files.append(join(p.dir, '.factorypath'))
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3381
13727 10e6f192631f added library sources (if available) to generated Eclipse attach launcher Doug Simon <doug.simon@oracle.com> parents: 13682 diff changeset	3382 _, launchFile = make_eclipse_attach(suite, 'localhost', '8000', deps=sorted_deps(projectNames=None, includeLibs=True))
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3383 files.append(launchFile)
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3384
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3385 _zip_files(files, suite.dir, configZip.path)
13475 4a3628c79ff9 separated external libs out from zipped up IDE configs Doug Simon <doug.simon@oracle.com> parents: 13473 diff changeset	3386 _zip_files(libFiles, suite.dir, configLibsZip)
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3387
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3388 def _zip_files(files, baseDir, zipPath):
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3389 fd, tmp = tempfile.mkstemp(suffix='', prefix=basename(zipPath), dir=baseDir)
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3390 try:
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3391 zf = zipfile.ZipFile(tmp, 'w')
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3392 for f in sorted(set(files)):
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3393 relpath = os.path.relpath(f, baseDir)
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3394 arcname = relpath.replace(os.sep, '/')
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3395 zf.write(f, arcname)
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3396 zf.close()
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3397 os.close(fd)
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3398 # Atomic on Unix
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3399 shutil.move(tmp, zipPath)
14103 9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	3400 # Correct the permissions on the temporary file which is created with restrictive permissions
9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	3401 os.chmod(zipPath, 0o666 & ~currentUmask)
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3402 finally:
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3403 if exists(tmp):
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3404 os.remove(tmp)
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	3405
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3406 def _isAnnotationProcessorDependency(p):
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3407 """
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3408 Determines if a given project is part of an annotation processor.
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3409 """
9857 719a290b8a23 added optional annotationProcessorForDependents attribute for a project to inject itself as an annotation processor for all dependents Doug Simon <doug.simon@oracle.com> parents: 9854 diff changeset	3410 return p in sorted_deps(annotation_processors())
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3411
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3412 def _genEclipseBuilder(dotProjectDoc, p, name, mxCommand, refresh=True, refreshFile=None, relevantResources=None, async=False, logToConsole=False, logToFile=False, appendToLogFile=True, xmlIndent='\t', xmlStandalone=None):
12514 8c64f10f86b7 append output of mx command to (re)build graal.jar to a per-project log file Doug Simon <doug.simon@oracle.com> parents: 12513 diff changeset	3413 externalToolDir = join(p.dir, '.externalToolBuilders')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3414 launchOut = XMLDoc()
8181 989e0582a30f enabled Eclipse builders to use console logging Doug Simon <doug.simon@oracle.com> parents: 8180 diff changeset	3415 consoleOn = 'true' if logToConsole else 'false'
7299 57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3416 launchOut.open('launchConfiguration', {'type' : 'org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType'})
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3417 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.capture_output', 'value': consoleOn})
8174 67d654d9ee9a pass JAVA_HOME to eclipse builder Lukas Stadler <lukas.stadler@jku.at> parents: 8138 diff changeset	3418 launchOut.open('mapAttribute', {'key' : 'org.eclipse.debug.core.environmentVariables'})
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3419 launchOut.element('mapEntry', {'key' : 'JAVA_HOME', 'value' : java(p.javaCompliance).jdk})
14785 66ac13a2c7a1 pass EXTRA_JAVA_HOMES to eclipse builders Lukas Stadler <lukas.stadler@oracle.com> parents: 14781 diff changeset	3420 launchOut.element('mapEntry', {'key' : 'EXTRA_JAVA_HOMES', 'value' : _opts.extra_java_homes})
8174 67d654d9ee9a pass JAVA_HOME to eclipse builder Lukas Stadler <lukas.stadler@jku.at> parents: 8138 diff changeset	3421 launchOut.close('mapAttribute')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3422
7681 f81be78f15a5 Fixed eclipse configuration for annotation processors. Annotation processor jars Christian Humer <christian.humer@gmail.com> parents: 7533 diff changeset	3423 if refresh:
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3424 if refreshFile is None:
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3425 refreshScope = '${project}'
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3426 else:
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3427 refreshScope = '${working_set:<?xml version="1.0" encoding="UTF-8"?><resources><item path="' + refreshFile + '" type="1"/></resources>}'
12684 ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3428
ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3429 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE', 'value': 'false'})
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3430 launchOut.element('stringAttribute', {'key' : 'org.eclipse.debug.core.ATTR_REFRESH_SCOPE', 'value': refreshScope})
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3431
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3432 if relevantResources is not None:
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3433 resources = '${working_set:<?xml version="1.0" encoding="UTF-8"?><resources>'
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3434 for relevantResource in relevantResources:
12684 ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3435 resources += '<item path="' + relevantResource + '" type="2" />'
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3436 resources += '</resources>}'
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3437 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE', 'value': resources})
12684 ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3438
ec224fef3012 integrated auto-formatting changes Doug Simon <doug.simon@oracle.com> parents: 12662 diff changeset	3439
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3440 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON', 'value': consoleOn})
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3441 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND', 'value': 'true' if async else 'false'})
12514 8c64f10f86b7 append output of mx command to (re)build graal.jar to a per-project log file Doug Simon <doug.simon@oracle.com> parents: 12513 diff changeset	3442 if logToFile:
8c64f10f86b7 append output of mx command to (re)build graal.jar to a per-project log file Doug Simon <doug.simon@oracle.com> parents: 12513 diff changeset	3443 logFile = join(externalToolDir, name + '.log')
12524 2583afcd26ee fixed bug in creation of CreateGRAALDist.launch files Doug Simon <doug.simon@oracle.com> parents: 12522 diff changeset	3444 launchOut.element('stringAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE', 'value': logFile})
12514 8c64f10f86b7 append output of mx command to (re)build graal.jar to a per-project log file Doug Simon <doug.simon@oracle.com> parents: 12513 diff changeset	3445 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.debug.ui.ATTR_APPEND_TO_FILE', 'value': 'true' if appendToLogFile else 'false'})
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3446
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3447 # expect to find the OS command to invoke mx in the same directory
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3448 baseDir = dirname(os.path.abspath(__file__))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3449
7299 57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3450 cmd = 'mx.sh'
57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3451 if get_os() == 'windows':
57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3452 cmd = 'mx.cmd'
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3453 cmdPath = join(baseDir, cmd)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3454 if not os.path.exists(cmdPath):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3455 # backwards compatibility for when the commands lived in parent of mxtool
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3456 cmdPath = join(dirname(baseDir), cmd)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3457 if not os.path.exists(cmdPath):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3458 abort('cannot locate ' + cmd)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3459
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	3460 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_LOCATION', 'value': cmdPath})
12661 0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops. Christian Humer <christian.humer@gmail.com> parents: 12640 diff changeset	3461 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS', 'value': 'full,incremental,auto,'})
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3462 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS', 'value': mxCommand})
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3463 launchOut.element('booleanAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED', 'value': 'true'})
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3464 launchOut.element('stringAttribute', {'key' : 'org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY', 'value': p.suite.dir})
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3465
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3466
7299 57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3467 launchOut.close('launchConfiguration')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3468
7299 57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3469 if not exists(externalToolDir):
57edf6b07d36 Removed ANT_JAR_TOOL dependency. Eclipse jar builds are now calling the command 'mx jar ${projectName}'. Christian Humer <christian.humer@gmail.com> parents: 7293 diff changeset	3470 os.makedirs(externalToolDir)
12514 8c64f10f86b7 append output of mx command to (re)build graal.jar to a per-project log file Doug Simon <doug.simon@oracle.com> parents: 12513 diff changeset	3471 update_file(join(externalToolDir, name + '.launch'), launchOut.xml(indent=xmlIndent, standalone=xmlStandalone, newl='\n'))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3472
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3473 dotProjectDoc.open('buildCommand')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3474 dotProjectDoc.element('name', data='org.eclipse.ui.externaltools.ExternalToolBuilder')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3475 dotProjectDoc.element('triggers', data='auto,full,incremental,')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3476 dotProjectDoc.open('arguments')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3477 dotProjectDoc.open('dictionary')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3478 dotProjectDoc.element('key', data='LaunchConfigHandle')
12514 8c64f10f86b7 append output of mx command to (re)build graal.jar to a per-project log file Doug Simon <doug.simon@oracle.com> parents: 12513 diff changeset	3479 dotProjectDoc.element('value', data='<project>/.externalToolBuilders/' + name + '.launch')
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3480 dotProjectDoc.close('dictionary')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3481 dotProjectDoc.open('dictionary')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3482 dotProjectDoc.element('key', data='incclean')
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3483 dotProjectDoc.element('value', data='true')
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3484 dotProjectDoc.close('dictionary')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3485 dotProjectDoc.close('arguments')
83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	3486 dotProjectDoc.close('buildCommand')
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3487
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3488 def generate_eclipse_workingsets():
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3489 """
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3490 Populate the workspace's working set configuration with working sets generated from project data for the primary suite
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3491 If the workspace already contains working set definitions, the existing ones will be retained and extended.
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3492 In case mx/env does not contain a WORKSPACE definition pointing to the workspace root directory, a parent search from the primary suite directory is performed.
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3493 If no workspace root directory can be identified, the primary suite directory is used and the user has to place the workingsets.xml file by hand.
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3494 """
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3495
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3496 # identify the location where to look for workingsets.xml
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3497 wsfilename = 'workingsets.xml'
11597 723796685546 more verbose output for eclipseinit if it cannot place workingsets.xml in Eclipse metadata location Michael Haupt <michael.haupt@oracle.com> parents: 11514 diff changeset	3498 wsloc = '.metadata/.plugins/org.eclipse.ui.workbench'
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3499 if os.environ.has_key('WORKSPACE'):
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3500 expected_wsroot = os.environ['WORKSPACE']
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3501 else:
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	3502 expected_wsroot = _primary_suite.dir
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	3503
8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	3504 wsroot = _find_eclipse_wsroot(expected_wsroot)
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3505 if wsroot is None:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3506 # failed to find it
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3507 wsroot = expected_wsroot
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	3508
11597 723796685546 more verbose output for eclipseinit if it cannot place workingsets.xml in Eclipse metadata location Michael Haupt <michael.haupt@oracle.com> parents: 11514 diff changeset	3509 wsdir = join(wsroot, wsloc)
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3510 if not exists(wsdir):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3511 wsdir = wsroot
13480 6215ff792647 put warning about missing Eclipse metadata directory behind -v option Doug Simon <doug.simon@oracle.com> parents: 13475 diff changeset	3512 logv('Could not find Eclipse metadata directory. Please place ' + wsfilename + ' in ' + wsloc + ' manually.')
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3513 wspath = join(wsdir, wsfilename)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3514
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3515 # gather working set info from project data
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3516 workingSets = dict()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3517 for p in projects():
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3518 if p.workingSets is None:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3519 continue
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3520 for w in p.workingSets.split(","):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3521 if not workingSets.has_key(w):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3522 workingSets[w] = [p.name]
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3523 else:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3524 workingSets[w].append(p.name)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3525
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3526 if exists(wspath):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3527 wsdoc = _copy_workingset_xml(wspath, workingSets)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3528 else:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3529 wsdoc = _make_workingset_xml(workingSets)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3530
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3531 update_file(wspath, wsdoc.xml(newl='\n'))
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	3532
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3533 def _find_eclipse_wsroot(wsdir):
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3534 md = join(wsdir, '.metadata')
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3535 if exists(md):
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3536 return wsdir
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3537 split = os.path.split(wsdir)
12042 fbe1ee508936 added ability to suppress duplicate lines on an output stream and used it to filter the GC verification log messages in the gate Doug Simon <doug.simon@oracle.com> parents: 11807 diff changeset	3538 if split[0] == wsdir: # root directory
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3539 return None
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3540 else:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3541 return _find_eclipse_wsroot(split[0])
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3542
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3543 def _make_workingset_xml(workingSets):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3544 wsdoc = XMLDoc()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3545 wsdoc.open('workingSetManager')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3546
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3547 for w in sorted(workingSets.keys()):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3548 _workingset_open(wsdoc, w)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3549 for p in workingSets[w]:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3550 _workingset_element(wsdoc, p)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3551 wsdoc.close('workingSet')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3552
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3553 wsdoc.close('workingSetManager')
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3554 return wsdoc
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3555
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3556 def _copy_workingset_xml(wspath, workingSets):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3557 target = XMLDoc()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3558 target.open('workingSetManager')
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3559
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3560 parser = xml.parsers.expat.ParserCreate()
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3561
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3562 class ParserState(object):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3563 def __init__(self):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3564 self.current_ws_name = 'none yet'
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3565 self.current_ws = None
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3566 self.seen_ws = list()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3567 self.seen_projects = list()
13824 96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3568 self.aggregate_ws = False
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3569 self.nested_ws = False
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3570
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3571 ps = ParserState()
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3572
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3573 # parsing logic
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3574 def _ws_start(name, attributes):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3575 if name == 'workingSet':
13824 96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3576 if attributes.has_key('name'):
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3577 ps.current_ws_name = attributes['name']
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3578 if attributes.has_key('aggregate') and attributes['aggregate'] == 'true':
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3579 ps.aggregate_ws = True
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3580 ps.current_ws = None
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3581 elif workingSets.has_key(ps.current_ws_name):
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3582 ps.current_ws = workingSets[ps.current_ws_name]
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3583 ps.seen_ws.append(ps.current_ws_name)
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3584 ps.seen_projects = list()
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3585 else:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3586 ps.current_ws = None
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3587 target.open(name, attributes)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3588 parser.StartElementHandler = _ws_item
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3589
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3590 def _ws_end(name):
13824 96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3591 closeAndResetHandler = False
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3592 if name == 'workingSet':
13824 96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3593 if ps.aggregate_ws:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3594 if ps.nested_ws:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3595 ps.nested_ws = False
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3596 else:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3597 ps.aggregate_ws = False
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3598 closeAndResetHandler = True
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3599 else:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3600 if not ps.current_ws is None:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3601 for p in ps.current_ws:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3602 if not p in ps.seen_projects:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3603 _workingset_element(target, p)
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3604 closeAndResetHandler = True
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3605 if closeAndResetHandler:
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3606 target.close('workingSet')
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3607 parser.StartElementHandler = _ws_start
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3608 elif name == 'workingSetManager':
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3609 # process all working sets that are new to the file
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3610 for w in sorted(workingSets.keys()):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3611 if not w in ps.seen_ws:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3612 _workingset_open(target, w)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3613 for p in workingSets[w]:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3614 _workingset_element(target, p)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3615 target.close('workingSet')
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3616
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3617 def _ws_item(name, attributes):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3618 if name == 'item':
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3619 if ps.current_ws is None:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3620 target.element(name, attributes)
13982 b167b1838029 mx eclipseinit: take care of working sets that were edited by hand Michael Haupt <michael.haupt@oracle.com> parents: 13968 diff changeset	3621 elif not attributes.has_key('elementID') and attributes.has_key('factoryID') and attributes.has_key('path') and attributes.has_key('type'):
b167b1838029 mx eclipseinit: take care of working sets that were edited by hand Michael Haupt <michael.haupt@oracle.com> parents: 13968 diff changeset	3622 target.element(name, attributes)
14937 3de340bdb8d3 added support for adding sources to distribution Doug Simon <doug.simon@oracle.com> parents: 14918 diff changeset	3623 p_name = attributes['path'][1:] # strip off the leading '/'
13982 b167b1838029 mx eclipseinit: take care of working sets that were edited by hand Michael Haupt <michael.haupt@oracle.com> parents: 13968 diff changeset	3624 ps.seen_projects.append(p_name)
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3625 else:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3626 p_name = attributes['elementID'][1:] # strip off the leading '='
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3627 _workingset_element(target, p_name)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3628 ps.seen_projects.append(p_name)
13824 96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3629 elif name == 'workingSet':
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3630 ps.nested_ws = True
96d5cb754b68 address issue in Eclipse working set generation Michael Haupt <michael.haupt@oracle.com> parents: 13779 diff changeset	3631 target.element(name, attributes)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3632
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3633 # process document
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3634 parser.StartElementHandler = _ws_start
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3635 parser.EndElementHandler = _ws_end
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3636 with open(wspath, 'r') as wsfile:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3637 parser.ParseFile(wsfile)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3638
10061 b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3639 target.close('workingSetManager')
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3640 return target
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3641
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3642 def _workingset_open(wsdoc, ws):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3643 wsdoc.open('workingSet', {'editPageID': 'org.eclipse.jdt.ui.JavaWorkingSetPage', 'factoryID': 'org.eclipse.ui.internal.WorkingSetFactory', 'id': 'wsid_' + ws, 'label': ws, 'name': ws})
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3644
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3645 def _workingset_element(wsdoc, p):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse Michael Haupt <michael.haupt@oracle.com> parents: 10060 diff changeset	3646 wsdoc.element('item', {'elementID': '=' + p, 'factoryID': 'org.eclipse.jdt.ui.PersistableJavaElementFactory'})
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3647
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3648 def netbeansinit(args, refreshOnly=False, buildProcessorJars=True):
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3649 """(re)generate NetBeans project configurations"""
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3650
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3651 for suite in suites(True):
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3652 _netbeansinit_suite(args, suite, refreshOnly, buildProcessorJars)
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3653
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3654 def _netbeansinit_suite(args, suite, refreshOnly=False, buildProcessorJars=True):
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3655 configZip = TimeStampFile(join(suite.mxDir, 'netbeans-config.zip'))
13475 4a3628c79ff9 separated external libs out from zipped up IDE configs Doug Simon <doug.simon@oracle.com> parents: 13473 diff changeset	3656 configLibsZip = join(suite.mxDir, 'eclipse-config-libs.zip')
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3657 if refreshOnly and not configZip.exists():
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3658 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3659
13682 c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3660 if _check_ide_timestamp(suite, configZip, 'netbeans'):
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3661 logv('[NetBeans configurations are up to date - skipping]')
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3662 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3663
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3664 updated = False
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3665 files = []
13475 4a3628c79ff9 separated external libs out from zipped up IDE configs Doug Simon <doug.simon@oracle.com> parents: 13473 diff changeset	3666 libFiles = []
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3667 jdks = set()
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	3668 for p in suite.projects:
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3669 if p.native:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3670 continue
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3671
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3672 if exists(join(p.dir, 'plugin.xml')): # eclipse plugin project
5853 767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3673 continue
767312416f6a added support to mx for specifying library sources Doug Simon <doug.simon@oracle.com> parents: 5824 diff changeset	3674
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3675 if not exists(join(p.dir, 'nbproject')):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3676 os.makedirs(join(p.dir, 'nbproject'))
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3677
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3678 jdk = java(p.javaCompliance)
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3679 assert jdk
14764 5823c399e28f pylint fixes Bernhard Urban <bernhard.urban@jku.at> parents: 14763 diff changeset	3680
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3681 jdks.add(jdk)
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3682
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	3683 out = XMLDoc()
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3684 out.open('project', {'name' : p.name, 'default' : 'default', 'basedir' : '.'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3685 out.element('description', data='Builds, tests, and runs the project ' + p.name + '.')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3686 out.element('import', {'file' : 'nbproject/build-impl.xml'})
8189 3c74a32bb262 generated NetBeans projects will also update graal.jar Doug Simon <doug.simon@oracle.com> parents: 8183 diff changeset	3687 out.open('target', {'name' : '-post-compile'})
13968 6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings Bernhard Urban <bernhard.urban@jku.at> parents: 13952 diff changeset	3688 out.open('exec', {'executable' : sys.executable})
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3689 out.element('env', {'key' : 'JAVA_HOME', 'value' : jdk.jdk})
8189 3c74a32bb262 generated NetBeans projects will also update graal.jar Doug Simon <doug.simon@oracle.com> parents: 8183 diff changeset	3690 out.element('arg', {'value' : os.path.abspath(__file__)})
3c74a32bb262 generated NetBeans projects will also update graal.jar Doug Simon <doug.simon@oracle.com> parents: 8183 diff changeset	3691 out.element('arg', {'value' : 'archive'})
3c74a32bb262 generated NetBeans projects will also update graal.jar Doug Simon <doug.simon@oracle.com> parents: 8183 diff changeset	3692 out.element('arg', {'value' : '@GRAAL'})
3c74a32bb262 generated NetBeans projects will also update graal.jar Doug Simon <doug.simon@oracle.com> parents: 8183 diff changeset	3693 out.close('exec')
3c74a32bb262 generated NetBeans projects will also update graal.jar Doug Simon <doug.simon@oracle.com> parents: 8183 diff changeset	3694 out.close('target')
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3695 out.close('project')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3696 updated = update_file(join(p.dir, 'build.xml'), out.xml(indent='\t', newl='\n')) or updated
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3697 files.append(join(p.dir, 'build.xml'))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3698
5217 70777e50f1e6 replace monkey patch with subclassing instead Doug Simon <doug.simon@oracle.com> parents: 5198 diff changeset	3699 out = XMLDoc()
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3700 out.open('project', {'xmlns' : 'http://www.netbeans.org/ns/project/1'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3701 out.element('type', data='org.netbeans.modules.java.j2seproject')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3702 out.open('configuration')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3703 out.open('data', {'xmlns' : 'http://www.netbeans.org/ns/j2se-project/3'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3704 out.element('name', data=p.name)
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3705 out.element('explicit-platform', {'explicit-source-supported' : 'true'})
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3706 out.open('source-roots')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3707 out.element('root', {'id' : 'src.dir'})
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	3708 if len(p.annotation_processors()) > 0:
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3709 out.element('root', {'id' : 'src.ap-source-output.dir'})
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3710 out.close('source-roots')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3711 out.open('test-roots')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3712 out.close('test-roots')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3713 out.close('data')
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	3714
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3715 firstDep = True
2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3716 for dep in p.all_deps([], True):
2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3717 if dep == p:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3718 continue
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3719
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3720 if dep.isProject():
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3721 n = dep.name.replace('.', '_')
2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3722 if firstDep:
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3723 out.open('references', {'xmlns' : 'http://www.netbeans.org/ns/ant-project-references/1'})
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3724 firstDep = False
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3725
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3726 out.open('reference')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3727 out.element('foreign-project', data=n)
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3728 out.element('artifact-type', data='jar')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3729 out.element('script', data='build.xml')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3730 out.element('target', data='jar')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3731 out.element('clean-target', data='clean')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3732 out.element('id', data='jar')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3733 out.close('reference')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3734
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3735 if not firstDep:
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3736 out.close('references')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3737
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3738 out.close('configuration')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3739 out.close('project')
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3740 updated = update_file(join(p.dir, 'nbproject', 'project.xml'), out.xml(indent=' ', newl='\n')) or updated
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3741 files.append(join(p.dir, 'nbproject', 'project.xml'))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3742
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3743 out = StringIO.StringIO()
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3744 jdkPlatform = 'JDK_' + str(jdk.version)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3745
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3746 annotationProcessorEnabled = "false"
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3747 annotationProcessorReferences = ""
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3748 annotationProcessorSrcFolder = ""
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	3749 if len(p.annotation_processors()) > 0:
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3750 annotationProcessorEnabled = "true"
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3751 annotationProcessorSrcFolder = "src.ap-source-output.dir=${build.generated.sources.dir}/ap-source-output"
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3752
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3753 content = """
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3754 annotation.processing.enabled=""" + annotationProcessorEnabled + """
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3755 annotation.processing.enabled.in.editor=""" + annotationProcessorEnabled + """
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3756 annotation.processing.processors.list=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3757 annotation.processing.run.all.processors=true
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3758 application.title=""" + p.name + """
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3759 application.vendor=mx
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3760 build.classes.dir=${build.dir}
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3761 build.classes.excludes=*/.java,*/.form
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3762 # This directory is removed when the project is cleaned:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3763 build.dir=bin
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3764 build.generated.dir=${build.dir}/generated
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3765 build.generated.sources.dir=${build.dir}/generated-sources
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3766 # Only compile against the classpath explicitly listed here:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3767 build.sysclasspath=ignore
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3768 build.test.classes.dir=${build.dir}/test/classes
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3769 build.test.results.dir=${build.dir}/test/results
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3770 # Uncomment to specify the preferred debugger connection transport:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3771 #debug.transport=dt_socket
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3772 debug.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3773 ${run.classpath}
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3774 debug.test.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3775 ${run.test.classpath}
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3776 # This directory is removed when the project is cleaned:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3777 dist.dir=dist
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3778 dist.jar=${dist.dir}/""" + p.name + """.jar
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3779 dist.javadoc.dir=${dist.dir}/javadoc
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3780 endorsed.classpath=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3781 excludes=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3782 includes=**
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3783 jar.compress=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3784 # Space-separated list of extra javac options
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3785 javac.compilerargs=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3786 javac.deprecation=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3787 javac.source=1.7
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3788 javac.target=1.7
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3789 javac.test.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3790 ${javac.classpath}:\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3791 ${build.classes.dir}
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3792 javadoc.additionalparam=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3793 javadoc.author=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3794 javadoc.encoding=${source.encoding}
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3795 javadoc.noindex=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3796 javadoc.nonavbar=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3797 javadoc.notree=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3798 javadoc.private=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3799 javadoc.splitindex=true
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3800 javadoc.use=true
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3801 javadoc.version=false
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3802 javadoc.windowtitle=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3803 main.class=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3804 manifest.file=manifest.mf
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3805 meta.inf.dir=${src.dir}/META-INF
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3806 mkdist.disabled=false
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3807 platforms.""" + jdkPlatform + """.home=""" + jdk.jdk + """
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3808 platform.active=""" + jdkPlatform + """
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3809 run.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3810 ${javac.classpath}:\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3811 ${build.classes.dir}
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3812 # Space-separated list of JVM arguments used when running the project
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3813 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3814 # or test-sys-prop.name=value to set system properties for unit tests):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3815 run.jvmargs=
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3816 run.test.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3817 ${javac.test.classpath}:\\
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3818 ${build.test.classes.dir}
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3819 test.src.dir=./test
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3820 """ + annotationProcessorSrcFolder + """
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3821 source.encoding=UTF-8""".replace(':', os.pathsep).replace('/', os.sep)
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3822 print >> out, content
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3823
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3824 mainSrc = True
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3825 for src in p.srcDirs:
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3826 srcDir = join(p.dir, src)
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3827 if not exists(srcDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3828 os.mkdir(srcDir)
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3829 ref = 'file.reference.' + p.name + '-' + src
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3830 print >> out, ref + '=' + src
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3831 if mainSrc:
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3832 print >> out, 'src.dir=${' + ref + '}'
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3833 mainSrc = False
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3834 else:
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3835 print >> out, 'src.' + src + '.dir=${' + ref + '}'
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3836
e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3837 javacClasspath = []
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3838
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3839 deps = p.all_deps([], True)
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3840 annotationProcessorOnlyDeps = []
9854 394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	3841 if len(p.annotation_processors()) > 0:
394f38496856 made projects inherit annotation processors from dependencies Doug Simon <doug.simon@oracle.com> parents: 9847 diff changeset	3842 for ap in p.annotation_processors():
11374 9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	3843 apDep = dependency(ap)
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	3844 if not apDep in deps:
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	3845 deps.append(apDep)
9cdf7a9d3475 Enable library as annotation processor Gilles Duboscq <duboscq@ssw.jku.at> parents: 11318 diff changeset	3846 annotationProcessorOnlyDeps.append(apDep)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3847
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3848 annotationProcessorReferences = []
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3849
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3850 for dep in deps:
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3851 if dep == p:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3852 continue
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3853
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3854 if dep.isLibrary():
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	3855 path = dep.get_path(resolve=True)
11687 facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	3856 if path:
facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	3857 if os.sep == '\\':
facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	3858 path = path.replace('\\', '\\\\')
facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	3859 ref = 'file.reference.' + dep.name + '-bin'
facb442de5db added support for specifying the JDK version in which a library becomes redundant (e.g., nashorn.jar) Doug Simon <doug.simon@oracle.com> parents: 11659 diff changeset	3860 print >> out, ref + '=' + path
13475 4a3628c79ff9 separated external libs out from zipped up IDE configs Doug Simon <doug.simon@oracle.com> parents: 13473 diff changeset	3861 libFiles.append(path)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3862
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3863 elif dep.isProject():
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3864 n = dep.name.replace('.', '_')
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	3865 relDepPath = os.path.relpath(dep.dir, p.dir).replace(os.sep, '/')
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3866 ref = 'reference.' + n + '.jar'
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3867 print >> out, 'project.' + n + '=' + relDepPath
887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3868 print >> out, ref + '=${project.' + n + '}/dist/' + dep.name + '.jar'
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3869
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3870 if not dep in annotationProcessorOnlyDeps:
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3871 javacClasspath.append('${' + ref + '}')
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3872 else:
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	3873 annotationProcessorReferences.append('${' + ref + '}')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3874
5198 887b45f6aa02 improved name of Eclipse launch file created for jar applications Doug Simon <doug.simon@oracle.com> parents: 5194 diff changeset	3875 print >> out, 'javac.classpath=\\\n ' + (os.pathsep + '\\\n ').join(javacClasspath)
13682 c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3876 print >> out, 'javac.processorpath=' + (os.pathsep + '\\\n ').join(['${javac.classpath}'] + annotationProcessorReferences)
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects Doug Simon <doug.simon@oracle.com> parents: 13620 diff changeset	3877 print >> out, 'javac.test.processorpath=' + (os.pathsep + '\\\n ').join(['${javac.test.classpath}'] + annotationProcessorReferences)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	3878
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3879 updated = update_file(join(p.dir, 'nbproject', 'project.properties'), out.getvalue()) or updated
ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3880 out.close()
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3881 files.append(join(p.dir, 'nbproject', 'project.properties'))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	3882
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3883 if updated:
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3884 log('If using NetBeans:')
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3885 log(' 1. Ensure that the following platform(s) are defined (Tools -> Java Platforms):')
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3886 for jdk in jdks:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	3887 log(' JDK_' + str(jdk.version))
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	3888 log(' 2. Open/create a Project Group for the directory containing the projects (File -> Project Group -> New Group... -> Folder of Projects)')
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	3889
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	3890 _zip_files(files, suite.dir, configZip.path)
13475 4a3628c79ff9 separated external libs out from zipped up IDE configs Doug Simon <doug.simon@oracle.com> parents: 13473 diff changeset	3891 _zip_files(libFiles, suite.dir, configLibsZip)
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	3892
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3893 def intellijinit(args, refreshOnly=False):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3894 """(re)generate Intellij project configurations"""
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3895
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3896 for suite in suites(True):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3897 _intellij_suite(args, suite, refreshOnly)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3898
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3899 def _intellij_suite(args, suite, refreshOnly=False):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3900
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3901 libraries = set()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3902
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3903 ideaProjectDirectory = join(suite.dir, '.idea')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3904
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3905 if not exists(ideaProjectDirectory):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3906 os.mkdir(ideaProjectDirectory)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3907 nameFile = join(ideaProjectDirectory, '.name')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3908 update_file(nameFile, "Graal")
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3909 modulesXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3910 modulesXml.open('project', attributes={'version': '4'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3911 modulesXml.open('component', attributes={'name': 'ProjectModuleManager'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3912 modulesXml.open('modules')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3913
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3914
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3915 def _intellij_exclude_if_exists(xml, p, name):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3916 path = join(p.dir, name)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3917 if exists(path):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3918 xml.element('excludeFolder', attributes={'url':'file://$MODULE_DIR$/' + name})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3919
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3920 annotationProcessorProfiles = {}
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3921
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3922 def _complianceToIntellijLanguageLevel(compliance):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3923 return 'JDK_1_' + str(compliance.value)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3924
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3925 # create the modules (1 module = 1 Intellij project)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3926 for p in suite.projects:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3927 if p.native:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3928 continue
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3929
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3930 assert java(p.javaCompliance)
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3931
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3932 if not exists(p.dir):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3933 os.makedirs(p.dir)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3934
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3935 annotationProcessorProfileKey = tuple(p.annotation_processors())
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3936
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3937 if not annotationProcessorProfileKey in annotationProcessorProfiles:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3938 annotationProcessorProfiles[annotationProcessorProfileKey] = [p]
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3939 else:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3940 annotationProcessorProfiles[annotationProcessorProfileKey].append(p)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3941
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3942 intellijLanguageLevel = _complianceToIntellijLanguageLevel(p.javaCompliance)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3943
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3944 moduleXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3945 moduleXml.open('module', attributes={'type': 'JAVA_MODULE', 'version': '4'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3946
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3947 moduleXml.open('component', attributes={'name': 'NewModuleRootManager', 'LANGUAGE_LEVEL': intellijLanguageLevel, 'inherit-compiler-output': 'false'})
15122 11a591a99515 mx: fixed bug in exportlibs Doug Simon <doug.simon@oracle.com> parents: 15118 diff changeset	3948 moduleXml.element('output', attributes={'url': 'file://$MODULE_DIR$/bin'})
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3949 moduleXml.element('exclude-output')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3950
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3951 moduleXml.open('content', attributes={'url': 'file://$MODULE_DIR$'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3952 for src in p.srcDirs:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3953 srcDir = join(p.dir, src)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3954 if not exists(srcDir):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3955 os.mkdir(srcDir)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3956 moduleXml.element('sourceFolder', attributes={'url':'file://$MODULE_DIR$/' + src, 'isTestSource': 'false'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3957
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3958 if len(p.annotation_processors()) > 0:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3959 genDir = p.source_gen_dir()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3960 if not exists(genDir):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3961 os.mkdir(genDir)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3962 moduleXml.element('sourceFolder', attributes={'url':'file://$MODULE_DIR$/' + os.path.relpath(genDir, p.dir), 'isTestSource': 'false'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3963
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3964 for name in ['.externalToolBuilders', '.settings', 'nbproject']:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3965 _intellij_exclude_if_exists(moduleXml, p, name)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3966 moduleXml.close('content')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3967
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3968 moduleXml.element('orderEntry', attributes={'type': 'jdk', 'jdkType': 'JavaSDK', 'jdkName': str(p.javaCompliance)})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3969 moduleXml.element('orderEntry', attributes={'type': 'sourceFolder', 'forTests': 'false'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3970
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3971 deps = p.all_deps([], True, includeAnnotationProcessors=True)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3972 for dep in deps:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3973 if dep == p:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3974 continue
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3975
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3976 if dep.isLibrary():
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3977 libraries.add(dep)
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3978 moduleXml.element('orderEntry', attributes={'type': 'library', 'name': dep.name, 'level': 'project'})
50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	3979 elif dep.isProject():
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3980 moduleXml.element('orderEntry', attributes={'type': 'module', 'module-name': dep.name})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3981
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3982 moduleXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3983 moduleXml.close('module')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3984 moduleFile = join(p.dir, p.name + '.iml')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3985 update_file(moduleFile, moduleXml.xml(indent=' ', newl='\n'))
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3986
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3987 moduleFilePath = "$PROJECT_DIR$/" + os.path.relpath(moduleFile, suite.dir)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3988 modulesXml.element('module', attributes={'fileurl': 'file://' + moduleFilePath, 'filepath': moduleFilePath})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3989
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3990 modulesXml.close('modules')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3991 modulesXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3992 modulesXml.close('project')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3993 moduleXmlFile = join(ideaProjectDirectory, 'modules.xml')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3994 update_file(moduleXmlFile, modulesXml.xml(indent=' ', newl='\n'))
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3995
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3996 # TODO What about cross-suite dependencies?
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3997
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3998 librariesDirectory = join(ideaProjectDirectory, 'libraries')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	3999
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4000 if not exists(librariesDirectory):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4001 os.mkdir(librariesDirectory)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4002
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4003 # Setup the libraries that were used above
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4004 # TODO: setup all the libraries from the suite regardless of usage?
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4005 for library in libraries:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4006 libraryXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4007
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4008 libraryXml.open('component', attributes={'name': 'libraryTable'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4009 libraryXml.open('library', attributes={'name': library.name})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4010 libraryXml.open('CLASSES')
15134 f0fc09c0845e Be sure to resolve and download librariesin mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 15122 diff changeset	4011 libraryXml.element('root', attributes={'url': 'jar://$PROJECT_DIR$/' + os.path.relpath(library.get_path(True), suite.dir) + '!/'})
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4012 libraryXml.close('CLASSES')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4013 libraryXml.element('JAVADOC')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4014 if library.sourcePath:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4015 libraryXml.open('SOURCES')
15134 f0fc09c0845e Be sure to resolve and download librariesin mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 15122 diff changeset	4016 libraryXml.element('root', attributes={'url': 'jar://$PROJECT_DIR$/' + os.path.relpath(library.get_source_path(True), suite.dir) + '!/'})
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4017 libraryXml.close('SOURCES')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4018 else:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4019 libraryXml.element('SOURCES')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4020 libraryXml.close('library')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4021 libraryXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4022
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4023 libraryFile = join(librariesDirectory, library.name + '.xml')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4024 update_file(libraryFile, libraryXml.xml(indent=' ', newl='\n'))
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4025
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4026
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4027
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4028 # Set annotation processor profiles up, and link them to modules in compiler.xml
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4029 compilerXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4030 compilerXml.open('project', attributes={'version': '4'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4031 compilerXml.open('component', attributes={'name': 'CompilerConfiguration'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4032
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4033 compilerXml.element('option', attributes={'name': "DEFAULT_COMPILER", 'value': 'Javac'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4034 compilerXml.element('resourceExtensions')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4035 compilerXml.open('wildcardResourcePatterns')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4036 compilerXml.element('entry', attributes={'name': '!?*.java'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4037 compilerXml.close('wildcardResourcePatterns')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4038
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4039 if annotationProcessorProfiles:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4040 compilerXml.open('annotationProcessing')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4041 for processors, modules in annotationProcessorProfiles.items():
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4042 compilerXml.open('profile', attributes={'default': 'false', 'name': '-'.join(processors), 'enabled': 'true'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4043 compilerXml.element('sourceOutputDir', attributes={'name': 'src_gen'}) # TODO use p.source_gen_dir() ?
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4044 compilerXml.element('outputRelativeToContentRoot', attributes={'value': 'true'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4045 compilerXml.open('processorPath', attributes={'useClasspath': 'false'})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4046 for apName in processors:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4047 pDep = dependency(apName)
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4048 for entry in pDep.all_deps([], True):
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4049 if entry.isLibrary():
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4050 compilerXml.element('entry', attributes={'name': '$PROJECT_DIR$/' + os.path.relpath(entry.path, suite.dir)})
15662 50fbda571d99 mx: added jrelibrary dependency type Doug Simon <doug.simon@oracle.com> parents: 15638 diff changeset	4051 elif entry.isProject():
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4052 assert entry.isProject()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4053 compilerXml.element('entry', attributes={'name': '$PROJECT_DIR$/' + os.path.relpath(entry.output_dir(), suite.dir)})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4054 compilerXml.close('processorPath')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4055 for module in modules:
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4056 compilerXml.element('module', attributes={'name': module.name})
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4057 compilerXml.close('profile')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4058 compilerXml.close('annotationProcessing')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4059
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4060 compilerXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4061 compilerXml.close('project')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4062 compilerFile = join(ideaProjectDirectory, 'compiler.xml')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4063 update_file(compilerFile, compilerXml.xml(indent=' ', newl='\n'))
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4064
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4065 # Wite misc.xml for global JDK config
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4066 miscXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4067 miscXml.open('project', attributes={'version': '4'})
15135 0672512feb81 mx intellijinit: fix typo in project's language level settings Gilles Duboscq <duboscq@ssw.jku.at> parents: 15134 diff changeset	4068 miscXml.element('component', attributes={'name': 'ProjectRootManager', 'version': '2', 'languageLevel': _complianceToIntellijLanguageLevel(java().javaCompliance), 'project-jdk-name': str(java().javaCompliance), 'project-jdk-type': 'JavaSDK'})
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4069 miscXml.close('project')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4070 miscFile = join(ideaProjectDirectory, 'misc.xml')
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4071 update_file(miscFile, miscXml.xml(indent=' ', newl='\n'))
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4072
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4073
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4074 # TODO look into copyright settings
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4075 # TODO should add vcs.xml support
858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4076
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	4077 def ideclean(args):
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4078 """remove all Eclipse and NetBeans project configurations"""
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4079 def rm(path):
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4080 if exists(path):
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4081 os.remove(path)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4082
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	4083 for s in suites():
13473 69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	4084 rm(join(s.mxDir, 'eclipse-config.zip'))
69f3251332c9 modified eclipseinit and netbeansinit to save all created/copied/downloaded project related files in zip files Doug Simon <doug.simon@oracle.com> parents: 13471 diff changeset	4085 rm(join(s.mxDir, 'netbeans-config.zip'))
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4086 shutil.rmtree(join(s.dir, '.idea'), ignore_errors=True)
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	4087
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4088 for p in projects():
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4089 if p.native:
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4090 continue
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4091
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4092 shutil.rmtree(join(p.dir, '.settings'), ignore_errors=True)
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	4093 shutil.rmtree(join(p.dir, '.externalToolBuilders'), ignore_errors=True)
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4094 shutil.rmtree(join(p.dir, 'nbproject'), ignore_errors=True)
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4095 rm(join(p.dir, '.classpath'))
14918 31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8) Doug Simon <doug.simon@oracle.com> parents: 14917 diff changeset	4096 rm(join(p.dir, '.checkstyle'))
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4097 rm(join(p.dir, '.project'))
10043 e063474076dd clean up .factorypath files on "mx ideclean" Lukas Stadler <lukas.stadler@jku.at> parents: 9857 diff changeset	4098 rm(join(p.dir, '.factorypath'))
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4099 rm(join(p.dir, p.name + '.iml'))
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4100 rm(join(p.dir, 'build.xml'))
7291 a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	4101 rm(join(p.dir, 'eclipse-build.xml'))
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	4102 try:
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	4103 rm(join(p.dir, p.name + '.jar'))
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	4104 except:
a748e4d44694 Truffle API to specify type-specalized Node classes; annotation processor for automatic code generation of the type-specialized Node classes during the build process Christian Humer <christian.humer@gmail.com> parents: 6535 diff changeset	4105 log("Error removing {0}".format(p.name + '.jar'))
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4106
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4107
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	4108 def ideinit(args, refreshOnly=False, buildProcessorJars=True):
15378 dea98caac669 Fix help text for ideinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 15376 diff changeset	4109 """(re)generate Eclipse, NetBeans and Intellij project configurations"""
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	4110 eclipseinit(args, refreshOnly=refreshOnly, buildProcessorJars=buildProcessorJars)
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	4111 netbeansinit(args, refreshOnly=refreshOnly, buildProcessorJars=buildProcessorJars)
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4112 intellijinit(args, refreshOnly=refreshOnly)
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	4113 if not refreshOnly:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	4114 fsckprojects([])
7913 0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4115
0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4116 def fsckprojects(args):
0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4117 """find directories corresponding to deleted Java projects and delete them"""
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	4118 for suite in suites(True):
7913 0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4119 projectDirs = [p.dir for p in suite.projects]
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4120 for dirpath, dirnames, files in os.walk(suite.dir):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4121 if dirpath == suite.dir:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4122 # no point in traversing .hg
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4123 if '.hg' in dirnames:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4124 dirnames.remove('.hg')
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4125 elif dirpath in projectDirs:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4126 # don't traverse subdirs of an existing project in this suite
7913 0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4127 dirnames[:] = []
0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4128 else:
0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4129 projectConfigFiles = frozenset(['.classpath', 'nbproject'])
0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4130 indicators = projectConfigFiles.intersection(files)
0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4131 if len(indicators) != 0:
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4132 if not sys.stdout.isatty() or ask_yes_no(dirpath + ' looks like a removed project -- delete it', 'n'):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4133 shutil.rmtree(dirpath)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4134 log('Deleted ' + dirpath)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4135
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4136 def javadoc(args, parser=None, docDir='javadoc', includeDeps=True, stdDoclet=True):
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4137 """generate javadoc for some/all Java projects"""
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4138
5701 d0a6e25de770 integrated mxtool changes from Maxine project Doug Simon <doug.simon@oracle.com> parents: 5699 diff changeset	4139 parser = ArgumentParser(prog='mx javadoc') if parser is None else parser
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4140 parser.add_argument('-d', '--base', action='store', help='base directory for output')
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4141 parser.add_argument('--unified', action='store_true', help='put javadoc in a single directory instead of one per project')
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4142 parser.add_argument('--force', action='store_true', help='(re)generate javadoc even if package-list file exists')
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4143 parser.add_argument('--projects', action='store', help='comma separated projects to process (omit to process all projects)')
5712 dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4144 parser.add_argument('--Wapi', action='store_true', dest='warnAPI', help='show warnings about using internal APIs')
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4145 parser.add_argument('--argfile', action='store', help='name of file containing extra javadoc options')
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4146 parser.add_argument('--arg', action='append', dest='extra_args', help='extra Javadoc arguments (e.g. --arg @-use)', metavar='@<arg>', default=[])
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4147 parser.add_argument('-m', '--memory', action='store', help='-Xmx value to pass to underlying JVM')
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4148 parser.add_argument('--packages', action='store', help='comma separated packages to process (omit to process all packages)')
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4149 parser.add_argument('--exclude-packages', action='store', help='comma separated packages to exclude')
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4150
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4151 args = parser.parse_args(args)
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4152
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4153 # build list of projects to be processed
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4154 if args.projects is not None:
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4155 candidates = [project(name) for name in args.projects.split(',')]
11756 78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	4156 else:
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos Mick Jordan <mick.jordan@oracle.com> parents: 11701 diff changeset	4157 candidates = projects_opt_limit_to_suites()
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4158
5701 d0a6e25de770 integrated mxtool changes from Maxine project Doug Simon <doug.simon@oracle.com> parents: 5699 diff changeset	4159 # optionally restrict packages within a project
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4160 packages = []
bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4161 if args.packages is not None:
bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4162 packages = [name for name in args.packages.split(',')]
bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4163
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4164 exclude_packages = []
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4165 if args.exclude_packages is not None:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4166 exclude_packages = [name for name in args.exclude_packages.split(',')]
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4167
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4168 def outDir(p):
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4169 if args.base is None:
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4170 return join(p.dir, docDir)
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4171 return join(args.base, p.name, docDir)
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4172
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4173 def check_package_list(p):
5701 d0a6e25de770 integrated mxtool changes from Maxine project Doug Simon <doug.simon@oracle.com> parents: 5699 diff changeset	4174 return not exists(join(outDir(p), 'package-list'))
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4175
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4176 def assess_candidate(p, projects):
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4177 if p in projects:
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4178 return False
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4179 if args.force or args.unified or check_package_list(p):
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4180 projects.append(p)
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4181 return True
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4182 return False
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4183
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4184 projects = []
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4185 for p in candidates:
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4186 if not p.native:
5701 d0a6e25de770 integrated mxtool changes from Maxine project Doug Simon <doug.simon@oracle.com> parents: 5699 diff changeset	4187 if includeDeps:
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4188 deps = p.all_deps([], includeLibs=False, includeSelf=False)
bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4189 for d in deps:
bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4190 assess_candidate(d, projects)
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4191 if not assess_candidate(p, projects):
10568 070b4a3c56f3 disabled "noisy" log statements unless -v option (i.e. verbose) is specified to mx Doug Simon <doug.simon@oracle.com> parents: 10530 diff changeset	4192 logv('[package-list file exists - skipping {0}]'.format(p.name))
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4193
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4194
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4195 def find_packages(sourceDirs, pkgs=None):
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4196 if pkgs is None:
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4197 pkgs = set()
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4198 for sourceDir in sourceDirs:
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4199 for root, _, files in os.walk(sourceDir):
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4200 if len([name for name in files if name.endswith('.java')]) != 0:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4201 pkg = root[len(sourceDir) + 1:].replace(os.sep, '.')
5709 24347f3b605f fixed javadoc command on Windows Doug Simon <doug.simon@oracle.com> parents: 5706 diff changeset	4202 if len(packages) == 0 or pkg in packages:
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4203 if len(exclude_packages) == 0 or not pkg in exclude_packages:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4204 pkgs.add(pkg)
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4205 return pkgs
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4206
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4207 extraArgs = [a.lstrip('@') for a in args.extra_args]
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4208 if args.argfile is not None:
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4209 extraArgs += ['@' + args.argfile]
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4210 memory = '2g'
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4211 if args.memory is not None:
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4212 memory = args.memory
bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4213 memory = '-J-Xmx' + memory
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4214
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4215 if not args.unified:
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4216 for p in projects:
5710 8d31a849ca97 make the javadoc command work when classes have not been previously compiled Doug Simon <doug.simon@oracle.com> parents: 5709 diff changeset	4217 # The project must be built to ensure javadoc can find class files for all referenced classes
8d31a849ca97 make the javadoc command work when classes have not been previously compiled Doug Simon <doug.simon@oracle.com> parents: 5709 diff changeset	4218 build(['--no-native', '--projects', p.name])
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4219
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4220 pkgs = find_packages(p.source_dirs(), set())
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4221 deps = p.all_deps([], includeLibs=False, includeSelf=False)
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4222 links = ['-link', 'http://docs.oracle.com/javase/' + str(p.javaCompliance.value) + '/docs/api/']
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4223 out = outDir(p)
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4224 for d in deps:
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4225 depOut = outDir(d)
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4226 links.append('-link')
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4227 links.append(os.path.relpath(depOut, out))
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4228 cp = classpath(p.name, includeSelf=True)
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4229 sp = os.pathsep.join(p.source_dirs())
5706 6f2ccb483d96 added overview.html for each project and integrated it into the generated 'mx site' command Doug Simon <doug.simon@oracle.com> parents: 5701 diff changeset	4230 overviewFile = join(p.dir, 'overview.html')
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4231 delOverviewFile = False
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4232 if not exists(overviewFile):
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4233 with open(overviewFile, 'w') as fp:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4234 print >> fp, '<html><body>Documentation for the <code>' + p.name + '</code> project.</body></html>'
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4235 delOverviewFile = True
5712 dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4236 nowarnAPI = []
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4237 if not args.warnAPI:
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4238 nowarnAPI.append('-XDignore.symbol.file')
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4239
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4240 # windowTitle onloy applies to the standard doclet processor
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4241 windowTitle = []
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4242 if stdDoclet:
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4243 windowTitle = ['-windowtitle', p.name + ' javadoc']
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4244 try:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4245 log('Generating {2} for {0} in {1}'.format(p.name, out, docDir))
14916 66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command Gilles Duboscq <duboscq@ssw.jku.at> parents: 14915 diff changeset	4246 projectJava = java(p.javaCompliance)
15419 f093fa76e872 made note about workaround for JDK-8041628 Doug Simon <doug.simon@oracle.com> parents: 15408 diff changeset	4247
f093fa76e872 made note about workaround for JDK-8041628 Doug Simon <doug.simon@oracle.com> parents: 15408 diff changeset	4248 # Once https://bugs.openjdk.java.net/browse/JDK-8041628 is fixed,
f093fa76e872 made note about workaround for JDK-8041628 Doug Simon <doug.simon@oracle.com> parents: 15408 diff changeset	4249 # this should be reverted to:
f093fa76e872 made note about workaround for JDK-8041628 Doug Simon <doug.simon@oracle.com> parents: 15408 diff changeset	4250 # javadocExe = java().javadoc
f093fa76e872 made note about workaround for JDK-8041628 Doug Simon <doug.simon@oracle.com> parents: 15408 diff changeset	4251 javadocExe = projectJava.javadoc
f093fa76e872 made note about workaround for JDK-8041628 Doug Simon <doug.simon@oracle.com> parents: 15408 diff changeset	4252
f093fa76e872 made note about workaround for JDK-8041628 Doug Simon <doug.simon@oracle.com> parents: 15408 diff changeset	4253 run([javadocExe, memory,
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4254 '-XDignore.symbol.file',
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4255 '-classpath', cp,
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4256 '-quiet',
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4257 '-d', out,
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4258 '-overview', overviewFile,
14916 66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command Gilles Duboscq <duboscq@ssw.jku.at> parents: 14915 diff changeset	4259 '-sourcepath', sp,
66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command Gilles Duboscq <duboscq@ssw.jku.at> parents: 14915 diff changeset	4260 '-source', str(projectJava.javaCompliance),
66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command Gilles Duboscq <duboscq@ssw.jku.at> parents: 14915 diff changeset	4261 '-bootclasspath', projectJava.bootclasspath(),
66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command Gilles Duboscq <duboscq@ssw.jku.at> parents: 14915 diff changeset	4262 '-extdirs', projectJava.extdirs()] +
15406 ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4263 ([] if projectJava.javaCompliance < JavaCompliance('1.8') else ['-Xdoclint:none']) +
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4264 links +
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4265 extraArgs +
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4266 nowarnAPI +
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4267 windowTitle +
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4268 list(pkgs))
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4269 log('Generated {2} for {0} in {1}'.format(p.name, out, docDir))
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4270 finally:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4271 if delOverviewFile:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4272 os.remove(overviewFile)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4273
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4274 else:
5710 8d31a849ca97 make the javadoc command work when classes have not been previously compiled Doug Simon <doug.simon@oracle.com> parents: 5709 diff changeset	4275 # The projects must be built to ensure javadoc can find class files for all referenced classes
8d31a849ca97 make the javadoc command work when classes have not been previously compiled Doug Simon <doug.simon@oracle.com> parents: 5709 diff changeset	4276 build(['--no-native'])
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4277
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4278 pkgs = set()
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4279 sp = []
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4280 names = []
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4281 for p in projects:
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4282 find_packages(p.source_dirs(), pkgs)
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4283 sp += p.source_dirs()
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4284 names.append(p.name)
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4285
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4286 links = ['-link', 'http://docs.oracle.com/javase/' + str(java().javaCompliance.value) + '/docs/api/']
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4287 out = join(_primary_suite.dir, docDir)
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4288 if args.base is not None:
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4289 out = join(args.base, docDir)
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4290 cp = classpath()
99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4291 sp = os.pathsep.join(sp)
5712 dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4292 nowarnAPI = []
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4293 if not args.warnAPI:
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4294 nowarnAPI.append('-XDignore.symbol.file')
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4295 log('Generating {2} for {0} in {1}'.format(', '.join(names), out, docDir))
5712 dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4296 run([java().javadoc, memory,
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4297 '-classpath', cp,
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4298 '-quiet',
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4299 '-d', out,
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4300 '-sourcepath', sp] +
15403 a9df38ce8fb7 mx: disable doclint when running javadoc (until the code base is doclint clean) Doug Simon <doug.simon@oracle.com> parents: 15386 diff changeset	4301 ([] if java().javaCompliance < JavaCompliance('1.8') else ['-Xdoclint:none']) +
5712 dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4302 links +
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4303 extraArgs +
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4304 nowarnAPI +
dfcb73ac6ba2 made invalid javadoc cause a JDT error Doug Simon <doug.simon@oracle.com> parents: 5710 diff changeset	4305 list(pkgs))
5376 bfc9aeb1264c synchronized mxtool with Maxine Doug Simon <doug.simon@oracle.com> parents: 5252 diff changeset	4306 log('Generated {2} for {0} in {1}'.format(', '.join(names), out, docDir))
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4307
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4308 def site(args):
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4309 """creates a website containing javadoc and the project dependency graph"""
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4310
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4311 parser = ArgumentParser(prog='site')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4312 parser.add_argument('-d', '--base', action='store', help='directory for generated site', required=True, metavar='<dir>')
15406 ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4313 parser.add_argument('--tmp', action='store', help='directory to use for intermediate results', metavar='<dir>')
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4314 parser.add_argument('--name', action='store', help='name of overall documentation', required=True, metavar='<name>')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4315 parser.add_argument('--overview', action='store', help='path to the overview content for overall documentation', required=True, metavar='<path>')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4316 parser.add_argument('--projects', action='store', help='comma separated projects to process (omit to process all projects)')
5782 488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4317 parser.add_argument('--jd', action='append', help='extra Javadoc arguments (e.g. --jd @-use)', metavar='@<arg>', default=[])
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4318 parser.add_argument('--exclude-packages', action='store', help='comma separated packages to exclude', metavar='<pkgs>')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4319 parser.add_argument('--dot-output-base', action='store', help='base file name (relative to <dir>/all) for project dependency graph .svg and .jpg files generated by dot (omit to disable dot generation)', metavar='<path>')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4320 parser.add_argument('--title', action='store', help='value used for -windowtitle and -doctitle javadoc args for overall documentation (default: "<name>")', metavar='<title>')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4321 args = parser.parse_args(args)
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4322
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4323 args.base = os.path.abspath(args.base)
15406 ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4324 tmpbase = args.tmp if args.tmp else tempfile.mkdtemp(prefix=basename(args.base) + '.', dir=dirname(args.base))
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4325 unified = join(tmpbase, 'all')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4326
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4327 exclude_packages_arg = []
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4328 if args.exclude_packages is not None:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4329 exclude_packages_arg = ['--exclude-packages', args.exclude_packages]
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4330
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4331 projects = sorted_deps()
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4332 projects_arg = []
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4333 if args.projects is not None:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4334 projects_arg = ['--projects', args.projects]
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4335 projects = [project(name) for name in args.projects.split(',')]
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4336
5782 488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4337 extra_javadoc_args = []
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4338 for a in args.jd:
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4339 extra_javadoc_args.append('--arg')
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4340 extra_javadoc_args.append('@' + a)
488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4341
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4342 try:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4343 # Create javadoc for each project
5782 488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4344 javadoc(['--base', tmpbase] + exclude_packages_arg + projects_arg + extra_javadoc_args)
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4345
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4346 # Create unified javadoc for all projects
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4347 with open(args.overview) as fp:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4348 content = fp.read()
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4349 idx = content.rfind('</body>')
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4350 if idx != -1:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4351 args.overview = join(tmpbase, 'overview_with_projects.html')
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4352 with open(args.overview, 'w') as fp2:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4353 print >> fp2, content[0:idx]
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4354 print >> fp2, """<div class="contentContainer">
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4355 <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Projects table">
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4356 <caption><span>Projects</span><span class="tabEnd"> </span></caption>
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4357 <tr><th class="colFirst" scope="col">Project</th><th class="colLast" scope="col"> </th></tr>
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4358 <tbody>"""
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4359 color = 'row'
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4360 for p in projects:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4361 print >> fp2, '<tr class="{1}Color"><td class="colFirst"><a href="../{0}/javadoc/index.html",target = "_top">{0}</a></td><td class="colLast"> </td></tr>'.format(p.name, color)
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4362 color = 'row' if color == 'alt' else 'alt'
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4363
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4364 print >> fp2, '</tbody></table></div>'
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4365 print >> fp2, content[idx:]
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4366
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4367 title = args.title if args.title is not None else args.name
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4368 javadoc(['--base', tmpbase,
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4369 '--unified',
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4370 '--arg', '@-windowtitle', '--arg', '@' + title,
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4371 '--arg', '@-doctitle', '--arg', '@' + title,
5782 488864d5069a added support for passing -tag option to javadoc to suppress warnings about unrecognized tags in javadoc comments Doug Simon <doug.simon@oracle.com> parents: 5778 diff changeset	4372 '--arg', '@-overview', '--arg', '@' + args.overview] + exclude_packages_arg + projects_arg + extra_javadoc_args)
15406 ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4373
ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4374 if exists(unified):
ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4375 shutil.rmtree(unified)
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4376 os.rename(join(tmpbase, 'javadoc'), unified)
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4377
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4378 # Generate dependency graph with Graphviz
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4379 if args.dot_output_base is not None:
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4380 dotErr = None
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4381 try:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4382 if not 'version' in subprocess.check_output(['dot', '-V'], stderr=subprocess.STDOUT):
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4383 dotErr = 'dot -V does not print a string containing "version"'
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4384 except subprocess.CalledProcessError as e:
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4385 dotErr = 'error calling "dot -V": {}'.format(e)
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4386 except OSError as e:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4387 dotErr = 'error calling "dot -V": {}'.format(e)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4388
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4389 if dotErr != None:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4390 abort('cannot generate dependency graph: ' + dotErr)
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4391
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4392 dot = join(tmpbase, 'all', str(args.dot_output_base) + '.dot')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4393 svg = join(tmpbase, 'all', str(args.dot_output_base) + '.svg')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4394 jpg = join(tmpbase, 'all', str(args.dot_output_base) + '.jpg')
5854 2c00c51357d8 added more content to graal.api.meta overview Doug Simon <doug.simon@oracle.com> parents: 5853 diff changeset	4395 html = join(tmpbase, 'all', str(args.dot_output_base) + '.html')
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4396 with open(dot, 'w') as fp:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4397 dim = len(projects)
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4398 print >> fp, 'digraph projects {'
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4399 print >> fp, 'rankdir=BT;'
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4400 print >> fp, 'size = "' + str(dim) + ',' + str(dim) + '";'
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4401 print >> fp, 'node [shape=rect, fontcolor="blue"];'
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4402 # print >> fp, 'edge [color="green"];'
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4403 for p in projects:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4404 print >> fp, '"' + p.name + '" [URL = "../' + p.name + '/javadoc/index.html", target = "_top"]'
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4405 for dep in p.canonical_deps():
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4406 if dep in [proj.name for proj in projects]:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4407 print >> fp, '"' + p.name + '" -> "' + dep + '"'
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4408 depths = dict()
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4409 for p in projects:
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4410 d = p.max_depth()
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4411 depths.setdefault(d, list()).append(p.name)
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4412 print >> fp, '}'
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4413
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4414 run(['dot', '-Tsvg', '-o' + svg, '-Tjpg', '-o' + jpg, dot])
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4415
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4416 # Post-process generated SVG to remove title elements which most browsers
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4417 # render as redundant (and annoying) tooltips.
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4418 with open(svg, 'r') as fp:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4419 content = fp.read()
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4420 content = re.sub('<title>.*</title>', '', content)
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4421 content = re.sub('xlink:title="[^"]*"', '', content)
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4422 with open(svg, 'w') as fp:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4423 fp.write(content)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4424
6506 305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4425 # Create HTML that embeds the svg file in an <object> frame
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4426 with open(html, 'w') as fp:
305b9166b455 added projects table to the top level javadoc page generated by the site command Doug Simon <doug.simon@oracle.com> parents: 6350 diff changeset	4427 print >> fp, '<html><body><object data="{}.svg" type="image/svg+xml"></object></body></html>'.format(args.dot_output_base)
5854 2c00c51357d8 added more content to graal.api.meta overview Doug Simon <doug.simon@oracle.com> parents: 5853 diff changeset	4428
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4429 if exists(args.base):
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4430 shutil.rmtree(args.base)
15406 ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4431 if args.tmp:
ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4432 shutil.copytree(tmpbase, args.base)
ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4433 else:
ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4434 shutil.move(tmpbase, args.base)
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4435
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4436 print 'Created website - root is ' + join(args.base, 'all', 'index.html')
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4437
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4438 finally:
15406 ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output Doug Simon <doug.simon@oracle.com> parents: 15403 diff changeset	4439 if not args.tmp and exists(tmpbase):
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4440 shutil.rmtree(tmpbase)
613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4441
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4442 def _kwArg(kwargs):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4443 if len(kwargs) > 0:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4444 return kwargs.pop(0)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4445 return None
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4446
9009 1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4447 def findclass(args, logToConsole=True):
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4448 """find all classes matching a given substring"""
9009 1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4449 matches = []
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4450 for entry, filename in classpath_walk(includeBootClasspath=True):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4451 if filename.endswith('.class'):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4452 if isinstance(entry, zipfile.ZipFile):
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4453 classname = filename.replace('/', '.')
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4454 else:
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4455 classname = filename.replace(os.sep, '.')
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4456 classname = classname[:-len('.class')]
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4457 for a in args:
271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4458 if a in classname:
9009 1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4459 matches.append(classname)
1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4460 if logToConsole:
1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4461 log(classname)
1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4462 return matches
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4463
11295 bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4464 def select_items(items, descriptions=None, allowMultiple=True):
11203 8ab76b7c6ff6 added interactive selection capability to 'mx javap' command Doug Simon <doug.simon@oracle.com> parents: 10585 diff changeset	4465 """
11295 bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4466 Presents a command line interface for selecting one or more (if allowMultiple is true) items.
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4467
11203 8ab76b7c6ff6 added interactive selection capability to 'mx javap' command Doug Simon <doug.simon@oracle.com> parents: 10585 diff changeset	4468 """
11318 345bce66c04a mx: fix for select_items Gilles Duboscq <duboscq@ssw.jku.at> parents: 11301 diff changeset	4469 if len(items) <= 1:
345bce66c04a mx: fix for select_items Gilles Duboscq <duboscq@ssw.jku.at> parents: 11301 diff changeset	4470 return items
345bce66c04a mx: fix for select_items Gilles Duboscq <duboscq@ssw.jku.at> parents: 11301 diff changeset	4471 else:
11295 bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4472 if allowMultiple:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4473 log('[0] <all>')
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4474 for i in range(0, len(items)):
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4475 if descriptions is None:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4476 log('[{0}] {1}'.format(i + 1, items[i]))
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4477 else:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4478 assert len(items) == len(descriptions)
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4479 wrapper = textwrap.TextWrapper(subsequent_indent=' ')
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4480 log('\n'.join(wrapper.wrap('[{0}] {1} - {2}'.format(i + 1, items[i], descriptions[i]))))
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4481 while True:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4482 if allowMultiple:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4483 s = raw_input('Enter number(s) of selection (separate multiple choices with spaces): ').split()
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4484 else:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4485 s = [raw_input('Enter number of selection: ')]
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4486 try:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4487 s = [int(x) for x in s]
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4488 except:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4489 log('Selection contains non-numeric characters: "' + ' '.join(s) + '"')
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4490 continue
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4491
11295 bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4492 if allowMultiple and 0 in s:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4493 return items
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4494
11295 bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4495 indexes = []
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4496 for n in s:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4497 if n not in range(1, len(items) + 1):
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4498 log('Invalid selection: ' + str(n))
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4499 continue
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4500 else:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4501 indexes.append(n - 1)
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4502 if allowMultiple:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4503 return [items[i] for i in indexes]
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4504 if len(indexes) == 1:
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4505 return items[indexes[0]]
bb70a309a7cf enhanced select_items to support multiple selections Doug Simon <doug.simon@oracle.com> parents: 11245 diff changeset	4506 return None
11203 8ab76b7c6ff6 added interactive selection capability to 'mx javap' command Doug Simon <doug.simon@oracle.com> parents: 10585 diff changeset	4507
15087 f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4508 def exportlibs(args):
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4509 """export libraries to an archive file"""
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4510
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4511 parser = ArgumentParser(prog='exportlibs')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4512 parser.add_argument('-b', '--base', action='store', help='base name of archive (default: libs)', default='libs', metavar='<path>')
15364 9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4513 parser.add_argument('-a', '--include-all', action='store_true', help="include all defined libaries")
15087 f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4514 parser.add_argument('--arc', action='store', choices=['tgz', 'tbz2', 'tar', 'zip'], default='tgz', help='the type of the archive to create')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4515 parser.add_argument('--no-sha1', action='store_false', dest='sha1', help='do not create SHA1 signature of archive')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4516 parser.add_argument('--no-md5', action='store_false', dest='md5', help='do not create MD5 signature of archive')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4517 parser.add_argument('--include-system-libs', action='store_true', help='include system libraries (i.e., those not downloaded from URLs)')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4518 parser.add_argument('extras', nargs=REMAINDER, help='extra files and directories to add to archive', metavar='files...')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4519 args = parser.parse_args(args)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4520
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4521 def createArchive(addMethod):
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4522 entries = {}
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4523 def add(path, arcname):
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4524 apath = os.path.abspath(path)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4525 if not entries.has_key(arcname):
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4526 entries[arcname] = apath
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4527 logv('[adding ' + path + ']')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4528 addMethod(path, arcname=arcname)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4529 elif entries[arcname] != apath:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4530 logv('[warning: ' + apath + ' collides with ' + entries[arcname] + ' as ' + arcname + ']')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4531 else:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4532 logv('[already added ' + path + ']')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4533
15355 43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4534 libsToExport = set()
15364 9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4535 if args.include_all:
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4536 for lib in _libs.itervalues():
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4537 libsToExport.add(lib)
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4538 else:
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4539 def isValidLibrary(dep):
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4540 if dep in _libs.iterkeys():
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4541 lib = _libs[dep]
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4542 if len(lib.urls) != 0 or args.include_system_libs:
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4543 return lib
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4544 return None
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4545
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4546 # iterate over all project dependencies and find used libraries
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4547 for p in _projects.itervalues():
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4548 for dep in p.deps:
15355 43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4549 r = isValidLibrary(dep)
43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4550 if r:
43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4551 libsToExport.add(r)
43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4552
15364 9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4553 # a library can have other libraries as dependency
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4554 size = 0
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4555 while size != len(libsToExport):
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4556 size = len(libsToExport)
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4557 for lib in libsToExport.copy():
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4558 for dep in lib.deps:
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4559 r = isValidLibrary(dep)
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4560 if r:
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4561 libsToExport.add(r)
9693513ce95c mx exportlibs: add option to include all defined libaries Bernhard Urban <bernhard.urban@jku.at> parents: 15362 diff changeset	4562
15355 43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4563 for lib in libsToExport:
43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4564 add(lib.get_path(resolve=True), lib.path)
15356 9e7f87dc6395 mx exportlibs: include source dependencies and digest files Bernhard Urban <bernhard.urban@jku.at> parents: 15355 diff changeset	4565 if lib.sha1:
9e7f87dc6395 mx exportlibs: include source dependencies and digest files Bernhard Urban <bernhard.urban@jku.at> parents: 15355 diff changeset	4566 add(lib.get_path(resolve=True) + ".sha1", lib.path + ".sha1")
9e7f87dc6395 mx exportlibs: include source dependencies and digest files Bernhard Urban <bernhard.urban@jku.at> parents: 15355 diff changeset	4567 if lib.sourcePath:
9e7f87dc6395 mx exportlibs: include source dependencies and digest files Bernhard Urban <bernhard.urban@jku.at> parents: 15355 diff changeset	4568 add(lib.get_source_path(resolve=True), lib.sourcePath)
9e7f87dc6395 mx exportlibs: include source dependencies and digest files Bernhard Urban <bernhard.urban@jku.at> parents: 15355 diff changeset	4569 if lib.sourceSha1:
9e7f87dc6395 mx exportlibs: include source dependencies and digest files Bernhard Urban <bernhard.urban@jku.at> parents: 15355 diff changeset	4570 add(lib.get_source_path(resolve=True) + ".sha1", lib.sourcePath + ".sha1")
15355 43aa6a7e60bd mx exportlibs: include libs only if there's a real dependency from a project Bernhard Urban <bernhard.urban@jku.at> parents: 15274 diff changeset	4571
15087 f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4572 if args.extras:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4573 for e in args.extras:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4574 if os.path.isdir(e):
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4575 for root, _, filenames in os.walk(e):
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4576 for name in filenames:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4577 f = join(root, name)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4578 add(f, f)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4579 else:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4580 add(e, e)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4581
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4582 if args.arc == 'zip':
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4583 path = args.base + '.zip'
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4584 with zipfile.ZipFile(path, 'w') as zf:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4585 createArchive(zf.write)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4586 else:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4587 path = args.base + '.tar'
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4588 mode = 'w'
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4589 if args.arc != 'tar':
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4590 sfx = args.arc[1:]
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4591 mode = mode + ':' + sfx
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4592 path = path + '.' + sfx
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4593 with tarfile.open(path, mode) as tar:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4594 createArchive(tar.add)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4595 log('created ' + path)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4596
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4597 def digest(enabled, path, factory, suffix):
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4598 if enabled:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4599 d = factory()
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4600 with open(path, 'rb') as f:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4601 while True:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4602 buf = f.read(4096)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4603 if not buf:
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4604 break
15122 11a591a99515 mx: fixed bug in exportlibs Doug Simon <doug.simon@oracle.com> parents: 15118 diff changeset	4605 d.update(buf)
15087 f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4606 with open(path + '.' + suffix, 'w') as fp:
15122 11a591a99515 mx: fixed bug in exportlibs Doug Simon <doug.simon@oracle.com> parents: 15118 diff changeset	4607 print >> fp, d.hexdigest()
15087 f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4608 log('created ' + path + '.' + suffix)
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4609
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4610 digest(args.sha1, path, hashlib.sha1, 'sha1')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4611 digest(args.md5, path, hashlib.md5, 'md5')
f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4612
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4613 def javap(args):
9009 1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4614 """disassemble classes matching given pattern with javap"""
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4615
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4616 javapExe = java().javap
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4617 if not exists(javapExe):
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4618 abort('The javap executable does not exists: ' + javapExe)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4619 else:
11203 8ab76b7c6ff6 added interactive selection capability to 'mx javap' command Doug Simon <doug.simon@oracle.com> parents: 10585 diff changeset	4620 candidates = findclass(args, logToConsole=False)
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command Doug Simon <doug.simon@oracle.com> parents: 10585 diff changeset	4621 if len(candidates) == 0:
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command Doug Simon <doug.simon@oracle.com> parents: 10585 diff changeset	4622 log('no matches')
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command Doug Simon <doug.simon@oracle.com> parents: 10585 diff changeset	4623 selection = select_items(candidates)
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4624 run([javapExe, '-private', '-verbose', '-classpath', classpath()] + selection)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4625
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4626 def show_projects(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4627 """show all loaded projects"""
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4628 for s in suites():
11659 ec7aad9dfc47 made 'mx build' refresh IDE configs automatically Doug Simon <doug.simon@oracle.com> parents: 11620 diff changeset	4629 projectsFile = join(s.mxDir, 'projects')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4630 if exists(projectsFile):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4631 log(projectsFile)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4632 for p in s.projects:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4633 log('\t' + p.name)
11759 8bcd76c3f23b mx.py whitespace fixes Mick Jordan <mick.jordan@oracle.com> parents: 11756 diff changeset	4634
11511 3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4635 def ask_yes_no(question, default=None):
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4636 """"""
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4637 assert not default or default == 'y' or default == 'n'
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4638 if not sys.stdout.isatty():
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4639 if default:
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4640 return default
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4641 else:
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4642 abort("Can not answer '" + question + "?' if stdout is not a tty")
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4643 questionMark = '? [yn]: '
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4644 if default:
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4645 questionMark = questionMark.replace(default, default.upper())
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4646 answer = raw_input(question + questionMark) or default
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4647 while not answer:
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4648 answer = raw_input(question + questionMark)
3110bea9a6b0 mx: add helper method for yes/no question Gilles Duboscq <duboscq@ssw.jku.at> parents: 11401 diff changeset	4649 return answer.lower().startswith('y')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4650
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4651 def add_argument(args, *kwargs):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4652 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4653 Define how a single command-line argument.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4654 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4655 assert _argParser is not None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4656 _argParser.add_argument(args, *kwargs)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4657
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4658 def update_commands(suite, new_commands):
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4659 for key, value in new_commands.iteritems():
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4660 if _commands.has_key(key):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4661 warn("redefining command '" + key + "' in suite " + suite.name)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4662 _commands[key] = value
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4663
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4664 def warn(msg):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4665 if _warn:
13968 6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings Bernhard Urban <bernhard.urban@jku.at> parents: 13952 diff changeset	4666 print 'WARNING: ' + msg
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4667
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4668 # Table of commands in alphabetical order.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4669 # Keys are command names, value are lists: [<function>, <usage msg>, <format args to doc string of function>...]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4670 # If any of the format args are instances of Callable, then they are called with an 'env' are before being
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4671 # used in the call to str.format().
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4672 # Suite extensions should not update this table directly, but use update_commands
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4673 _commands = {
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4674 'about': [about, ''],
4226 e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	4675 'build': [build, '[options]'],
e03ff10d4bfc Made the gate clean the Java projects only. Doug Simon <doug.simon@oracle.com> parents: 4225 diff changeset	4676 'checkstyle': [checkstyle, ''],
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4677 'canonicalizeprojects': [canonicalizeprojects, ''],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4678 'clean': [clean, ''],
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	4679 'eclipseinit': [eclipseinit, ''],
7524 bbaa734b3627 added 'mx eclipseformat' command for applying the Eclipse Code Formatter to the Java source files in a suite Doug Simon <doug.simon@oracle.com> parents: 7509 diff changeset	4680 'eclipseformat': [eclipseformat, ''],
15087 f3e74d317e83 mx: added exportlibs command Doug Simon <doug.simon@oracle.com> parents: 15060 diff changeset	4681 'exportlibs': [exportlibs, ''],
5455 271e83dcfcef added findclass command to mx tool Doug Simon <doug.simon@oracle.com> parents: 5376 diff changeset	4682 'findclass': [findclass, ''],
7913 0df252296c8d added fsckproject command to mx for removing directories corresponding to deleted projects. This command is also called from the ideinit command (GRAAL-90) Doug Simon <doug.simon@oracle.com> parents: 7787 diff changeset	4683 'fsckprojects': [fsckprojects, ''],
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4684 'help': [help_, '[command]'],
4271 311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations. Doug Simon <doug.simon@oracle.com> parents: 4270 diff changeset	4685 'ideclean': [ideclean, ''],
4269 ffd5ce8fc736 Moved IDE project configuration into mx.py. Doug Simon <doug.simon@oracle.com> parents: 4258 diff changeset	4686 'ideinit': [ideinit, ''],
15060 858d2b91c1f8 Add a prototype for mx intellijinit Gilles Duboscq <duboscq@ssw.jku.at> parents: 14964 diff changeset	4687 'intellijinit': [intellijinit, ''],
8131 83ec1df0a30f added support for distributions to mx Doug Simon <doug.simon@oracle.com> parents: 7925 diff changeset	4688 'archive': [archive, '[options]'],
4301 fad6f1ebeb44 mx.py: new projectgraph command Lukas Stadler <lukas.stadler@jku.at> parents: 4271 diff changeset	4689 'projectgraph': [projectgraph, ''],
11777 f3e5cbd1efae move pylint to mxtool Mick Jordan <mick.jordan@oracle.com> parents: 11759 diff changeset	4690 'pylint': [pylint, ''],
9009 1eb16dbb31a7 changed 'mx javap' command to accept class name patterns instead of fully qualified class names Doug Simon <doug.simon@oracle.com> parents: 9002 diff changeset	4691 'javap': [javap, '<class name patterns>'],
5171 99ad84da5f99 added javadoc command (from Maxine version of mx) Doug Simon <doug.simon@oracle.com> parents: 5166 diff changeset	4692 'javadoc': [javadoc, '[options]'],
5771 613a3ddb9a71 moved core site functionality into mx.py Doug Simon <doug.simon@oracle.com> parents: 5762 diff changeset	4693 'site': [site, '[options]'],
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	4694 'netbeansinit': [netbeansinit, ''],
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4695 'projects': [show_projects, ''],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4696 }
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4697
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4698 _argParser = ArgParser()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4699
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4700 def _suitename(mxDir):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4701 base = os.path.basename(mxDir)
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4702 parts = base.split('.')
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4703 # temporary workaround until mx.graal exists
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4704 if len(parts) == 1:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4705 return 'graal'
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4706 else:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4707 return parts[1]
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4708
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4709 def _is_suite_dir(d, mxDirName=None):
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4710 """
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4711 Checks if d contains a suite.
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4712 If mxDirName is None, matches any suite name, otherwise checks for exactly that suite.
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4713 """
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4714 if os.path.isdir(d):
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4715 for f in os.listdir(d):
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4716 if (mxDirName == None and (f == 'mx' or fnmatch.fnmatch(f, 'mx.*'))) or f == mxDirName:
11605 3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4717 mxDir = join(d, f)
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367) Mick Jordan <mick.jordan@oracle.com> parents: 11597 diff changeset	4718 if exists(mxDir) and isdir(mxDir) and exists(join(mxDir, 'projects')):
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4719 return mxDir
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4720
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4721 def _check_primary_suite():
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4722 if _primary_suite is None:
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4723 abort('no primary suite found')
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4724 else:
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4725 return _primary_suite
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4726
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4727 def _findPrimarySuiteMxDirFrom(d):
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4728 """ search for a suite directory upwards from 'd' """
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4729 while d:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4730 mxDir = _is_suite_dir(d)
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4731 if mxDir is not None:
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4732 return mxDir
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4733 parent = dirname(d)
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4734 if d == parent:
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4735 return None
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4736 d = parent
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4737
5699 e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4738 return None
e9f7d16194a8 added --base argument to javadoc command Doug Simon <doug.simon@oracle.com> parents: 5581 diff changeset	4739
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4740 def _findPrimarySuiteMxDir():
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4741 # check for explicit setting
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4742 if _primary_suite_path is not None:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4743 mxDir = _is_suite_dir(_primary_suite_path)
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4744 if mxDir is not None:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4745 return mxDir
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4746 else:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4747 abort(_primary_suite_path + ' does not contain an mx suite')
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4748
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4749 # try current working directory first
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4750 mxDir = _findPrimarySuiteMxDirFrom(os.getcwd())
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4751 if mxDir is not None:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4752 return mxDir
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4753 # backwards compatibility: search from path of this file
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4754 return _findPrimarySuiteMxDirFrom(dirname(__file__))
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4755
4241 8fece0287975 Made command timeout also kill any currently executing subprocess (group). Doug Simon <doug.simon@oracle.com> parents: 4239 diff changeset	4756 def main():
12477 a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4757 primarySuiteMxDir = _findPrimarySuiteMxDir()
a5d83166dca6 mxtool hg support for suites Mick Jordan <mick.jordan@oracle.com> parents: 12455 diff changeset	4758 if primarySuiteMxDir:
12522 5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4759 global _primary_suite
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4760 _primary_suite = _loadSuite(primarySuiteMxDir, True)
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups Mick Jordan <mick.jordan@oracle.com> parents: 12521 diff changeset	4761 else:
13855 bc32c9f5719b remove multiple suite/repo support Mick Jordan <mick.jordan@oracle.com> parents: 13853 diff changeset	4762 abort('no primary suite found')
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4763
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4764 opts, commandAndArgs = _argParser._parse_cmd_line()
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4765
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4766 global _opts, _java_homes
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4767 _opts = opts
14763 a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4768 defaultJdk = JavaConfig(opts.java_home, opts.java_dbg_port)
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4769 _java_homes = [defaultJdk]
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4770 if opts.extra_java_homes:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4771 for java_home in opts.extra_java_homes.split(os.pathsep):
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4772 extraJdk = JavaConfig(java_home, opts.java_dbg_port)
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4773 if extraJdk > defaultJdk:
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4774 abort('Secondary JDK ' + extraJdk.jdk + ' has higher compliance level than default JDK ' + defaultJdk.jdk)
a6c1c3eb20c4 transition to JDK8 Doug Simon <doug.simon@oracle.com> parents: 14745 diff changeset	4775 _java_homes.append(extraJdk)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4776
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	4777 for s in suites():
4180 383c1272cd1f Fixed gate script such that JAVA_HOME can be set in env file. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4178 diff changeset	4778 s._post_init(opts)
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4779
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4780 if len(commandAndArgs) == 0:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4781 _argParser.print_help()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4782 return
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4783
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4784 command = commandAndArgs[0]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4785 command_args = commandAndArgs[1:]
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4786
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4787 if not _commands.has_key(command):
dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4788 hits = [c for c in _commands.iterkeys() if c.startswith(command)]
5824 b1dc8fbebb48 mx now handles unambiguous command prefixes (e.g. instead of 'mx eclipseinit' you can use 'mx ec') Doug Simon <doug.simon@oracle.com> parents: 5821 diff changeset	4789 if len(hits) == 1:
b1dc8fbebb48 mx now handles unambiguous command prefixes (e.g. instead of 'mx eclipseinit' you can use 'mx ec') Doug Simon <doug.simon@oracle.com> parents: 5821 diff changeset	4790 command = hits[0]
b1dc8fbebb48 mx now handles unambiguous command prefixes (e.g. instead of 'mx eclipseinit' you can use 'mx ec') Doug Simon <doug.simon@oracle.com> parents: 5821 diff changeset	4791 elif len(hits) == 0:
b1dc8fbebb48 mx now handles unambiguous command prefixes (e.g. instead of 'mx eclipseinit' you can use 'mx ec') Doug Simon <doug.simon@oracle.com> parents: 5821 diff changeset	4792 abort('mx: unknown command \'{0}\'\n{1}use "mx help" for more options'.format(command, _format_commands()))
b1dc8fbebb48 mx now handles unambiguous command prefixes (e.g. instead of 'mx eclipseinit' you can use 'mx ec') Doug Simon <doug.simon@oracle.com> parents: 5821 diff changeset	4793 else:
b1dc8fbebb48 mx now handles unambiguous command prefixes (e.g. instead of 'mx eclipseinit' you can use 'mx ec') Doug Simon <doug.simon@oracle.com> parents: 5821 diff changeset	4794 abort('mx: command \'{0}\' is ambiguous\n {1}'.format(command, ' '.join(hits)))
5032 e2de9649f0a9 Integrated mxtool updates from Maxine project. Doug Simon <doug.simon@oracle.com> parents: 4664 diff changeset	4795
11514 dc3c8df55905 added support for pylint and fixed errors/warnings it found Doug Simon <doug.simon@oracle.com> parents: 11511 diff changeset	4796 c, _ = _commands[command][:2]
4293 d4906ea4255b Handle SIGTERM : killing mx will properly kill subprocesses Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4271 diff changeset	4797 def term_handler(signum, frame):
d4906ea4255b Handle SIGTERM : killing mx will properly kill subprocesses Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4271 diff changeset	4798 abort(1)
d4906ea4255b Handle SIGTERM : killing mx will properly kill subprocesses Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4271 diff changeset	4799 signal.signal(signal.SIGTERM, term_handler)
14134 e71d421370f3 mx: proxy SIGQUIT to child process Bernhard Urban <bernhard.urban@jku.at> parents: 14133 diff changeset	4800
14135 ee66410c0679 mx: add option to send sigquit before killing child Bernhard Urban <bernhard.urban@jku.at> parents: 14134 diff changeset	4801 def quit_handler(signum, frame):
ee66410c0679 mx: add option to send sigquit before killing child Bernhard Urban <bernhard.urban@jku.at> parents: 14134 diff changeset	4802 _send_sigquit()
14153 e328f28f7401 fix for mx, did not compile on Windows Christian Wirth <christian.wirth@oracle.com> parents: 14136 diff changeset	4803 if get_os() != 'windows':
e328f28f7401 fix for mx, did not compile on Windows Christian Wirth <christian.wirth@oracle.com> parents: 14136 diff changeset	4804 signal.signal(signal.SIGQUIT, quit_handler)
14134 e71d421370f3 mx: proxy SIGQUIT to child process Bernhard Urban <bernhard.urban@jku.at> parents: 14133 diff changeset	4805
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4806 try:
4270 2158e26b50cf Made generated NetBeans projects use project cross referencing. Doug Simon <doug.simon@oracle.com> parents: 4269 diff changeset	4807 if opts.timeout != 0:
4239 676feaf8adee Made the --timeout option apply to the whole mx command as opposed to each subprocess executed (the new --ptimeout does the latter). Doug Simon <doug.simon@oracle.com> parents: 4236 diff changeset	4808 def alarm_handler(signum, frame):
676feaf8adee Made the --timeout option apply to the whole mx command as opposed to each subprocess executed (the new --ptimeout does the latter). Doug Simon <doug.simon@oracle.com> parents: 4236 diff changeset	4809 abort('Command timed out after ' + str(opts.timeout) + ' seconds: ' + ' '.join(commandAndArgs))
676feaf8adee Made the --timeout option apply to the whole mx command as opposed to each subprocess executed (the new --ptimeout does the latter). Doug Simon <doug.simon@oracle.com> parents: 4236 diff changeset	4810 signal.signal(signal.SIGALRM, alarm_handler)
676feaf8adee Made the --timeout option apply to the whole mx command as opposed to each subprocess executed (the new --ptimeout does the latter). Doug Simon <doug.simon@oracle.com> parents: 4236 diff changeset	4811 signal.alarm(opts.timeout)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4812 retcode = c(command_args)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4813 if retcode is not None and retcode != 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4814 abort(retcode)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4815 except KeyboardInterrupt:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4816 # no need to show the stack trace when the user presses CTRL-C
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4817 abort(1)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4818
13471 020099961eb4 renamed JavaVersion to VersionSpec Doug Simon <doug.simon@oracle.com> parents: 13470 diff changeset	4819 version = VersionSpec("1.0")
13358 e1a50eac0eac Add a version number for the mxtool and support for requesting a minimum mx version in a suite Gilles Duboscq <duboscq@ssw.jku.at> parents: 13288 diff changeset	4820
14103 9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	4821 currentUmask = None
9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	4822
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4823 if __name__ == '__main__':
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4824 # rename this module as 'mx' so it is not imported twice by the commands.py modules
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4825 sys.modules['mx'] = sys.modules.pop('__main__')
4242 3e25132be4b4 Disabled eager resolution of libraries as they are defined. Doug Simon <doug.simon@oracle.com> parents: 4241 diff changeset	4826
14103 9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	4827 # Capture the current umask since there's no way to query it without mutating it.
9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	4828 currentUmask = os.umask(0)
9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	4829 os.umask(currentUmask)
9d8aaa3200a3 make mx respect umask when making jar files Tom Rodriguez <tom.rodriguez@oracle.com> parents: 13982 diff changeset	4830
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	4831 main()

Mercurial > hg > truffle

annotate mxtool/mx.py @ 15781:8b9e7f235d85