annotate mxtool/mx.py @ 15822:4900010a15d2

mx archive: fix log message
author Bernhard Urban <bernhard.urban@jku.at>
date Wed, 21 May 2014 16:41:57 +0200
parents de8296c27680
children 9acad98567dc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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:
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
66 def __init__(self, suite, name, path, sourcesPath, deps, mainClass, 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()
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
74 self.mainClass = mainClass
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
75 self.excludedDependencies = excludedDependencies
15638
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
76 self.distDependencies = distDependencies
14775
40aa1eb176db mx: added support for excluding dependencies from distributions
Doug Simon <doug.simon@oracle.com>
parents: 14764
diff changeset
77
40aa1eb176db mx: added support for excluding dependencies from distributions
Doug Simon <doug.simon@oracle.com>
parents: 14764
diff changeset
78 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
79 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
80 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
81 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
82 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
83 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
84
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
85 def __str__(self):
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
86 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
87
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
88 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
89 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
90
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
91 def make_archive(self):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
92 # are sources combined into main archive?
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
93 unified = self.path == self.sourcesPath
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
94
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
95 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
96 srcArc = arc if unified else srcArcRaw
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
97 services = {}
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
98 def overwriteCheck(zf, arcname, source):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
99 if not hasattr(zf, '_provenance'):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
100 zf._provenance = {}
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
101 existingSource = zf._provenance.get(arcname, None)
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
102 isOverwrite = False
15821
de8296c27680 mx archive: avoid multiple directory entries too
Bernhard Urban <bernhard.urban@jku.at>
parents: 15819
diff changeset
103 if existingSource and existingSource != source:
15822
4900010a15d2 mx archive: fix log message
Bernhard Urban <bernhard.urban@jku.at>
parents: 15821
diff changeset
104 log('warning: ' + self.path + ': avoid overwrite of ' + arcname + '\n new: ' + source + '\n old: ' + existingSource)
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
105 isOverwrite = True
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
106 zf._provenance[arcname] = source
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
107 return isOverwrite
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
108
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
109 if self.mainClass:
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
110 manifest = "Manifest-Version: 1.0\nMain-Class: %s\n\n" % (self.mainClass)
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
111 if not overwriteCheck(arc.zf, "META-INF/MANIFEST.MF", "project files"):
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
112 arc.zf.writestr("META-INF/MANIFEST.MF", manifest)
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
113
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
114 for dep in self.sorted_deps(includeLibs=True):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
115 if dep.isLibrary():
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
116 l = dep
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
117 # merge library jar into distribution jar
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
118 logv('[' + self.path + ': adding library ' + l.name + ']')
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
119 lpath = l.get_path(resolve=True)
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
120 libSourcePath = l.get_source_path(resolve=True)
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
121 if lpath:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
122 with zipfile.ZipFile(lpath, 'r') as lp:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
123 for arcname in lp.namelist():
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
124 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
125 service = arcname[len('META-INF/services/'):]
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
126 assert '/' not in service
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
127 services.setdefault(service, []).extend(lp.read(arcname).splitlines())
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
128 else:
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
129 if not overwriteCheck(arc.zf, arcname, lpath + '!' + arcname):
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
130 arc.zf.writestr(arcname, lp.read(arcname))
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
131 if srcArc.zf and libSourcePath:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
132 with zipfile.ZipFile(libSourcePath, 'r') as lp:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
133 for arcname in lp.namelist():
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
134 if not overwriteCheck(srcArc.zf, arcname, lpath + '!' + arcname):
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
135 srcArc.zf.writestr(arcname, lp.read(arcname))
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
136 elif dep.isProject():
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
137 p = dep
15601
4aeb0b80324f mx distributions: allow to specify dependencies between distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15579
diff changeset
138
15638
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
139 isCoveredByDependecy = False
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
140 for d in self.distDependencies:
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
141 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
142 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
143 isCoveredByDependecy = True
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
144 break
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
145
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
146 if isCoveredByDependecy:
15601
4aeb0b80324f mx distributions: allow to specify dependencies between distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15579
diff changeset
147 continue
4aeb0b80324f mx distributions: allow to specify dependencies between distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15579
diff changeset
148
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
149 # 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
150 jdk = java(p.javaCompliance)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
151 assert jdk
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
152
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
153 logv('[' + self.path + ': adding project ' + p.name + ']')
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
154 outputDir = p.output_dir()
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
155 for root, _, files in os.walk(outputDir):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
156 relpath = root[len(outputDir) + 1:]
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
157 if relpath == join('META-INF', 'services'):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
158 for service in files:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
159 with open(join(root, service), 'r') as fp:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
160 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
161 elif relpath == join('META-INF', 'providers'):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
162 for provider in files:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
163 with open(join(root, provider), 'r') as fp:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
164 for service in fp:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
165 services.setdefault(service.strip(), []).append(provider)
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
166 else:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
167 for f in files:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
168 arcname = join(relpath, f).replace(os.sep, '/')
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
169 if not overwriteCheck(arc.zf, arcname, join(root, f)):
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
170 arc.zf.write(join(root, f), arcname)
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
171 if srcArc.zf:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
172 sourceDirs = p.source_dirs()
15227
7be43cbf3568 mx: include generated sources in archived distribution sources
Doug Simon <doug.simon@oracle.com>
parents: 15226
diff changeset
173 if p.source_gen_dir():
7be43cbf3568 mx: include generated sources in archived distribution sources
Doug Simon <doug.simon@oracle.com>
parents: 15226
diff changeset
174 sourceDirs.append(p.source_gen_dir())
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
175 for srcDir in sourceDirs:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
176 for root, _, files in os.walk(srcDir):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
177 relpath = root[len(srcDir) + 1:]
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
178 for f in files:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
179 if f.endswith('.java'):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
180 arcname = join(relpath, f).replace(os.sep, '/')
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
181 if not overwriteCheck(srcArc.zf, arcname, join(root, f)):
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
182 srcArc.zf.write(join(root, f), arcname)
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
183
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
184 for service, providers in services.iteritems():
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
185 arcname = 'META-INF/services/' + service
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
186 arc.zf.writestr(arcname, '\n'.join(providers))
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
187
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
188 self.notify_updated()
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
189
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
190
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
191 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
192 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
193 l(self)
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
194
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
195 """
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
196 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
197 """
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
198 class Dependency:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
199 def __init__(self, suite, name):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
200 self.name = name
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
201 self.suite = suite
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
202
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
203 def __str__(self):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
204 return 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 __eq__(self, other):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
207 return self.name == other.name
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
208
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
209 def __ne__(self, other):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
210 return self.name != other.name
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
211
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
212 def __hash__(self):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
213 return hash(self.name)
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 def isLibrary(self):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
216 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
217
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
218 def isJreLibrary(self):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
219 return isinstance(self, JreLibrary)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
220
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
221 def isProject(self):
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
222 return isinstance(self, Project)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
223
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
224 class Project(Dependency):
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
225 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
226 Dependency.__init__(self, suite, name)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
227 self.srcDirs = srcDirs
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
228 self.deps = deps
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
229 self.checkstyleProj = name
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
230 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
231 self.native = False
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
232 self.workingSets = workingSets
7509
442668d41bc2 fixed warnings
Doug Simon <doug.simon@oracle.com>
parents: 7299
diff changeset
233 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
234
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
235 # 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
236 # less than the compliance level of the default JDK
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
237 jdk = java(self.javaCompliance)
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
238 if jdk is None and self.javaCompliance < java().javaCompliance:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
239 abort('Cannot find ' + str(self.javaCompliance) + ' JDK required by ' + name + '. ' +
14764
5823c399e28f pylint fixes
Bernhard Urban <bernhard.urban@jku.at>
parents: 14763
diff changeset
240 '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
241
5581
9911227e6dd3 create directories for not yet existing projects
Doug Simon <doug.simon@oracle.com>
parents: 5455
diff changeset
242 # Create directories for projects that don't yet exist
7509
442668d41bc2 fixed warnings
Doug Simon <doug.simon@oracle.com>
parents: 7299
diff changeset
243 if not exists(d):
442668d41bc2 fixed warnings
Doug Simon <doug.simon@oracle.com>
parents: 7299
diff changeset
244 os.mkdir(d)
5581
9911227e6dd3 create directories for not yet existing projects
Doug Simon <doug.simon@oracle.com>
parents: 5455
diff changeset
245 for s in self.source_dirs():
9911227e6dd3 create directories for not yet existing projects
Doug Simon <doug.simon@oracle.com>
parents: 5455
diff changeset
246 if not exists(s):
9911227e6dd3 create directories for not yet existing projects
Doug Simon <doug.simon@oracle.com>
parents: 5455
diff changeset
247 os.mkdir(s)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
248
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
249 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
250 """
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
251 Add the transitive set of dependencies for this project, including
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
252 libraries if 'includeLibs' is true, to the 'deps' list.
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
253 """
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
254 childDeps = list(self.deps)
9854
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
255 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
256 childDeps = self.annotation_processors() + childDeps
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
257 if self in deps:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
258 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
259 for name in childDeps:
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
260 assert name != self.name
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
261 dep = dependency(name)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
262 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
263 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
264 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
265 deps.append(self)
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
266 return deps
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 _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
269 currentDist = distances.get(name)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
270 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
271 distances[name] = dist
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
272 p = project(name, False)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
273 if p is not None:
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
274 for dep in p.deps:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
275 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
276
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
277 def canonical_deps(self):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
278 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
279 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
280 via other dependencies).
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
281 """
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
282 distances = dict()
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
283 result = set()
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
284 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
285 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
286 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
287 if d == 1:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
288 result.add(n)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
289
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
290 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
291 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
292 return result
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
293
5699
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
294 def max_depth(self):
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
295 """
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
296 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
297 """
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
298 distances = dict()
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
299 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
300 return max(distances.values())
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
301
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
302 def source_dirs(self):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
303 """
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
304 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
305 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
306 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
307
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
308 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
309 """
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
310 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
311 """
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
312 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
313 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
314 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
315
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
316 def output_dir(self):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
317 """
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
318 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
319 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
320 if self.native:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
321 return None
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
322 return join(self.dir, 'bin')
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
323
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
324 def jasmin_output_dir(self):
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
325 """
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
326 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
327 """
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
328 if self.native:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
329 return None
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
330 return join(self.dir, 'jasmin_classes')
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
331
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
332 def append_to_classpath(self, cp, resolve):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
333 if not self.native:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
334 cp.append(self.output_dir())
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
335
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
336 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
337 """
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 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
339 '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
340 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
341 """
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
342 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
343 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
344 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
345 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
346 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
347 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
348 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
349 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
350 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
351 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
352 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
353 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
354 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
355 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
356 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
357 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
358 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
359 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
360 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
361 break
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
362
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
363 if matchFound:
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
364 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
365 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
366 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
367 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
368 if exists(pkgOutputDir):
d89a5dbaaaf6 ignore sources for which class files do not exist
Doug Simon <doug.simon@oracle.com>
parents: 11205
diff changeset
369 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
370 if includeInnerClasses:
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
371 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
372 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
373 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
374 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
375 className = pkg + '.' + simpleClassName
11245
d89a5dbaaaf6 ignore sources for which class files do not exist
Doug Simon <doug.simon@oracle.com>
parents: 11205
diff changeset
376 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
377 return result
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
378
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
379 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
380 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
381 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
382 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
383 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
384 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
385 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
386 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
387 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
388 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
389 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
390 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
391 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
392 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
393 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
394 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
395 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
396 # 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
397 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
398 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
399
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
400 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
401 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
402 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
403 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
404 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
405 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
406
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
407 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
408 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
409 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
410 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
411 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
412 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
413 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
414 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
415 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
416 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
417 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
418 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
419
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
420 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
421 """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
422 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
423 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
424
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
425 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
426 """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
427 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
428 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
429
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
430 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
431 """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
432 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
433 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
434 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
435
9854
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
436 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
437 if not hasattr(self, '_annotationProcessors'):
9854
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
438 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
439 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
440 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
441
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
442 # 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
443 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
444 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
445 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
446 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
447 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
448 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
449
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
450 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
451 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
452 outOfDate = False
12641
851aa5341214 moved persistent annotation processor dependency files into mx/currentAnnotationProcessors directory
Doug Simon <doug.simon@oracle.com>
parents: 12640
diff changeset
453 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
454 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
455 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
456 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
457 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
458 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
459 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
460 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
461 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
462 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
463 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
464 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
465 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
466 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
467
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
468 def make_archive(self, path=None):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
469 outputDir = self.output_dir()
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
470 if not path:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
471 path = join(self.dir, self.name + '.jar')
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
472 with Archiver(path) as arc:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
473 for root, _, files in os.walk(outputDir):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
474 for f in files:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
475 relpath = root[len(outputDir) + 1:]
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
476 arcname = join(relpath, f).replace(os.sep, '/')
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
477 arc.zf.write(join(root, f), arcname)
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
478 return path
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
479
14964
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
480 def _make_absolute(path, prefix):
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
481 """
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
482 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
483 """
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
484 if not isabs(path):
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
485 return join(prefix, path)
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
486 return path
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
487
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
488 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
489 def _download_lib():
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
490 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
491 download(path, urls)
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
492
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
493 def _sha1Cached():
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
494 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
495 return f.read()[0:40]
e666c172c9aa mx: some cleanup around sha1 digest support
Bernhard Urban <bernhard.urban@jku.at>
parents: 14153
diff changeset
496
e666c172c9aa mx: some cleanup around sha1 digest support
Bernhard Urban <bernhard.urban@jku.at>
parents: 14153
diff changeset
497 def _writeSha1Cached():
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
498 with open(sha1path, 'w') as f:
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
499 f.write(_sha1OfFile())
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
500
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
501 def _sha1OfFile():
14153
e328f28f7401 fix for mx, did not compile on Windows
Christian Wirth <christian.wirth@oracle.com>
parents: 14136
diff changeset
502 with open(path, 'rb') as f:
14156
7668297a2e67 mx: compute sha1 digest blockwise
Bernhard Urban <bernhard.urban@jku.at>
parents: 14155
diff changeset
503 d = hashlib.sha1()
7668297a2e67 mx: compute sha1 digest blockwise
Bernhard Urban <bernhard.urban@jku.at>
parents: 14155
diff changeset
504 while True:
7668297a2e67 mx: compute sha1 digest blockwise
Bernhard Urban <bernhard.urban@jku.at>
parents: 14155
diff changeset
505 buf = f.read(4096)
7668297a2e67 mx: compute sha1 digest blockwise
Bernhard Urban <bernhard.urban@jku.at>
parents: 14155
diff changeset
506 if not buf:
7668297a2e67 mx: compute sha1 digest blockwise
Bernhard Urban <bernhard.urban@jku.at>
parents: 14155
diff changeset
507 break
7668297a2e67 mx: compute sha1 digest blockwise
Bernhard Urban <bernhard.urban@jku.at>
parents: 14155
diff changeset
508 d.update(buf)
7668297a2e67 mx: compute sha1 digest blockwise
Bernhard Urban <bernhard.urban@jku.at>
parents: 14155
diff changeset
509 return d.hexdigest()
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
510
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
511 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
512 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
513 _download_lib()
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 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
516 _writeSha1Cached()
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
517
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
518 if sha1 and sha1 != _sha1Cached():
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
519 _download_lib()
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
520 if sha1 != _sha1OfFile():
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
521 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
522 _writeSha1Cached()
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
523
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
524 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
525
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
526 class BaseLibrary(Dependency):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
527 def __init__(self, suite, name, optional):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
528 Dependency.__init__(self, suite, name)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
529 self.optional = optional
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
530
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
531 def __ne__(self, other):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
532 result = self.__eq__(other)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
533 if result is NotImplemented:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
534 return result
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
535 return not result
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
536
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
537 """
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
538 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
539 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
540 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
541 (i.e., _projects and _libs).
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
542
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
543 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
544 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
545 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
546 motivating example is the Java Flight Recorder library
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
547 found in the Oracle JDK.
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
548 """
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
549 class JreLibrary(BaseLibrary):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
550 def __init__(self, suite, name, jar, optional):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
551 BaseLibrary.__init__(self, suite, name, optional)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
552 self.jar = jar
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
553
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
554 def __eq__(self, other):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
555 if isinstance(other, JreLibrary):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
556 return self.jar == other.jar
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
557 else:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
558 return NotImplemented
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
559
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
560 def is_present_in_jdk(self, jdk):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
561 for e in jdk.bootclasspath().split(os.pathsep):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
562 if basename(e) == self.jar:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
563 return True
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
564 for d in jdk.extdirs().split(os.pathsep):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
565 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
566 return True
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
567 for d in jdk.endorseddirs().split(os.pathsep):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
568 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
569 return True
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
570 return False
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
571
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
572 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
573 """
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
574 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
575 """
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
576 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
577 deps.append(self)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
578 return deps
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
579
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
580 class Library(BaseLibrary):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
581 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
582 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
583 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
584 self.urls = urls
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
585 self.sha1 = sha1
5853
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
586 self.sourcePath = sourcePath
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
587 self.sourceUrls = sourceUrls
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
588 self.sourceSha1 = sourceSha1
15149
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
589 self.deps = deps
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
590 abspath = _make_absolute(self.path, self.suite.dir)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
591 if not optional and not exists(abspath):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
592 if not len(urls):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
593 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
594 for url in urls:
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
595 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
596 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
597
11605
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
598 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
599 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
600 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
601 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
602 else:
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
603 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
604 else:
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
605 return NotImplemented
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
606
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
607 def get_path(self, resolve):
14964
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
608 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
609 sha1path = path + '.sha1'
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
610
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
611 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
612 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
613 return None
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
614
15692
5ec52f033e58 mxtool: minor fix of optional field usage
Bernhard Urban <bernhard.urban@jku.at>
parents: 15662
diff changeset
615 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
616
5853
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
617 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
618 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
619 return None
15147
d93cc1fdf55e Fix Library.get_source_path (use sourcePath instead of path)
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15135
diff changeset
620 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
621 sha1path = path + '.sha1'
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
622
14154
e666c172c9aa mx: some cleanup around sha1 digest support
Bernhard Urban <bernhard.urban@jku.at>
parents: 14153
diff changeset
623 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
624
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
625 def append_to_classpath(self, cp, resolve):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
626 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
627 if path and (exists(path) or not resolve):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
628 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
629
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
630 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
631 """
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
632 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
633 """
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
634 if not includeLibs:
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
635 return deps
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
636 childDeps = list(self.deps)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
637 if self in deps:
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
638 return deps
15149
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
639 for name in childDeps:
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
640 assert name != self.name
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
641 dep = library(name)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
642 if not dep in deps:
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
643 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
644 if not self in deps and includeSelf:
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
645 deps.append(self)
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
646 return deps
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
647
12508
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
648 class HgConfig:
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
649 """
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
650 Encapsulates access to Mercurial (hg)
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
651 """
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
652 def __init__(self):
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
653 self.missing = 'no hg executable found'
12512
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
654 self.has_hg = None
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
655
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
656 def check(self, abortOnFail=True):
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
657 if self.has_hg is None:
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
658 try:
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
659 subprocess.check_output(['hg'])
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
660 self.has_hg = True
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
661 except OSError:
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
662 self.has_hg = False
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
663 warn(self.missing)
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
664
12508
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
665 if not self.has_hg:
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
666 if abortOnFail:
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
667 abort(self.missing)
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
668 else:
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
669 warn(self.missing)
12512
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
670
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
671 def tip(self, sDir, abortOnError=True):
12508
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
672 try:
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
673 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
674 except OSError:
21aa1ce5c666 made hg be called lazily
Doug Simon <doug.simon@oracle.com>
parents: 12508
diff changeset
675 warn(self.missing)
12508
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
676 except subprocess.CalledProcessError:
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
677 if abortOnError:
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
678 abort('failed to get tip revision id')
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
679 else:
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
680 return None
5cde653f58f9 mxtool: handle missing hg executable gracefully
Mick Jordan <mick.jordan@oracle.com>
parents: 12504
diff changeset
681
15402
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
682 def isDirty(self, sDir, abortOnError=True):
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
683 try:
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
684 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
685 except OSError:
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
686 warn(self.missing)
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
687 except subprocess.CalledProcessError:
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
688 if abortOnError:
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
689 abort('failed to get status')
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
690 else:
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
691 return None
5dcf0ae606f3 mx: new export command
Bernhard Urban <bernhard.urban@jku.at>
parents: 15386
diff changeset
692
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
693 class Suite:
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
694 def __init__(self, mxDir, primary, load=True):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
695 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
696 self.mxDir = mxDir
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
697 self.projects = []
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
698 self.libs = []
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
699 self.jreLibs = []
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
700 self.dists = []
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
701 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
702 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
703 self.requiredMxVersion = None
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
704 self.name = _suitename(mxDir) # validated in _load_projects
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
705 if load:
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
706 # just check that there are no imports
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
707 self._load_imports()
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
708 self._load_env()
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
709 self._load_commands()
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
710 _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
711
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
712 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
713 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
714
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
715 def _load_projects(self):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
716 libsMap = dict()
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
717 jreLibsMap = dict()
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
718 projsMap = dict()
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
719 distsMap = dict()
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
720 projectsFile = join(self.mxDir, 'projects')
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
721 if not exists(projectsFile):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
722 return
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
723
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
724 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
725 prefix = ''
13620
fa56f5a49270 improved format checking and error reporting when parsing a projects file
Doug Simon <doug.simon@oracle.com>
parents: 13481
diff changeset
726 lineNum = 0
fa56f5a49270 improved format checking and error reporting when parsing a projects file
Doug Simon <doug.simon@oracle.com>
parents: 13481
diff changeset
727
fa56f5a49270 improved format checking and error reporting when parsing a projects file
Doug Simon <doug.simon@oracle.com>
parents: 13481
diff changeset
728 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
729 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
730
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
731 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
732 lineNum = lineNum + 1
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
733 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
734 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
735 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
736 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
737 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
738 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
739 prefix = ''
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
740 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
741 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
742 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
743 key, value = line.split('=', 1)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
744
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
745 parts = key.split('@')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
746
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
747 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
748 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
749 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
750 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
751 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
752 try:
13471
020099961eb4 renamed JavaVersion to VersionSpec
Doug Simon <doug.simon@oracle.com>
parents: 13470
diff changeset
753 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
754 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
755 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
756 else:
13620
fa56f5a49270 improved format checking and error reporting when parsing a projects file
Doug Simon <doug.simon@oracle.com>
parents: 13481
diff changeset
757 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
758
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
759 continue
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
760 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
761 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
762 kind, name, attr = parts
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
763 if kind == 'project':
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
764 m = projsMap
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
765 elif kind == 'library':
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
766 m = libsMap
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
767 elif kind == 'jrelibrary':
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
768 m = jreLibsMap
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
769 elif kind == 'distribution':
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
770 m = distsMap
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
771 else:
13620
fa56f5a49270 improved format checking and error reporting when parsing a projects file
Doug Simon <doug.simon@oracle.com>
parents: 13481
diff changeset
772 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
773
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
774 attrs = m.get(name)
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
775 if attrs is None:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
776 attrs = dict()
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
777 m[name] = attrs
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
778 value = expandvars_in_property(value)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
779 attrs[attr] = value
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
780
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
781 def pop_list(attrs, name):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
782 v = attrs.pop(name, None)
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
783 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
784 return []
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
785 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
786
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
787 for name, attrs in projsMap.iteritems():
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
788 srcDirs = pop_list(attrs, 'sourceDirs')
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
789 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
790 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
791 # deps += ap
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
792 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
793 subDir = attrs.pop('subDir', None)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
794 if subDir is None:
7509
442668d41bc2 fixed warnings
Doug Simon <doug.simon@oracle.com>
parents: 7299
diff changeset
795 d = join(self.dir, name)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
796 else:
7509
442668d41bc2 fixed warnings
Doug Simon <doug.simon@oracle.com>
parents: 7299
diff changeset
797 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
798 workingSets = attrs.pop('workingSets', None)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
799 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
800 p.checkstyleProj = attrs.pop('checkstyle', name)
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
801 p.native = attrs.pop('native', '') == 'true'
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
802 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
803 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
804 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
805 p._declaredAnnotationProcessors = ap
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
806 p.__dict__.update(attrs)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
807 self.projects.append(p)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
808
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
809 for name, attrs in jreLibsMap.iteritems():
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
810 jar = attrs.pop('jar')
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
811 # JRE libraries are optional by default
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
812 optional = attrs.pop('optional', 'true') != 'false'
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
813 l = JreLibrary(self, name, jar, optional)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
814 self.jreLibs.append(l)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
815
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
816 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
817 path = attrs.pop('path')
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
818 urls = pop_list(attrs, 'urls')
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
819 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
820 sourcePath = attrs.pop('sourcePath', None)
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
821 sourceUrls = pop_list(attrs, 'sourceUrls')
14133
d2e4b81fd8f0 mx: support sha1 digest for dependencies
Bernhard Urban <bernhard.urban@jku.at>
parents: 14103
diff changeset
822 sourceSha1 = attrs.pop('sourceSha1', None)
15149
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
823 deps = pop_list(attrs, 'dependencies')
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
824 # 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
825 optional = False
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
826 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
827 l.__dict__.update(attrs)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
828 self.libs.append(l)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
829
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
830 for name, attrs in distsMap.iteritems():
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
831 path = attrs.pop('path')
14937
3de340bdb8d3 added support for adding sources to distribution
Doug Simon <doug.simon@oracle.com>
parents: 14918
diff changeset
832 sourcesPath = attrs.pop('sourcesPath', None)
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
833 deps = pop_list(attrs, 'dependencies')
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
834 mainClass = attrs.pop('mainClass', None)
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
835 exclDeps = pop_list(attrs, 'exclude')
15638
83c69954bbaa mxtool: distribution dependency should be a list
Bernhard Urban <bernhard.urban@jku.at>
parents: 15601
diff changeset
836 distDeps = pop_list(attrs, 'distDependencies')
15819
2460aed6c899 mx: add support for setting a main class in distributions
Bernhard Urban <bernhard.urban@jku.at>
parents: 15818
diff changeset
837 d = Distribution(self, name, path, sourcesPath, deps, mainClass, exclDeps, distDeps)
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
838 d.__dict__.update(attrs)
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
839 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
840
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
841 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
842 abort('Missing "suite=<name>" in ' + projectsFile)
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
843
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
844 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
845 return 'mx_' + self.name.replace('-', '_')
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
846
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
847 def _find_commands(self, name):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
848 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
849 if exists(commandsPath):
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
850 return name
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
851 else:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
852 return None
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
853
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
854 def _load_commands(self):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
855 commandsName = self._find_commands(self._commands_name())
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
856 if commandsName is None:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
857 # backwards compatibility
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
858 commandsName = self._find_commands('commands')
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
859 if commandsName is not None:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
860 if commandsName in sys.modules:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
861 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
862 # temporarily extend the Python path
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
863 sys.path.insert(0, self.mxDir)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
864 mod = __import__(commandsName)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
865
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
866 self.commands = sys.modules.pop(commandsName)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
867 sys.modules[commandsName] = self.commands
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
868
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
869 # revert the Python path
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
870 del sys.path[0]
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
871
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
872 if not hasattr(mod, 'mx_init'):
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
873 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
874 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
875 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
876
11605
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
877 mod.mx_init(self)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
878 self.commands = mod
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
879
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
880 def _load_imports(self):
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
881 if exists(join(self.mxDir, 'imports')):
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
882 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
883
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
884 def _load_env(self):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
885 e = join(self.mxDir, 'env')
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
886 if exists(e):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
887 with open(e) as f:
10585
be8b942f448f made parsing of mx/env more robust
Doug Simon <doug.simon@oracle.com>
parents: 10576
diff changeset
888 lineNum = 0
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
889 for line in f:
10585
be8b942f448f made parsing of mx/env more robust
Doug Simon <doug.simon@oracle.com>
parents: 10576
diff changeset
890 lineNum = lineNum + 1
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
891 line = line.strip()
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
892 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
893 if not '=' in line:
be8b942f448f made parsing of mx/env more robust
Doug Simon <doug.simon@oracle.com>
parents: 10576
diff changeset
894 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
895 key, value = line.split('=', 1)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
896 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
897
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 def _post_init(self, opts):
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
899 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
900 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
901 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
902 elif self.requiredMxVersion > version:
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
903 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
904 # 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
905 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
906 existing = _projects.get(p.name)
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
907 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
908 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
909 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
910 _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
911 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
912 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
913 # 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
914 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
915 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
916 _libs[l.name] = l
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
917 for l in self.jreLibs:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
918 existing = _jreLibs.get(l.name)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
919 # 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
920 if existing is not None and existing != l:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
921 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
922 _jreLibs[l.name] = l
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
923 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
924 existing = _dists.get(d.name)
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
925 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
926 # 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
927 # abort('cannot redefine distribution ' + d.name)
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
928 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
929 d.path = existing.path
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
930 _dists[d.name] = d
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
931
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
932 # 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
933 # 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
934 # 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
935 # cannot be satisfied by the configured JDKs.
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
936 #
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
937 # Removed projects and libraries are also removed from
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
938 # distributions in they are listed as dependencies.
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
939 for d in sorted_deps(includeLibs=True):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
940 if d.isLibrary():
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
941 if d.optional:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
942 try:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
943 d.optional = False
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
944 path = d.get_path(resolve=True)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
945 except SystemExit:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
946 path = None
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
947 finally:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
948 d.optional = True
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
949 if not path:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
950 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
951 del _libs[d.name]
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
952 self.libs.remove(d)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
953 elif d.isProject():
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
954 if java(d.javaCompliance) is None:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
955 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
956 del _projects[d.name]
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
957 self.projects.remove(d)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
958 else:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
959 for name in list(d.deps):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
960 jreLib = _jreLibs.get(name)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
961 if jreLib:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
962 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
963 if jreLib.optional:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
964 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
965 del _projects[d.name]
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
966 self.projects.remove(d)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
967 else:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
968 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
969 elif not dependency(name, fatalIfMissing=False):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
970 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
971 del _projects[d.name]
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
972 self.projects.remove(d)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
973 for dist in _dists.values():
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
974 for name in list(dist.deps):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
975 if not dependency(name, fatalIfMissing=False):
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
976 logv('[omitting {} from distribution {}]'.format(name, dist))
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
977 dist.deps.remove(name)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
978
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
979 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
980 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
981
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
982 class XMLElement(xml.dom.minidom.Element):
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
983 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
984 writer.write(indent + "<" + self.tagName)
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
985
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
986 attrs = self._get_attributes()
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
987 a_names = attrs.keys()
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
988 a_names.sort()
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
989
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
990 for a_name in a_names:
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
991 writer.write(" %s=\"" % a_name)
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
992 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
993 writer.write("\"")
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
994 if self.childNodes:
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
995 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
996 # 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
997 # 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
998 writer.write(">")
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
999 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
1000 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
1001 else:
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1002 writer.write(">%s" % (newl))
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
1003 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
1004 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
1005 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
1006 else:
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1007 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
1008
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
1009 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
1010
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
1011 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
1012 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
1013 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
1014 self.padTextNodeWithoutSiblings = False
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
1015
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
1016 def createElement(self, tagName):
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
1017 # overwritten to create XMLElement
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
1018 e = XMLElement(tagName)
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
1019 e.ownerDocument = self
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
1020 return e
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1021
8302
b246434a3e4a made build-graal.xml be generated by mx
Doug Simon <doug.simon@oracle.com>
parents: 8189
diff changeset
1022 def comment(self, txt):
b246434a3e4a made build-graal.xml be generated by mx
Doug Simon <doug.simon@oracle.com>
parents: 8189
diff changeset
1023 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
1024
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1025 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
1026 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
1027 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
1028 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
1029 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
1030 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
1031 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
1032 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
1033 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
1034 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
1035 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
1036
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
1037 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
1038 assert self.current != self
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1039 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
1040 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
1041 return self
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1042
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1043 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
1044 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
1045 attributes = {}
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
1046 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
1047
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
1048 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
1049 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
1050 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
1051 if escape:
13968
6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings
Bernhard Urban <bernhard.urban@jku.at>
parents: 13952
diff changeset
1052 entities = {'"': "&quot;", "'": "&apos;", '\n': '&#10;'}
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
1053 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
1054 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
1055 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
1056 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
1057
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1058 def get_os():
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1059 """
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1060 Get a canonical form of sys.platform.
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1061 """
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1062 if sys.platform.startswith('darwin'):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1063 return 'darwin'
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1064 elif sys.platform.startswith('linux'):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1065 return 'linux'
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1066 elif sys.platform.startswith('sunos'):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1067 return 'solaris'
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1068 elif sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1069 return 'windows'
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1070 else:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1071 abort('Unknown operating system ' + sys.platform)
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
1072
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1073 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
1074 """
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1075 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
1076 """
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1077 for s in _suites.itervalues():
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1078 if s.mxDir == mxDir:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1079 return s
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1080 # create the new suite
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1081 s = Suite(mxDir, primary)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1082 return s
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1083
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
1084 def suites(opt_limit_to_suite=False):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1085 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1086 Get the list of all loaded suites.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1087 """
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
1088 return _suites.values()
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1089
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
1090 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
1091 """
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
1092 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
1093 """
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
1094 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
1095 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
1096 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
1097 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
1098
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
1099
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
1100 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
1101 """
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents: 11701
diff changeset
1102 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
1103 """
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 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
1105 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
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 [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
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_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
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 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
1112 """
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
1113
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
1114 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
1115 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
1116 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
1117 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
1118
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents: 11701
diff changeset
1119 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
1120 """
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents: 11701
diff changeset
1121 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
1122 """
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
1123 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
1124
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents: 11701
diff changeset
1125 def _projects_opt_limit_to_suites(projects):
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
1126 return projects
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1127
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
1128 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
1129 """
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 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
1131 """
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
1132 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
1133 if _annotationProcessors is None:
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1134 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
1135 for p in projects():
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1136 for ap in p.annotation_processors():
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1137 if project(ap, False):
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1138 aps.add(ap)
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1139 _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
1140 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
1141
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1142 def distribution(name, fatalIfMissing=True):
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1143 """
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1144 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
1145 not exist and 'fatalIfMissing' is true.
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1146 """
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1147 d = _dists.get(name)
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1148 if d is None and fatalIfMissing:
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1149 abort('distribution named ' + name + ' not found')
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1150 return d
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
1151
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1152 def dependency(name, fatalIfMissing=True):
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1153 """
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1154 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
1155 not exist for 'name' and 'fatalIfMissing' is true.
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1156 """
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1157 d = _projects.get(name)
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1158 if d is None:
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1159 d = _libs.get(name)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
1160 if d is None:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
1161 d = _jreLibs.get(name)
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1162 if d is None and fatalIfMissing:
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1163 if name in _opts.ignored_projects:
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1164 abort('project named ' + name + ' is ignored')
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1165 abort('project or library named ' + name + ' not found')
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1166 return d
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1167
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1168 def project(name, fatalIfMissing=True):
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 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
1171 not exist and 'fatalIfMissing' is true.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1172 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1173 p = _projects.get(name)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1174 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
1175 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
1176 abort('project named ' + name + ' is ignored')
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1177 abort('project named ' + name + ' not found')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1178 return p
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1179
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1180 def library(name, fatalIfMissing=True):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1181 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1182 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
1183 not exist and 'fatalIfMissing' is true.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1184 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1185 l = _libs.get(name)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1186 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
1187 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
1188 abort(name + ' is a project, not a library')
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1189 abort('library named ' + name + ' not found')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1190 return l
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1191
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1192 def _as_classpath(deps, resolve):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1193 cp = []
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1194 if _opts.cp_prefix is not None:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1195 cp = [_opts.cp_prefix]
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1196 for d in deps:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1197 d.append_to_classpath(cp, resolve)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1198 if _opts.cp_suffix is not None:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1199 cp += [_opts.cp_suffix]
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1200 return os.pathsep.join(cp)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1201
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1202 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
1203 """
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1204 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
1205 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
1206 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1207 if names is None:
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1208 result = _as_classpath(sorted_deps(includeLibs=True), resolve)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1209 else:
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1210 deps = []
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1211 if isinstance(names, types.StringTypes):
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1212 names = [names]
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1213 for n in names:
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
1214 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
1215 result = _as_classpath(deps, resolve)
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1216 if includeBootClasspath:
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1217 result = os.pathsep.join([java().bootclasspath(), result])
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1218 return result
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1219
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1220 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
1221 """
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1222 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
1223 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
1224 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
1225 to the classpath entry.
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1226 """
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1227 cp = classpath(names, resolve, includeSelf, includeBootClasspath)
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1228 for entry in cp.split(os.pathsep):
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1229 if not exists(entry):
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1230 continue
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1231 if isdir(entry):
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1232 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
1233 for d in dirs:
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1234 entryPath = join(root[len(entry) + 1:], d)
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1235 yield entry, entryPath
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1236 for f in files:
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1237 entryPath = join(root[len(entry) + 1:], f)
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1238 yield entry, entryPath
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1239 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
1240 with zipfile.ZipFile(entry, 'r') as zf:
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1241 for zi in zf.infolist():
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1242 entryPath = zi.filename
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1243 yield zf, entryPath
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1244
15785
7a6f6a7ef886 Add JRE library support to mx projectgraph.
Josef Eisl <josef.eisl@jku.at>
parents: 15781
diff changeset
1245 def sorted_deps(projectNames=None, includeLibs=False, includeJreLibs=False, includeAnnotationProcessors=False):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1246 """
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1247 Gets projects and libraries sorted such that dependencies
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1248 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
1249 true, libraries are omitted from the result.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1250 """
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
1251 projects = projects_from_names(projectNames)
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
1252
15785
7a6f6a7ef886 Add JRE library support to mx projectgraph.
Josef Eisl <josef.eisl@jku.at>
parents: 15781
diff changeset
1253 return sorted_project_deps(projects, includeLibs=includeLibs, includeJreLibs=includeJreLibs, includeAnnotationProcessors=includeAnnotationProcessors)
7a6f6a7ef886 Add JRE library support to mx projectgraph.
Josef Eisl <josef.eisl@jku.at>
parents: 15781
diff changeset
1254
7a6f6a7ef886 Add JRE library support to mx projectgraph.
Josef Eisl <josef.eisl@jku.at>
parents: 15781
diff changeset
1255 def sorted_project_deps(projects, includeLibs=False, includeJreLibs=False, includeAnnotationProcessors=False):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1256 deps = []
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1257 for p in projects:
15785
7a6f6a7ef886 Add JRE library support to mx projectgraph.
Josef Eisl <josef.eisl@jku.at>
parents: 15781
diff changeset
1258 p.all_deps(deps, includeLibs=includeLibs, includeJreLibs=includeJreLibs, includeAnnotationProcessors=includeAnnotationProcessors)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1259 return deps
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1260
11301
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1261 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
1262 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
1263 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
1264
11301
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1265 candidateJdks = []
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1266 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
1267 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
1268 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
1269 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
1270 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
1271 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
1272 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
1273 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
1274 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
1275 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
1276 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
1277 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
1278
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1279 javaHome = None
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1280 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
1281 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
1282 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
1283 javaHome = None
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1284
11301
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1285 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
1286 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
1287 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
1288 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
1289 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
1290 javaHome = None
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1291 else:
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1292 break
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1293
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
1294 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
1295 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
1296 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
1297 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
1298
11301
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1299 return javaHome
8bcae501c51b added dialogue for determining JAVA_HOME if it's not set
Doug Simon <doug.simon@oracle.com>
parents: 11295
diff changeset
1300
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1301 class ArgParser(ArgumentParser):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1302 # 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
1303 def format_help(self):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1304 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
1305
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1306
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1307 def __init__(self):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1308 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
1309 # 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
1310 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
1311
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1312 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
1313 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
1314 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
1315 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
1316 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
1317 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
1318 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
1319 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
1320 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
1321 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
1322 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
1323 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
1324 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
1325 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
1326 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
1327 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
1328 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
1329 # 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
1330 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
1331 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
1332
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1333 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
1334 if args is None:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1335 args = sys.argv[1:]
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1336
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1337 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
1338
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1339 opts = self.parse_args()
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1340
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
1341 # 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
1342 opts.__dict__.setdefault('timeout', 0)
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
1343 opts.__dict__.setdefault('ptimeout', 0)
4149
cf4de9cc1268 Integrated latest mxtool updates.
Doug Simon <doug.simon@oracle.com>
parents: 4148
diff changeset
1344
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
1345 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
1346 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
1347
4149
cf4de9cc1268 Integrated latest mxtool updates.
Doug Simon <doug.simon@oracle.com>
parents: 4148
diff changeset
1348 if opts.java_home is None:
cf4de9cc1268 Integrated latest mxtool updates.
Doug Simon <doug.simon@oracle.com>
parents: 4148
diff changeset
1349 opts.java_home = os.environ.get('JAVA_HOME')
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1350 if opts.extra_java_homes is None:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1351 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
1352
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1353 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
1354 opts.java_home = _handle_missing_java_home()
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1355
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1356 if opts.user_home is None or opts.user_home == '':
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1357 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
1358
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1359 os.environ['JAVA_HOME'] = opts.java_home
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1360 os.environ['HOME'] = opts.user_home
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1361
5821
0cd337450409 added support to mx for ignoring (broken) projects
Doug Simon <doug.simon@oracle.com>
parents: 5782
diff changeset
1362 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
1363
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1364 commandAndArgs = opts.__dict__.pop('commandAndArgs')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1365 return opts, commandAndArgs
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1366
11605
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
1367 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
1368 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
1369
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1370 def _format_commands():
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1371 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
1372 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
1373 c, _ = _commands[cmd][:2]
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1374 doc = c.__doc__
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1375 if doc is None:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1376 doc = ''
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1377 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
1378 return msg + '\n'
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1379
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1380 def java(requiredCompliance=None):
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1381 """
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1382 Get a JavaConfig object containing Java commands launch details.
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1383 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
1384 is returned. Otherwise, the JavaConfig exactly matching requiredCompliance is returned
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1385 or None if there is no exact match.
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1386 """
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1387 assert _java_homes
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1388 if not requiredCompliance:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1389 return _java_homes[0]
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1390 for java in _java_homes:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1391 if java.javaCompliance == requiredCompliance:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1392 return java
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1393 return None
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1394
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1395
14913
2d1cc640512c Add possibility to build using error-prone instead of javac.
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14907
diff changeset
1396 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
1397 if not javaConfig:
2d1cc640512c Add possibility to build using error-prone instead of javac.
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14907
diff changeset
1398 javaConfig = java()
2d1cc640512c Add possibility to build using error-prone instead of javac.
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14907
diff changeset
1399 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
1400
14153
e328f28f7401 fix for mx, did not compile on Windows
Christian Wirth <christian.wirth@oracle.com>
parents: 14136
diff changeset
1401 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
1402 if not sig:
5454f6bf50bf fix for mx, did not compile on Windows
Christian Wirth <christian.wirth@oracle.com>
parents: 14136
diff changeset
1403 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
1404 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
1405 try:
14134
e71d421370f3 mx: proxy SIGQUIT to child process
Bernhard Urban <bernhard.urban@jku.at>
parents: 14133
diff changeset
1406 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
1407 return True
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
1408 except:
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
1409 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
1410 return False
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
1411
4158
f3a50640333b Added support for specifying a timeout when running an external command.
Doug Simon <doug.simon@oracle.com>
parents: 4150
diff changeset
1412 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
1413 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
1414 while True:
f3a50640333b Added support for specifying a timeout when running an external command.
Doug Simon <doug.simon@oracle.com>
parents: 4150
diff changeset
1415 try:
f3a50640333b Added support for specifying a timeout when running an external command.
Doug Simon <doug.simon@oracle.com>
parents: 4150
diff changeset
1416 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
1417 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
1418 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
1419 continue
f3a50640333b Added support for specifying a timeout when running an external command.
Doug Simon <doug.simon@oracle.com>
parents: 4150
diff changeset
1420 raise
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1421
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
1422 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
1423 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
1424 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
1425 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
1426 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
1427 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
1428 # 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
1429 raise RuntimeError("Unknown child exit status!")
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1430
4158
f3a50640333b Added support for specifying a timeout when running an external command.
Doug Simon <doug.simon@oracle.com>
parents: 4150
diff changeset
1431 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
1432 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
1433 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
1434 (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
1435 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
1436 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
1437 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
1438 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
1439 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
1440 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
1441 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
1442
4242
3e25132be4b4 Disabled eager resolution of libraries as they are defined.
Doug Simon <doug.simon@oracle.com>
parents: 4241
diff changeset
1443 # 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
1444 # 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
1445 # 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
1446 _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
1447
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 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
1449 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
1450 _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
1451 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
1452
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
1453 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
1454 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
1455 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
1456 _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
1457 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
1458 pass
4241
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
1459
4660
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1460 def waitOn(p):
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1461 if get_os() == 'windows':
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1462 # 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
1463 retcode = None
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1464 while retcode == None:
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1465 retcode = p.poll()
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1466 time.sleep(0.05)
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1467 else:
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1468 retcode = p.wait()
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1469 return retcode
b06ade6e927c Fixed Ctrl+C for Windows in mx.py
Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
parents: 4482
diff changeset
1470
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
1471 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
1472 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1473 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
1474 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
1475 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
1476 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
1477 out and err if they are callable objects.
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1478 """
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1479
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1480 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
1481 for arg in args:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1482 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
1483
9262
0f4ae7bbe062 fixed bug in handling of -V mx option
Doug Simon <doug.simon@oracle.com>
parents: 9193
diff changeset
1484 if env is None:
0f4ae7bbe062 fixed bug in handling of -V mx option
Doug Simon <doug.simon@oracle.com>
parents: 9193
diff changeset
1485 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
1486
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1487 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
1488 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
1489 log('Environment variables:')
9262
0f4ae7bbe062 fixed bug in handling of -V mx option
Doug Simon <doug.simon@oracle.com>
parents: 9193
diff changeset
1490 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
1491 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
1492 log(' '.join(map(pipes.quote, args)))
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1493
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
1494 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
1495 timeout = _opts.ptimeout
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
1496
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
1497 sub = None
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1498 try:
4241
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
1499 # 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
1500 # 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
1501 preexec_fn = None
67e88b7624d5 Removed need for GRAAL environment variable on Windows.
Doug Simon <doug.simon@oracle.com>
parents: 4248
diff changeset
1502 creationflags = 0
67e88b7624d5 Removed need for GRAAL environment variable on Windows.
Doug Simon <doug.simon@oracle.com>
parents: 4248
diff changeset
1503 if get_os() == 'windows':
67e88b7624d5 Removed need for GRAAL environment variable on Windows.
Doug Simon <doug.simon@oracle.com>
parents: 4248
diff changeset
1504 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
1505 else:
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1506 preexec_fn = os.setsid
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1507
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
1508 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
1509 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
1510 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
1511 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
1512 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
1513 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
1514 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
1515 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
1516 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
1517 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
1518 # 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
1519 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
1520 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
1521 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
1522 # 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
1523 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
1524 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
1525 retcode = waitOn(p)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1526 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
1527 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
1528 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
1529 retcode = _waitWithTimeout(p, args, timeout)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1530 except OSError as e:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1531 log('Error executing \'' + ' '.join(args) + '\': ' + str(e))
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1532 if _opts.verbose:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1533 raise e
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1534 abort(e.errno)
4242
3e25132be4b4 Disabled eager resolution of libraries as they are defined.
Doug Simon <doug.simon@oracle.com>
parents: 4241
diff changeset
1535 except KeyboardInterrupt:
3e25132be4b4 Disabled eager resolution of libraries as they are defined.
Doug Simon <doug.simon@oracle.com>
parents: 4241
diff changeset
1536 abort(1)
4241
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
1537 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
1538 _removeSubprocess(sub)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1539
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1540 if retcode and nonZeroIsFatal:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1541 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
1542 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
1543 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
1544 else:
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1545 log('[exit code: ' + str(retcode) + ']')
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1546 abort(retcode)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1547
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1548 return retcode
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1549
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1550 def exe_suffix(name):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1551 """
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1552 Gets the platform specific suffix for an executable
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1553 """
4258
8d2c14f722ac mx.py: fix OS detection in exe_suffix()
Andreas Woess <andreas.woess@jku.at>
parents: 4257
diff changeset
1554 if get_os() == 'windows':
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1555 return name + '.exe'
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1556 return name
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1557
11401
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1558 def add_lib_prefix(name):
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1559 """
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1560 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
1561 """
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1562 os = get_os()
11401
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1563 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
1564 return 'lib' + name
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1565 return name
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1566
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1567 def add_lib_suffix(name):
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1568 """
2d228d304247 minor improvements/cleanups to mx (CR-1313)
Doug Simon <doug.simon@oracle.com>
parents: 11374
diff changeset
1569 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
1570 """
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1571 os = get_os()
4482
7903b6c28f9c Add hsdis command to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 4396
diff changeset
1572 if os == 'windows':
7903b6c28f9c Add hsdis command to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 4396
diff changeset
1573 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
1574 if os == 'linux' or os == 'solaris':
4482
7903b6c28f9c Add hsdis command to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 4396
diff changeset
1575 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
1576 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
1577 return name + '.dylib'
4482
7903b6c28f9c Add hsdis command to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 4396
diff changeset
1578 return name
7903b6c28f9c Add hsdis command to mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 4396
diff changeset
1579
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1580 """
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
1581 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
1582 """
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
1583 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
1584 """
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 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
1586 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
1587 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
1588 """
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 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
1590 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
1591 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
1592 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
1593 self.currentFilteredLineCount = 0
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14156
diff changeset
1594 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
1595
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 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
1597 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
1598 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
1599 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
1600 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
1601 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
1602 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
1603 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
1604
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 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
1606 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
1607 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
1608 self.currentFilteredLineCount += 1
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14156
diff changeset
1609 if self.currentFilteredTime:
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14156
diff changeset
1610 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
1611 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
1612 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
1613 else:
7c36ec150036 Make the DuplicateSuppressingStream periodically print while it is filtering output
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14156
diff changeset
1614 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
1615 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
1616 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
1617 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
1618 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
1619 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
1620
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
1621 """
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1622 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
1623 """
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1624 class JavaCompliance:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1625 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
1626 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
1627 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
1628 self.value = int(m.group(1))
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1629
13968
6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings
Bernhard Urban <bernhard.urban@jku.at>
parents: 13952
diff changeset
1630 def __str__(self):
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1631 return '1.' + str(self.value)
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1632
13968
6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings
Bernhard Urban <bernhard.urban@jku.at>
parents: 13952
diff changeset
1633 def __cmp__(self, other):
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1634 if isinstance(other, types.StringType):
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1635 other = JavaCompliance(other)
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1636
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1637 return cmp(self.value, other.value)
13779
fc5e2c808a23 fixed pylint warnings
Doug Simon <doug.simon@oracle.com>
parents: 13775
diff changeset
1638
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
1639 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
1640 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
1641
7916
9bff64f43299 Better java version numbers support in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7787
diff changeset
1642 """
13471
020099961eb4 renamed JavaVersion to VersionSpec
Doug Simon <doug.simon@oracle.com>
parents: 13470
diff changeset
1643 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
1644 """
13471
020099961eb4 renamed JavaVersion to VersionSpec
Doug Simon <doug.simon@oracle.com>
parents: 13470
diff changeset
1645 class VersionSpec:
7916
9bff64f43299 Better java version numbers support in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7787
diff changeset
1646 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
1647 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
1648 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
1649 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
1650 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
1651 self.versionString = versionString
8391
d1d486c03e8a Fix version parsing in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 8302
diff changeset
1652 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
1653
7916
9bff64f43299 Better java version numbers support in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7787
diff changeset
1654 def __str__(self):
9bff64f43299 Better java version numbers support in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7787
diff changeset
1655 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
1656
7916
9bff64f43299 Better java version numbers support in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7787
diff changeset
1657 def __cmp__(self, other):
9bff64f43299 Better java version numbers support in mx
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 7787
diff changeset
1658 return cmp(self.parts, other.parts)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1659
14940
82971f397b94 mx.JavaConfig: filter non-existant paths from bootclasspath, extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14939
diff changeset
1660 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
1661 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
1662
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1663 """
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1664 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
1665 """
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1666 class JavaConfig:
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1667 def __init__(self, java_home, java_dbg_port):
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1668 self.jdk = java_home
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1669 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
1670 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
1671 self.java = exe_suffix(join(self.jdk, 'bin', 'java'))
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1672 self.javac = exe_suffix(join(self.jdk, 'bin', 'javac'))
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1673 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
1674 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
1675 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
1676 self._bootclasspath = None
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
1677 self._extdirs = None
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
1678 self._endorseddirs = None
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1679
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
1680 if not exists(self.java):
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1681 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
1682
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1683 def delAtAndSplit(s):
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1684 return shlex.split(s.lstrip('@'))
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1685
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
1686 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
1687 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
1688 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
1689
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1690 # 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
1691 try:
4148
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7.
Doug Simon <doug.simon@oracle.com>
parents: 4147
diff changeset
1692 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
1693 self.java_args = ['-d64'] + self.java_args
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1694 except subprocess.CalledProcessError as e:
4145
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1695 try:
4148
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7.
Doug Simon <doug.simon@oracle.com>
parents: 4147
diff changeset
1696 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
1697 except subprocess.CalledProcessError as e:
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1698 print e.output
9aee7df31417 Removed 'tests' command.
Doug Simon <doug.simon@oracle.com>
parents: 4144
diff changeset
1699 abort(e.returncode)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1700
4148
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7.
Doug Simon <doug.simon@oracle.com>
parents: 4147
diff changeset
1701 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
1702 assert output[1] == 'version'
13471
020099961eb4 renamed JavaVersion to VersionSpec
Doug Simon <doug.simon@oracle.com>
parents: 13470
diff changeset
1703 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
1704 self.javaCompliance = JavaCompliance(self.version.versionString)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1705
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1706 if self.debug_port is not None:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1707 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
1708
14914
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1709 def _init_classpaths(self):
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1710 myDir = dirname(__file__)
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1711 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
1712 if not exists(outDir):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1713 os.makedirs(outDir)
14914
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1714 javaSource = join(myDir, 'ClasspathDump.java')
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1715 if not exists(join(outDir, 'ClasspathDump.class')):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1716 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
1717 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
1718 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
1719 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
1720 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
1721 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
1722 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
1723
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1724 def __hash__(self):
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1725 return hash(self.jdk)
14764
5823c399e28f pylint fixes
Bernhard Urban <bernhard.urban@jku.at>
parents: 14763
diff changeset
1726
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1727 def __cmp__(self, other):
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1728 if isinstance(other, JavaConfig):
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1729 return cmp(self.javaCompliance, other.javaCompliance)
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1730 raise TypeError()
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
1731
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
1732 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
1733 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
1734 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
1735 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
1736 return [self.java] + args
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1737
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
1738 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
1739 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
1740
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1741 def bootclasspath(self):
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1742 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
1743 self._init_classpaths()
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1744 return self._bootclasspath
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
1745
14914
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1746 def extdirs(self):
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1747 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
1748 self._init_classpaths()
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1749 return self._extdirs
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1750
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1751 def endorseddirs(self):
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1752 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
1753 self._init_classpaths()
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1754 return self._endorseddirs
a6bd486b1b44 Extend JavaConfig bootclasspath detection to detect extdirs and endorseddirs
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14913
diff changeset
1755
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1756 def check_get_env(key):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1757 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1758 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
1759 """
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 value = get_env(key)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1761 if value is None:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1762 abort('Required environment variable ' + key + ' must be set')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1763 return value
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1764
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
1765 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
1766 """
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
1767 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
1768 """
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
1769 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
1770 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
1771
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
1772 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
1773 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
1774 log(msg)
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1775
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1776 def log(msg=None):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1777 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1778 Write a message to the console.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1779 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
1780 to redirect it.
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1781 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1782 if msg is None:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1783 print
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1784 else:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1785 print msg
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1786
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1787 def expand_project_in_class_path_arg(cpArg):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1788 cp = []
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1789 for part in cpArg.split(os.pathsep):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1790 if part.startswith('@'):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1791 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
1792 else:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1793 cp.append(part)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1794 return os.pathsep.join(cp)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1795
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1796 def expand_project_in_args(args):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1797 for i in range(len(args)):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1798 if args[i] == '-cp' or args[i] == '-classpath':
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1799 if i + 1 < len(args):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1800 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
1801 return
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1802
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1803
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1804 def gmake_cmd():
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1805 for a in ['make', 'gmake', 'gnumake']:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1806 try:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1807 output = subprocess.check_output([a, '--version'])
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1808 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
1809 return a
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1810 except:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1811 pass
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1812 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
1813
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1814 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
1815 result = expandvars(value)
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
1816 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
1817 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
1818 return result
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1819
14135
ee66410c0679 mx: add option to send sigquit before killing child
Bernhard Urban <bernhard.urban@jku.at>
parents: 14134
diff changeset
1820 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
1821 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
1822
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 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
1824 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
1825 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
1826 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
1827 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
1828
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
1829 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
1830 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
1831 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
1832 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
1833 _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
1834 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
1835
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1836 def abort(codeOrMessage):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1837 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1838 Aborts the program with a SystemExit exception.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1839 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
1840 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
1841 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
1842 """
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1843
14135
ee66410c0679 mx: add option to send sigquit before killing child
Bernhard Urban <bernhard.urban@jku.at>
parents: 14134
diff changeset
1844 if _opts.killwithsigquit:
ee66410c0679 mx: add option to send sigquit before killing child
Bernhard Urban <bernhard.urban@jku.at>
parents: 14134
diff changeset
1845 _send_sigquit()
ee66410c0679 mx: add option to send sigquit before killing child
Bernhard Urban <bernhard.urban@jku.at>
parents: 14134
diff changeset
1846
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
1847 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
1848 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
1849 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
1850 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
1851 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
1852 _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
1853 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
1854 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
1855
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
1856 if _opts and _opts.verbose:
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
1857 import traceback
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
1858 traceback.print_stack()
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1859 raise SystemExit(codeOrMessage)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1860
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1861 def download(path, urls, verbose=False):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1862 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1863 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
1864 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
1865 is written to the file indicated by 'path'.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1866 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1867 d = dirname(path)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1868 if d != '' and not exists(d):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1869 os.makedirs(d)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1870
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1871
6350
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1872 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
1873 # 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
1874 myDir = dirname(__file__)
6350
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1875 javaSource = join(myDir, 'URLConnectionDownload.java')
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1876 javaClass = join(myDir, 'URLConnectionDownload.class')
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1877 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
1878 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
1879 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
1880 return
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1881
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1882 def url_open(url):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1883 userAgent = 'Mozilla/5.0 (compatible)'
13968
6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings
Bernhard Urban <bernhard.urban@jku.at>
parents: 13952
diff changeset
1884 headers = {'User-Agent' : userAgent}
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1885 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
1886 return urllib2.urlopen(req)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1887
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1888 for url in urls:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1889 try:
13968
6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings
Bernhard Urban <bernhard.urban@jku.at>
parents: 13952
diff changeset
1890 if verbose:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1891 log('Downloading ' + url + ' to ' + path)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1892 if url.startswith('zip:') or url.startswith('jar:'):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1893 i = url.find('!/')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1894 if i == -1:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1895 abort('Zip or jar URL does not contain "!/": ' + url)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1896 url, _, entry = url[len('zip:'):].partition('!/')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1897 with contextlib.closing(url_open(url)) as f:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1898 data = f.read()
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1899 zipdata = StringIO.StringIO(f.read())
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1900
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1901 zf = zipfile.ZipFile(zipdata, 'r')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1902 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
1903 with open(path, 'wb') as f:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1904 f.write(data)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1905 else:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1906 with contextlib.closing(url_open(url)) as f:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1907 data = f.read()
6350
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1908 if path.endswith(os.sep):
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1909 # 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
1910 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
1911 if len(hrefs) != 0:
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1912 for href in hrefs:
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1913 if not '/' in href:
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1914 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
1915 else:
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1916 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
1917 else:
f45d5cb03c3b added support for downloading dependencies that are directories
Doug Simon <doug.simon@oracle.com>
parents: 6335
diff changeset
1918 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
1919 f.write(data)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1920 return
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1921 except IOError as e:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1922 log('Error reading from ' + url + ': ' + str(e))
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1923 except zipfile.BadZipfile as e:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1924 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
1925
4188
148fa38782e8 Downloads are attempted via Java first since it shows a progress counter.
Doug Simon <doug.simon@oracle.com>
parents: 4186
diff changeset
1926 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
1927 '\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
1928
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1929 def update_file(path, content):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1930 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1931 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
1932 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
1933 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1934 existed = exists(path)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1935 try:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1936 old = None
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1937 if existed:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1938 with open(path, 'rb') as f:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1939 old = f.read()
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1940
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1941 if old == content:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1942 return False
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1943
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1944 with open(path, 'wb') as f:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1945 f.write(content)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1946
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1947 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
1948 return True
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
1949 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
1950 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
1951
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
1952 # Builtin commands
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
1953
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1954 def _defaultEcjPath():
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1955 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
1956
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1957 class JavaCompileTask:
15496
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
1958 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
1959 self.proj = proj
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1960 self.reason = reason
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1961 self.javafilelist = javafilelist
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1962 self.deps = deps
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1963 self.jdk = jdk
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1964 self.outputDir = outputDir
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1965 self.done = False
15496
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
1966 self.jdtJar = jdtJar
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1967 self.args = args
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1968
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1969 def __str__(self):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1970 return self.proj.name
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1971
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1972 def logCompilation(self, compiler):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1973 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
1974
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1975 def execute(self):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1976 argfileName = join(self.proj.dir, 'javafilelist.txt')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1977 argfile = open(argfileName, 'wb')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1978 argfile.write('\n'.join(self.javafilelist))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1979 argfile.close()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1980
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1981 processorArgs = []
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1982
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1983 aps = self.proj.annotation_processors()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1984 if len(aps) > 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1985 processorPath = classpath(aps, resolve=True)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1986 genDir = self.proj.source_gen_dir()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1987 if exists(genDir):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1988 shutil.rmtree(genDir)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1989 os.mkdir(genDir)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1990 processorArgs += ['-processorpath', join(processorPath), '-s', genDir]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1991 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1992 processorArgs += ['-proc:none']
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1993
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1994 args = self.args
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1995 jdk = self.jdk
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1996 outputDir = self.outputDir
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1997 compliance = str(jdk.javaCompliance)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1998 cp = classpath(self.proj.name, includeSelf=True)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
1999 toBeDeleted = [argfileName]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2000
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2001 try:
15496
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2002 if not self.jdtJar:
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2003 mainJava = java()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2004 if not args.error_prone:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2005 self.logCompilation('javac')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2006 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
2007 if jdk.debug_port is not None:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2008 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
2009 javacCmd += processorArgs
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2010 javacCmd += ['@' + argfile.name]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2011
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2012 if not args.warnAPI:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2013 javacCmd.append('-XDignore.symbol.file')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2014 run(javacCmd)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2015 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2016 self.logCompilation('javac (with error-prone)')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2017 javaArgs = ['-Xmx1g']
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2018 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
2019 javacArgs += processorArgs
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2020 javacArgs += ['@' + argfile.name]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2021 if not args.warnAPI:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2022 javacArgs.append('-XDignore.symbol.file')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2023 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
2024 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2025 self.logCompilation('JDT')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2026
15496
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2027 jdtVmArgs = ['-Xmx1g', '-jar', self.jdtJar]
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2028
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2029 jdtArgs = ['-' + compliance,
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2030 '-cp', cp, '-g', '-enableJavadoc',
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2031 '-d', outputDir,
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2032 '-bootclasspath', jdk.bootclasspath(),
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2033 '-endorseddirs', jdk.endorseddirs(),
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2034 '-extdirs', jdk.extdirs()]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2035 jdtArgs += processorArgs
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2036
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2037 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
2038 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
2039 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
2040 # 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
2041 eclipseinit([], buildProcessorJars=False)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2042 if not exists(jdtProperties):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2043 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
2044 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2045 with open(jdtProperties) as fp:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2046 origContent = fp.read()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2047 content = origContent
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2048 if args.jdt_warning_as_error:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2049 content = content.replace('=warning', '=error')
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2050 if not args.jdt_show_task_tags:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2051 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
2052 if origContent != content:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2053 jdtPropertiesTmp = jdtProperties + '.tmp'
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2054 with open(jdtPropertiesTmp, 'w') as fp:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2055 fp.write(content)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2056 toBeDeleted.append(jdtPropertiesTmp)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2057 jdtArgs += ['-properties', jdtPropertiesTmp]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2058 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2059 jdtArgs += ['-properties', jdtProperties]
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2060 jdtArgs.append('@' + argfile.name)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2061
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2062 run_java(jdtVmArgs + jdtArgs)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2063 finally:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2064 for n in toBeDeleted:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2065 os.remove(n)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2066 self.done = True
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2067
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2068 def build(args, parser=None):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2069 """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
2070
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2071 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
2072 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
2073
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
2074 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
2075 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
2076 parser = ArgumentParser(prog='mx build')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2077
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
2078 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
2079 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
2080 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
2081 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
2082 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
2083 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
2084 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
2085 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
2086 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
2087 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
2088 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
2089 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
2090 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
2091 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
2092 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
2093 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
2094
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
2095 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
2096 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
2097
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2098 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
2099
15496
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2100 jdtJar = None
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2101 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
2102 if not args.jdt.endswith('.jar'):
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2103 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
2104 jdtJar = args.jdt
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2105 if not exists(jdtJar):
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2106 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
2107 # 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
2108 jdtJar = None
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2109 else:
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2110 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
2111
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
2112 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
2113 # 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
2114 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
2115 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
2116 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
2117 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
2118 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
2119 projectNames = None
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
2120
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
2121 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
2122 # 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
2123 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
2124
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2125 if args.java:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2126 ideinit([], refreshOnly=True, buildProcessorJars=False)
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2127
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
2128 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
2129 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
2130 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
2131 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
2132 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
2133 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
2134 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
2135 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
2136 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
2137 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
2138 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
2139 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
2140 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
2141 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
2142 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
2143
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2144 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
2145 for p in sortedProjects:
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2146 if p.native:
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2147 if args.native:
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2148 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
2149
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2150 if args.clean:
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2151 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
2152
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2153 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
2154 continue
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2155 else:
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2156 if not args.java:
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2157 continue
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2158 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
2159 continue
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2160
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2161 # 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
2162 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
2163 jdk = java(requiredCompliance)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
2164 assert jdk
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2165
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
2166 outputDir = prepareOutputDirs(p, args.clean)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2167
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2168 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
2169 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
2170 taskDeps = []
15386
1439685d06e4 mx: log reason why Java classes are being (re)built
Doug Simon <doug.simon@oracle.com>
parents: 15378
diff changeset
2171 if not buildReason:
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2172 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
2173 taskDep = tasks.get(dep.name)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2174 if taskDep:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2175 if not buildReason:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2176 buildReason = dep.name + ' rebuilt'
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2177 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
2178
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2179 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
2180 javafilelist = []
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2181 for sourceDir in sourceDirs:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2182 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
2183 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
2184 javafilelist += javafiles
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2185
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2186 # 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
2187 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
2188 for src in nonjavafilelist:
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2189 if src.endswith('.jasm'):
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2190 className = None
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2191 with open(src) as f:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2192 for line in f:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2193 if line.startswith('.class '):
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2194 className = line.split()[-1]
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2195 break
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2196
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2197 if className is not None:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2198 jasminOutputDir = p.jasmin_output_dir()
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2199 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
2200 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
2201 if jasminAvailable is None:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2202 try:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2203 with open(os.devnull) as devnull:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2204 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
2205 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
2206 except OSError:
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2207 jasminAvailable = False
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2208
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2209 if jasminAvailable:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2210 log('Assembling Jasmin file ' + src)
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2211 run(['jasmin', '-d', jasminOutputDir, src])
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2212 else:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2213 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
2214 with file(classFile, 'a'):
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2215 os.utime(classFile, None)
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2216
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2217 else:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2218 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
2219 else:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2220 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
2221 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
2222 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
2223 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
2224 shutil.copyfile(src, dst)
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2225
15386
1439685d06e4 mx: log reason why Java classes are being (re)built
Doug Simon <doug.simon@oracle.com>
parents: 15378
diff changeset
2226 if not buildReason:
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2227 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
2228 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
2229 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
2230 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
2231 break
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2232
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
2233 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
2234 if apsOutOfDate:
15386
1439685d06e4 mx: log reason why Java classes are being (re)built
Doug Simon <doug.simon@oracle.com>
parents: 15378
diff changeset
2235 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
2236
1439685d06e4 mx: log reason why Java classes are being (re)built
Doug Simon <doug.simon@oracle.com>
parents: 15378
diff changeset
2237 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
2238 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
2239 continue
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2240
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
2241 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
2242 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
2243 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
2244
15496
f5eba273a4f2 mx: factored out detection of JDT compilation
Doug Simon <doug.simon@oracle.com>
parents: 15490
diff changeset
2245 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
2246
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2247 if args.parallelize:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2248 # 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
2249 jdk.bootclasspath()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2250 task.proc = None
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2251 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
2252 else:
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2253 task.execute()
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 if args.parallelize:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2256
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2257 def joinTasks(tasks):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2258 failed = []
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2259 for t in tasks:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2260 t.proc.join()
15786
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
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 failed.append(t)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2264 return failed
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 checkTasks(tasks):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2267 active = []
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2268 for t in tasks:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2269 if t.proc.is_alive():
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2270 active.append(t)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2271 else:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2272 if t.proc.exitcode != 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2273 return ([], joinTasks(tasks))
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2274 return (active, [])
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2275
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2276 def remainingDepsDepth(task):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2277 if task._d is None:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2278 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
2279 if len(incompleteDeps) == 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2280 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
2281 else:
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2282 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
2283 return task._d
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2284
15490
5d0dd6a6f6b3 mx: improved heuristics for sorting remaining tasks in parallel Java build worklist
Doug Simon <doug.simon@oracle.com>
parents: 15489
diff changeset
2285 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
2286 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
2287 if d == 0:
15497
1f28c463e452 mx: slight tweak of parallel Java build heuristics
Doug Simon <doug.simon@oracle.com>
parents: 15496
diff changeset
2288 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
2289 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
2290 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
2291 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
2292
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2293 def sortWorklist(tasks):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2294 for t in tasks:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2295 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
2296 return sorted(tasks, compareTasks)
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2297
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2298 import multiprocessing
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2299 cpus = multiprocessing.cpu_count()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2300 worklist = sortWorklist(tasks.values())
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2301 active = []
15786
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2302 failed = []
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2303 while len(worklist) != 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2304 while True:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2305 active, failed = checkTasks(active)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2306 if len(failed) != 0:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2307 assert not active, active
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2308 break
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2309 if len(active) == cpus:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2310 # Sleep for 1 second
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2311 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
2312 else:
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2313 break
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2314
15786
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2315 if len(failed) != 0:
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2316 break
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2317
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2318 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
2319 # 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
2320 del _currentSubprocesses[:]
15460
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2321 task.execute()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2322
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2323 def depsDone(task):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2324 for d in task.deps:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2325 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
2326 return False
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2327 return True
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2328
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2329 for task in worklist:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2330 if depsDone(task):
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2331 worklist.remove(task)
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2332 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
2333 task.proc.start()
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2334 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
2335 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
2336 if len(active) == cpus:
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2337 break
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2338
7d24ff89dc7d mx: parallelized Java builds (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15457
diff changeset
2339 worklist = sortWorklist(worklist)
15786
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2340
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2341 failed += joinTasks(active)
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2342 if len(failed):
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2343 for t in failed:
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2344 log('Compiling {} failed'.format(t.proj.name))
d54cca247d0b mx: propagate failure from forked Java compilation task back up to parent (GRAAL-350)
Doug Simon <doug.simon@oracle.com>
parents: 15785
diff changeset
2345 abort('{} Java compilation tasks failed'.format(len(failed)))
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2346
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2347 for dist in _dists.values():
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2348 archive(['@' + dist.name])
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2349
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
2350 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
2351 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
2352 return None
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2353
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
2354 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
2355 """
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 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
2357 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
2358 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
2359 """
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 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
2361 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
2362 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
2363 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
2364 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
2365 # 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
2366 # 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
2367 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
2368 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
2369 # 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
2370 # 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
2371 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
2372 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
2373 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
2374 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
2375 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
2376 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
2377 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
2378 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
2379 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
2380 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
2381 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
2382 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
2383 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
2384 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
2385 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
2386
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
2387 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
2388 """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
2389
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
2390 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
2391
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
2392 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
2393 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
2394 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
2395 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
2396
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
2397 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
2398 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
2399 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
2400 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
2401 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
2402
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
2403 # 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
2404 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
2405 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
2406 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
2407
6fb61ad67962 Fix mx eclipseformat always adds the 'eclipse' suffix
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14539
diff changeset
2408 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
2409 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
2410 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
2411 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
2412
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
2413 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
2414
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2415 # build list of projects to be processed
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2416 projects = sorted_deps()
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2417 if args.projects is not None:
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2418 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
2419
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2420 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
2421 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
2422 self.path = join(settingsDir, 'org.eclipse.jdt.core.prefs')
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
2423 self.javaCompliance = javaCompliance
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2424 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
2425 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
2426 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
2427 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
2428 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
2429 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
2430
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2431 def settings(self):
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2432 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
2433 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
2434
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2435 class FileInfo:
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2436 def __init__(self, path):
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2437 self.path = path
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2438 with open(path) as fp:
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2439 self.content = fp.read()
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2440 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
2441
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
2442 def update(self, removeTrailingWhitespace):
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2443 with open(self.path) as fp:
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2444 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
2445
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
2446 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
2447 # 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
2448 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
2449 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
2450 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
2451 # 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
2452 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
2453 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
2454
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2455 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
2456 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
2457 self.content = content
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2458 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
2459
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
2460 # reset access and modification time of file
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2461 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
2462
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2463 modified = list()
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2464 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
2465 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
2466 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
2467 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
2468 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
2469
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
2470 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
2471
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2472 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
2473 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
2474 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
2475 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
2476
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
2477 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
2478 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
2479 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
2480 batch.javafiles.append(FileInfo(f))
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2481 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
2482 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
2483 continue
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2484
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2485 res = batches.setdefault(batch.settings(), batch)
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2486 if res is not batch:
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2487 res.javafiles = res.javafiles + batch.javafiles
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2488
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
2489 log("we have: " + str(len(batches)) + " batches")
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2490 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
2491 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
2492 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
2493 '-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
2494 '-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
2495 '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
2496 '-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
2497 '-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
2498 + [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
2499 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
2500 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
2501 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
2502
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
2503 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
2504
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
2505 if len(modified) != 0:
13288
9c3c915b5f56 Log modiffied files during eclipseformat
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 13266
diff changeset
2506 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
2507 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
2508 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
2509 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
2510 for fi in modified:
9c3c915b5f56 Log modiffied files during eclipseformat
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 13266
diff changeset
2511 name = os.path.relpath(fi.path, arcbase)
9c3c915b5f56 Log modiffied files during eclipseformat
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 13266
diff changeset
2512 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
2513 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
2514 log(''.join(fi.diff))
13288
9c3c915b5f56 Log modiffied files during eclipseformat
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 13266
diff changeset
2515 if args.backup:
9c3c915b5f56 Log modiffied files during eclipseformat
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 13266
diff changeset
2516 arcname = name.replace(os.sep, '/')
7528
4584ca2618d5 made eclipseformat command use batching
Doug Simon <doug.simon@oracle.com>
parents: 7524
diff changeset
2517 zf.writestr(arcname, fi.content)
13288
9c3c915b5f56 Log modiffied files during eclipseformat
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 13266
diff changeset
2518 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
2519 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
2520 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
2521 return 1
7533
29b0768b7ba6 added eclipseformat to the gate
Doug Simon <doug.simon@oracle.com>
parents: 7532
diff changeset
2522 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
2523
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
2524 def processorjars():
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2525 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
2526 _processorjars_suite(s)
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2527
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2528 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
2529 projs = set()
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2530 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
2531 for p in candidates:
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2532 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
2533 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
2534
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2535 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
2536 return []
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2537
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
2538 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
2539 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
2540 return archive(pnames)
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2541
11777
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2542 def pylint(args):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2543 """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
2544
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2545 parser = ArgumentParser(prog='mx pylint')
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2546 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
2547 args = parser.parse_args(args)
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 rcfile = join(dirname(__file__), '.pylintrc')
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2550 if not exists(rcfile):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2551 log('pylint configuration file does not exist: ' + rcfile)
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2552 return
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2553
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2554 try:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2555 output = subprocess.check_output(['pylint', '--version'], stderr=subprocess.STDOUT)
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2556 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
2557 if not m:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2558 log('could not determine pylint version from ' + output)
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2559 return
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2560 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
2561 if major < 1:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2562 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
2563 return
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2564 except BaseException:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2565 log('pylint is not available')
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2566 return
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2567
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2568 def findfiles_by_walk():
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2569 result = []
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2570 for suite in suites(True):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2571 for root, dirs, files in os.walk(suite.dir):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2572 for f in files:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2573 if f.endswith('.py'):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2574 pyfile = join(root, f)
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2575 result.append(pyfile)
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2576 if 'bin' in dirs:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2577 dirs.remove('bin')
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2578 if 'lib' in dirs:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2579 # avoids downloaded .py files
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2580 dirs.remove('lib')
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2581 return result
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2582
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2583 def findfiles_by_hg():
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2584 result = []
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2585 for suite in suites(True):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2586 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
2587 for f in versioned:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2588 if f.endswith('.py') and exists(f):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2589 result.append(f)
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2590 return result
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2591
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2592 # 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
2593 if args.walk:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2594 pyfiles = findfiles_by_walk()
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2595 else:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2596 pyfiles = findfiles_by_hg()
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2597
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2598 env = os.environ.copy()
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2599
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2600 pythonpath = dirname(__file__)
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2601 for suite in suites(True):
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2602 pythonpath = os.pathsep.join([pythonpath, suite.mxDir])
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2603
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2604 env['PYTHONPATH'] = pythonpath
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2605
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2606 for pyfile in pyfiles:
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
2607 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
2608 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
2609
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2610 """
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2611 Utility for creating and updating a zip file atomically.
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2612 """
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2613 class Archiver:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2614 def __init__(self, path):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2615 self.path = path
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2616
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2617 def __enter__(self):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2618 if self.path:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2619 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
2620 self.tmpFd = fd
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2621 self.tmpPath = tmp
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2622 self.zf = zipfile.ZipFile(tmp, 'w')
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2623 else:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2624 self.tmpFd = None
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2625 self.tmpPath = None
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2626 self.zf = None
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2627 return self
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2628
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2629 def __exit__(self, exc_type, exc_value, traceback):
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2630 if self.zf:
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2631 self.zf.close()
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2632 os.close(self.tmpFd)
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2633 # 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
2634 os.chmod(self.tmpPath, 0o666 & ~currentUmask)
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2635 # Atomic on Unix
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2636 shutil.move(self.tmpPath, self.path)
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2637
15818
718034423138 mxtool: fix archive subcommand such that it will return a successful returncode
Bernhard Urban <bernhard.urban@jku.at>
parents: 15786
diff changeset
2638 def _archive(args):
718034423138 mxtool: fix archive subcommand such that it will return a successful returncode
Bernhard Urban <bernhard.urban@jku.at>
parents: 15786
diff changeset
2639 archive(args)
718034423138 mxtool: fix archive subcommand such that it will return a successful returncode
Bernhard Urban <bernhard.urban@jku.at>
parents: 15786
diff changeset
2640 return 0
718034423138 mxtool: fix archive subcommand such that it will return a successful returncode
Bernhard Urban <bernhard.urban@jku.at>
parents: 15786
diff changeset
2641
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2642 def archive(args):
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2643 """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
2644 parser = ArgumentParser(prog='mx archive')
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2645 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
2646 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
2647
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
2648 archives = []
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2649 for name in args.names:
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2650 if name.startswith('@'):
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2651 dname = name[1:]
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2652 d = distribution(dname)
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2653 d.make_archive()
14964
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
2654 archives.append(d.path)
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2655 else:
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
2656 p = project(name)
15226
f1c66b738dae mx: refactored archive command
Doug Simon <doug.simon@oracle.com>
parents: 15149
diff changeset
2657 archives.append(p.make_archive())
14964
e1ce6c66f56e refactored archive command to use "with" statement
Doug Simon <doug.simon@oracle.com>
parents: 14940
diff changeset
2658
15818
718034423138 mxtool: fix archive subcommand such that it will return a successful returncode
Bernhard Urban <bernhard.urban@jku.at>
parents: 15786
diff changeset
2659 logv("generated archives: " + str(archives))
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
2660 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
2661
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2662 def canonicalizeprojects(args):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2663 """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
2664
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2665 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
2666
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2667 changedFiles = 0
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
2668 for s in suites(True):
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2669 projectsFile = join(s.mxDir, 'projects')
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2670 if not exists(projectsFile):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2671 continue
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2672 with open(projectsFile) as f:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2673 out = StringIO.StringIO()
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2674 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
2675 lineNo = 1
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2676 for line in f:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2677 line = line.strip()
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2678 m = pattern.match(line)
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2679 if m is None:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2680 out.write(line + '\n')
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2681 else:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2682 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
2683
6533
250babea75d5 modified canonicalizeprojects to ensure all package prefixes match the enclosing project
Doug Simon <doug.simon@oracle.com>
parents: 6527
diff changeset
2684 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
2685 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
2686 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
2687
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
2688 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
2689 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
2690 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
2691 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
2692 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
2693 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
2694 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
2695 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
2696 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
2697 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
2698 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
2699 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
2700 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
2701 # 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
2702 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
2703 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
2704 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
2705 # 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
2706 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
2707 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
2708 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
2709
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
2710 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
2711 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
2712
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2713 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
2714 lineNo = lineNo + 1
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2715 content = out.getvalue()
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2716 if update_file(projectsFile, content):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2717 changedFiles += 1
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2718 return changedFiles
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2719
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2720 class TimeStampFile:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2721 def __init__(self, path):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2722 self.path = path
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2723 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
2724
12524
2583afcd26ee fixed bug in creation of CreateGRAALDist.launch files
Doug Simon <doug.simon@oracle.com>
parents: 12522
diff changeset
2725 def isOlderThan(self, arg):
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2726 if not self.timestamp:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2727 return True
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2728 if isinstance(arg, TimeStampFile):
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2729 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
2730 return False
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2731 else:
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2732 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
2733 elif isinstance(arg, types.ListType):
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2734 files = arg
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2735 else:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2736 files = [arg]
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2737 for f in files:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2738 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
2739 return True
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2740 return False
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2741
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2742 def exists(self):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2743 return exists(self.path)
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2744
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2745 def touch(self):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2746 if exists(self.path):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2747 os.utime(self.path, None)
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2748 else:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2749 if not isdir(dirname(self.path)):
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2750 os.makedirs(dirname(self.path))
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2751 file(self.path, 'a')
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2752
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2753 def checkstyle(args):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2754 """run Checkstyle on the Java sources
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2755
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2756 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
2757 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
2758
10059
4dada3ec9c58 mx checkstyle command no longer exits on first error
Doug Simon <doug.simon@oracle.com>
parents: 10058
diff changeset
2759 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
2760
4dada3ec9c58 mx checkstyle command no longer exits on first error
Doug Simon <doug.simon@oracle.com>
parents: 10058
diff changeset
2761 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
2762 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
2763
10059
4dada3ec9c58 mx checkstyle command no longer exits on first error
Doug Simon <doug.simon@oracle.com>
parents: 10058
diff changeset
2764 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
2765 for p in projects_opt_limit_to_suites():
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2766 if p.native:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2767 continue
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2768 sourceDirs = p.source_dirs()
14918
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
2769
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
2770 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
2771 if not exists(csConfig):
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
2772 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
2773
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
2774 # 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
2775 jdk = java(p.javaCompliance)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
2776 assert jdk
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2777
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2778 for sourceDir in sourceDirs:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2779 javafilelist = []
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2780 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
2781 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
2782 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
2783 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
2784 continue
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2785
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2786 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
2787 mustCheck = False
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2788 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
2789 mustCheck = timestamp.isOlderThan(javafilelist)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2790 else:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2791 mustCheck = True
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2792
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2793 if not mustCheck:
10059
4dada3ec9c58 mx checkstyle command no longer exits on first error
Doug Simon <doug.simon@oracle.com>
parents: 10058
diff changeset
2794 if _opts.verbose:
4dada3ec9c58 mx checkstyle command no longer exits on first error
Doug Simon <doug.simon@oracle.com>
parents: 10058
diff changeset
2795 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
2796 continue
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2797
14918
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
2798 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
2799 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
2800 configLocation = localCheckConfig.getAttribute('location')
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2801 configType = localCheckConfig.getAttribute('type')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2802 if configType == 'project':
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2803 # Eclipse plugin "Project Relative Configuration" format:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2804 #
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2805 # '/<project_name>/<suffix>'
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2806 #
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2807 if configLocation.startswith('/'):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2808 name, _, suffix = configLocation.lstrip('/').partition('/')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2809 config = join(project(name).dir, suffix)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2810 else:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2811 config = join(p.dir, configLocation)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2812 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
2813 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
2814 continue
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2815
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2816 exclude = join(p.dir, '.checkstyle.exclude')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2817
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2818 if exists(exclude):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2819 with open(exclude) as f:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2820 # Convert patterns to OS separators
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2821 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
2822 def match(name):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2823 for p in patterns:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2824 if p in name:
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2825 if _opts.verbose:
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2826 log('excluding: ' + name)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2827 return True
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2828 return False
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2829
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2830 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
2831
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2832 auditfileName = join(p.dir, 'checkstyleOutput.txt')
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2833 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
2834
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2835 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
2836 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
2837 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
2838 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
2839 finally:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2840 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
2841 errors = []
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2842 source = [None]
9826
cff647969dfa fixed detection of Checkstyle errors in checkstyle command (GRAAL-293)
Doug Simon <doug.simon@oracle.com>
parents: 9262
diff changeset
2843 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
2844 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
2845 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
2846 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
2847 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
2848
11605
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
2849 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
2850 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
2851 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
2852 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
2853 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
2854 map(log, errors)
10059
4dada3ec9c58 mx checkstyle command no longer exits on first error
Doug Simon <doug.simon@oracle.com>
parents: 10058
diff changeset
2855 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
2856 else:
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
2857 timestamp.touch()
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2858 finally:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2859 if exists(auditfileName):
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2860 os.unlink(auditfileName)
10059
4dada3ec9c58 mx checkstyle command no longer exits on first error
Doug Simon <doug.simon@oracle.com>
parents: 10058
diff changeset
2861 return totalErrors
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2862
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2863 def clean(args, parser=None):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2864 """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
2865
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2866 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
2867 generated images.
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2868 """
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
2869
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
2870 suppliedParser = parser is not None
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2871
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
2872 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
2873 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
2874 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
2875
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2876 args = parser.parse_args(args)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2877
15579
c3869fe3d917 mx clean: make it more reliable on windows
Bernhard Urban <bernhard.urban@jku.at>
parents: 15577
diff changeset
2878 def _rmtree(dirPath):
c3869fe3d917 mx clean: make it more reliable on windows
Bernhard Urban <bernhard.urban@jku.at>
parents: 15577
diff changeset
2879 path = dirPath
c3869fe3d917 mx clean: make it more reliable on windows
Bernhard Urban <bernhard.urban@jku.at>
parents: 15577
diff changeset
2880 if get_os() == 'windows':
c3869fe3d917 mx clean: make it more reliable on windows
Bernhard Urban <bernhard.urban@jku.at>
parents: 15577
diff changeset
2881 path = unicode("\\\\?\\" + dirPath)
c3869fe3d917 mx clean: make it more reliable on windows
Bernhard Urban <bernhard.urban@jku.at>
parents: 15577
diff changeset
2882 shutil.rmtree(path)
c3869fe3d917 mx clean: make it more reliable on windows
Bernhard Urban <bernhard.urban@jku.at>
parents: 15577
diff changeset
2883
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
2884 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
2885 if p.native:
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2886 if args.native:
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2887 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
2888 else:
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2889 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
2890 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
2891 if genDir != '' and exists(genDir):
6b540bb82312 Fixed clean should clean also generated source directories.
Christian Humer <christian.humer@gmail.com>
parents: 7681
diff changeset
2892 log('Clearing {0}...'.format(genDir))
6b540bb82312 Fixed clean should clean also generated source directories.
Christian Humer <christian.humer@gmail.com>
parents: 7681
diff changeset
2893 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
2894 _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
2895
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2896
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2897 outputDir = p.output_dir()
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2898 if outputDir != '' and exists(outputDir):
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
2899 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
2900 _rmtree(outputDir)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2901
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
2902 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
2903 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
2904 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
2905 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
2906
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
2907 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
2908 return args
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2909
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2910 def about(args):
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2911 """show the 'man page' for mx"""
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2912 print __doc__
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2913
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2914 def help_(args):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2915 """show help for a given command
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2916
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2917 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
2918
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2919 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
2920 if len(args) == 0:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2921 _argParser.print_help()
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2922 return
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
2923
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2924 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
2925 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
2926 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
2927 if len(hits) == 1:
e952911afd2f made mx help command accept abbreviations
Doug Simon <doug.simon@oracle.com>
parents: 5876
diff changeset
2928 name = hits[0]
e952911afd2f made mx help command accept abbreviations
Doug Simon <doug.simon@oracle.com>
parents: 5876
diff changeset
2929 elif len(hits) == 0:
e952911afd2f made mx help command accept abbreviations
Doug Simon <doug.simon@oracle.com>
parents: 5876
diff changeset
2930 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
2931 else:
e952911afd2f made mx help command accept abbreviations
Doug Simon <doug.simon@oracle.com>
parents: 5876
diff changeset
2932 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
2933
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
2934 value = _commands[name]
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2935 (func, usage) = value[:2]
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2936 doc = func.__doc__
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2937 if len(value) > 2:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2938 docArgs = value[2:]
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2939 fmtArgs = []
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2940 for d in docArgs:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2941 if isinstance(d, Callable):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
2942 fmtArgs += [d()]
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2943 else:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2944 fmtArgs += [str(d)]
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2945 doc = doc.format(*fmtArgs)
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
2946 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
2947
4301
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
2948 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
2949 """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
2950
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 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
2952 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
2953 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
2954
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 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
2956
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 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
2958 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
2959 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
2960 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
2961 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
2962 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
2963 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
2964 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
2965 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
2966 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
2967 igv.open('nodes')
15785
7a6f6a7ef886 Add JRE library support to mx projectgraph.
Josef Eisl <josef.eisl@jku.at>
parents: 15781
diff changeset
2968 for p in sorted_deps(includeLibs=True, includeJreLibs=True):
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
2969 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
2970 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
2971 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
2972 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
2973 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
2974 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
2975 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
2976 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
2977 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
2978 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
2979 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
2980 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
2981 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
2982 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
2983 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
2984 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
2985 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
2986 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
2987 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
2988 igv.close('graphDocument')
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2989
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
2990 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
2991 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
2992 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
2993 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
2994 else:
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2995 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
2996 return
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
2997
4301
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
2998 print 'digraph projects {'
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
2999 print 'rankdir=BT;'
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
3000 print 'node [shape=rect];'
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
3001 for p in projects():
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
3002 for dep in p.canonical_deps():
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
3003 print '"' + p.name + '"->"' + dep + '"'
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
3004 print '}'
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
3005
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3006 def _source_locator_memento(deps):
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3007 slm = XMLDoc()
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3008 slm.open('sourceLookupDirector')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3009 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
3010
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
3011 javaCompliance = None
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3012 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
3013 if dep.isLibrary():
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3014 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
3015 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
3016 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
3017 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
3018 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
3019 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
3020 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
3021 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
3022 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
3023 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
3024 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
3025
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
3026 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
3027 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
3028 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
3029 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
3030 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
3031 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
3032
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3033 slm.close('sourceContainers')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3034 slm.close('sourceLookupDirector')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3035 return slm
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3036
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 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
3038 """
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3039 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
3040 """
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3041 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
3042 deps = []
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3043 slm = _source_locator_memento(deps)
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3044 launch = XMLDoc()
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3045 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
3046 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
3047 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
3048 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
3049 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
3050 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
3051 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
3052 launch.close('mapAttribute')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3053 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
3054 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
3055 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
3056 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
3057
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3058 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
3059 if len(suites()) == 1:
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
3060 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
3061 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
3062 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
3063 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
3064 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
3065 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
3066 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
3067 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
3068 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
3069
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3070 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
3071 """
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3072 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
3073 """
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3074 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
3075 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
3076 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
3077 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
3078 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
3079 cp = None
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3080 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
3081 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
3082 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
3083 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
3084 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
3085 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
3086 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
3087 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
3088 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
3089 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
3090 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
3091 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
3092 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
3093 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
3094 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
3095 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
3096 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
3097 break
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
3098
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
3099 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
3100 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
3101 return False
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
3102
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
3103 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
3104 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
3105 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
3106 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
3107 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
3108 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
3109 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
3110 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
3111
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
3112 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
3113 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
3114 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
3115 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
3116 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
3117
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3118 slm = _source_locator_memento(deps)
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
3119
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3120 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
3121 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
3122 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
3123 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
3124 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
3125 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
3126 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
3127 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
3128 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
3129 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
3130 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
3131
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
3132 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
3133 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
3134 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
3135 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
3136
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 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
3138 """(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
3139 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
3140 _eclipseinit_suite(args, s, buildProcessorJars, refreshOnly)
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
3141
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
3142 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
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 def _check_ide_timestamp(suite, configZip, ide):
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
3145 """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
3146 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
3147 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
3148 return False
12630
aadb188e4258 mxtool: regenerate IDE files when suite imports file changes
Mick Jordan <mick.jordan@oracle.com>
parents: 12620
diff changeset
3149 # 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
3150 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
3151 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
3152
13682
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects
Doug Simon <doug.simon@oracle.com>
parents: 13620
diff changeset
3153 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
3154 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
3155 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
3156 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
3157 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
3158 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
3159 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
3160 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
3161
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents: 11701
diff changeset
3162 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
3163 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
3164 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
3165 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
3166 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
3167
13682
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects
Doug Simon <doug.simon@oracle.com>
parents: 13620
diff changeset
3168 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
3169 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
3170 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
3171
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
3172 files = []
13475
4a3628c79ff9 separated external libs out from zipped up IDE configs
Doug Simon <doug.simon@oracle.com>
parents: 13473
diff changeset
3173 libFiles = []
7293
4974776828ec Avoid recursive calls of build
Christian Wimmer <christian.wimmer@oracle.com>
parents: 7291
diff changeset
3174 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
3175 files += _processorjars_suite(suite)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3176
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3177 projToDist = dict()
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3178 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
3179 distDeps = dist.sorted_deps()
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3180 for p in distDeps:
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3181 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
3182
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
3183 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
3184 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
3185 continue
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
3186
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3187 assert java(p.javaCompliance)
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3188
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3189 if not exists(p.dir):
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3190 os.makedirs(p.dir)
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3191
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3192 out = XMLDoc()
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3193 out.open('classpath')
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
3194
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3195 for src in p.srcDirs:
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3196 srcDir = join(p.dir, src)
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3197 if not exists(srcDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3198 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
3199 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
3200
9854
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
3201 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
3202 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
3203 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
3204 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
3205 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
3206 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
3207
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
3208 # 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
3209 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
3210
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3211 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
3212 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
3213
15149
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3214 containerDeps = set()
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3215 libraryDeps = set()
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3216 projectDeps = set()
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3217
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3218 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
3219 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
3220 continue
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3221 if dep.isLibrary():
15149
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3222 if hasattr(dep, 'eclipse.container'):
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3223 container = getattr(dep, 'eclipse.container')
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3224 containerDeps.add(container)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3225 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
3226 else:
15149
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3227 libraryDeps.add(dep)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3228 elif dep.isProject():
15149
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3229 projectDeps.add(dep)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3230
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3231 for dep in containerDeps:
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3232 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
3233
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3234 for dep in libraryDeps:
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3235 path = dep.path
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3236 dep.get_path(resolve=True)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3237
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3238 # 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
3239 # 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
3240 # safest to simply use absolute paths.
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3241 path = _make_absolute(path, p.suite.dir)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3242
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3243 attributes = {'exported' : 'true', 'kind' : 'lib', 'path' : path}
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3244
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3245 sourcePath = dep.get_source_path(resolve=True)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3246 if sourcePath is not None:
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3247 attributes['sourcepath'] = sourcePath
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3248 out.element('classpathentry', attributes)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3249 libFiles.append(path)
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3250
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3251 for dep in projectDeps:
2c7b18ae25d2 Add support for library dependencies
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15148
diff changeset
3252 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
3253
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3254 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
3255 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
3256 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
3257 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
3258 files.append(classpathFile)
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3259
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3260 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
3261 if exists(csConfig):
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3262 out = XMLDoc()
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3263
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3264 dotCheckstyle = join(p.dir, ".checkstyle")
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3265 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
3266 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
3267 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
3268 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
3269 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
3270 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
3271 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
3272 out.close('fileset')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3273 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
3274 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
3275 out.close('filter')
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3276
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3277 exclude = join(p.dir, '.checkstyle.exclude')
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3278 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
3279 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
3280 with open(exclude) as f:
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3281 for line in f:
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3282 if not line.startswith('#'):
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3283 line = line.strip()
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3284 exclDir = join(p.dir, line)
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3285 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
3286 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
3287 out.close('filter')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3288
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3289 out.close('fileset-config')
5219
ddccd4abdb09 configured test source directory for graal.graph project
Doug Simon <doug.simon@oracle.com>
parents: 5217
diff changeset
3290 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
3291 files.append(dotCheckstyle)
14918
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
3292 else:
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
3293 # clean up existing .checkstyle file
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
3294 dotCheckstyle = join(p.dir, ".checkstyle")
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
3295 if exists(dotCheckstyle):
31a9c79399c8 disabled current Checkstyle configurations (until Checkstyle supports Java8)
Doug Simon <doug.simon@oracle.com>
parents: 14917
diff changeset
3296 os.unlink(dotCheckstyle)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3297
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3298 out = XMLDoc()
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3299 out.open('projectDescription')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3300 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
3301 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
3302 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
3303 out.open('buildSpec')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3304 out.open('buildCommand')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3305 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
3306 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
3307 out.close('buildCommand')
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3308 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
3309 out.open('buildCommand')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3310 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
3311 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
3312 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
3313 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
3314 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
3315 out.open('buildCommand')
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
3316 out.element('name', data=buildCommand)
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
3317 out.element('arguments', data='')
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
3318 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
3319
12661
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3320 # 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
3321 # 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
3322 logicalWorkspaceRoot = os.path.dirname(p.dir)
12684
ec224fef3012 integrated auto-formatting changes
Doug Simon <doug.simon@oracle.com>
parents: 12662
diff changeset
3323 binFolder = os.path.relpath(p.output_dir(), logicalWorkspaceRoot)
ec224fef3012 integrated auto-formatting changes
Doug Simon <doug.simon@oracle.com>
parents: 12662
diff changeset
3324
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3325 if _isAnnotationProcessorDependency(p):
12684
ec224fef3012 integrated auto-formatting changes
Doug Simon <doug.simon@oracle.com>
parents: 12662
diff changeset
3326 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
3327 _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
3328
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3329 if projToDist.has_key(p.name):
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3330 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
3331 _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
3332
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3333 out.close('buildSpec')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3334 out.open('natures')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3335 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
3336 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
3337 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
3338 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
3339 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
3340 out.close('natures')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3341 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
3342 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
3343 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
3344 files.append(projectFile)
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3345
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3346 settingsDir = join(p.dir, ".settings")
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3347 if not exists(settingsDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3348 os.mkdir(settingsDir)
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3349
14745
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3350 # collect the defaults from mxtool
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3351 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
3352 esdict = {}
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3353 if exists(defaultEclipseSettingsDir):
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3354 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
3355 if isfile(join(defaultEclipseSettingsDir, name)):
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3356 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
3357
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3358 # 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
3359 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
3360 if exists(eclipseSettingsDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3361 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
3362 if isfile(join(eclipseSettingsDir, name)):
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3363 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
3364
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3365 # check for project overrides
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3366 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
3367 if exists(projectSettingsDir):
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3368 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
3369 if isfile(join(projectSettingsDir, name)):
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3370 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
3371
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3372 # 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
3373 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
3374 # 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
3375 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
3376 continue
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3377
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3378 with open(path) as f:
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3379 content = f.read()
65b005b58825 Allow project-specific overrides of Eclipse configuration files
Christian Wimmer <christian.wimmer@oracle.com>
parents: 14626
diff changeset
3380 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
3381 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
3382 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
3383 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
3384 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
3385
9854
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
3386 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
3387 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
3388 out.open('factorypath')
11701
e29743466d00 fixed regression in mx.py
Doug Simon <doug.simon@oracle.com>
parents: 11687
diff changeset
3389 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
3390 for ap in p.annotation_processors():
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
3391 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
3392 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
3393 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
3394 # 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
3395 # 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
3396 # safest to simply use absolute paths.
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3397 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
3398 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
3399 files.append(path)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3400 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
3401 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
3402 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
3403 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
3404 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
3405
13727
10e6f192631f added library sources (if available) to generated Eclipse attach launcher
Doug Simon <doug.simon@oracle.com>
parents: 13682
diff changeset
3406 _, 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
3407 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
3408
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
3409 _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
3410 _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
3411
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
3412 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
3413 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
3414 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
3415 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
3416 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
3417 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
3418 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
3419 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
3420 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
3421 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
3422 # 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
3423 shutil.move(tmp, zipPath)
14103
9d8aaa3200a3 make mx respect umask when making jar files
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 13982
diff changeset
3424 # 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
3425 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
3426 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
3427 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
3428 os.remove(tmp)
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
3429
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3430 def _isAnnotationProcessorDependency(p):
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3431 """
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3432 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
3433 """
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
3434 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
3435
12661
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3436 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
3437 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
3438 launchOut = XMLDoc()
8181
989e0582a30f enabled Eclipse builders to use console logging
Doug Simon <doug.simon@oracle.com>
parents: 8180
diff changeset
3439 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
3440 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
3441 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
3442 launchOut.open('mapAttribute', {'key' : 'org.eclipse.debug.core.environmentVariables'})
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3443 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
3444 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
3445 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
3446
7681
f81be78f15a5 Fixed eclipse configuration for annotation processors. Annotation processor jars
Christian Humer <christian.humer@gmail.com>
parents: 7533
diff changeset
3447 if refresh:
12661
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3448 if refreshFile is None:
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3449 refreshScope = '${project}'
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3450 else:
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3451 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
3452
ec224fef3012 integrated auto-formatting changes
Doug Simon <doug.simon@oracle.com>
parents: 12662
diff changeset
3453 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
3454 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
3455
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3456 if relevantResources is not None:
0497d6702cff mxtool: fixed eclipse builder glitches and rebuild loops.
Christian Humer <christian.humer@gmail.com>
parents: 12640
diff changeset
3457 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
3458 for relevantResource in relevantResources:
12684
ec224fef3012 integrated auto-formatting changes
Doug Simon <doug.simon@oracle.com>
parents: 12662
diff changeset
3459 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
3460 resources += '</resources>}'
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_BUILD_SCOPE', 'value': resources})
12684
ec224fef3012 integrated auto-formatting changes
Doug Simon <doug.simon@oracle.com>
parents: 12662
diff changeset
3462
ec224fef3012 integrated auto-formatting changes
Doug Simon <doug.simon@oracle.com>
parents: 12662
diff changeset
3463
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3464 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
3465 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
3466 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
3467 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
3468 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
3469 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
3470
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3471 # 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
3472 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
3473
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
3474 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
3475 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
3476 cmd = 'mx.cmd'
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3477 cmdPath = join(baseDir, cmd)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3478 if not os.path.exists(cmdPath):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3479 # 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
3480 cmdPath = join(dirname(baseDir), cmd)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3481 if not os.path.exists(cmdPath):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3482 abort('cannot locate ' + cmd)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3483
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
3484 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
3485 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
3486 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
3487 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
3488 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
3489
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3490
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
3491 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
3492
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
3493 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
3494 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
3495 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
3496
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3497 dotProjectDoc.open('buildCommand')
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3498 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
3499 dotProjectDoc.element('triggers', data='auto,full,incremental,')
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3500 dotProjectDoc.open('arguments')
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3501 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
3502 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
3503 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
3504 dotProjectDoc.close('dictionary')
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3505 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
3506 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
3507 dotProjectDoc.element('value', data='true')
8131
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3508 dotProjectDoc.close('dictionary')
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3509 dotProjectDoc.close('arguments')
83ec1df0a30f added support for distributions to mx
Doug Simon <doug.simon@oracle.com>
parents: 7925
diff changeset
3510 dotProjectDoc.close('buildCommand')
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3511
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
3512 def generate_eclipse_workingsets():
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3513 """
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
3514 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
3515 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
3516 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
3517 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
3518 """
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3519
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3520 # 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
3521 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
3522 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
3523 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
3524 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
3525 else:
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
3526 expected_wsroot = _primary_suite.dir
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
3527
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
3528 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
3529 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
3530 # 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
3531 wsroot = expected_wsroot
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
3532
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
3533 wsdir = join(wsroot, wsloc)
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3534 if not exists(wsdir):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3535 wsdir = wsroot
13480
6215ff792647 put warning about missing Eclipse metadata directory behind -v option
Doug Simon <doug.simon@oracle.com>
parents: 13475
diff changeset
3536 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
3537 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
3538
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3539 # 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
3540 workingSets = dict()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3541 for p in projects():
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3542 if p.workingSets is None:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3543 continue
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3544 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
3545 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
3546 workingSets[w] = [p.name]
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3547 else:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3548 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
3549
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3550 if exists(wspath):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3551 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
3552 else:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3553 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
3554
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3555 update_file(wspath, wsdoc.xml(newl='\n'))
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
3556
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
3557 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
3558 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
3559 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
3560 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
3561 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
3562 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
3563 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
3564 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
3565 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
3566
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3567 def _make_workingset_xml(workingSets):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3568 wsdoc = XMLDoc()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3569 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
3570
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3571 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
3572 _workingset_open(wsdoc, w)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3573 for p in workingSets[w]:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3574 _workingset_element(wsdoc, p)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3575 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
3576
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3577 wsdoc.close('workingSetManager')
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3578 return wsdoc
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3579
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3580 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
3581 target = XMLDoc()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3582 target.open('workingSetManager')
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3583
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3584 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
3585
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3586 class ParserState(object):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3587 def __init__(self):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3588 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
3589 self.current_ws = None
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3590 self.seen_ws = list()
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3591 self.seen_projects = list()
13824
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3592 self.aggregate_ws = False
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3593 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
3594
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3595 ps = ParserState()
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3596
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3597 # parsing logic
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3598 def _ws_start(name, attributes):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3599 if name == 'workingSet':
13824
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3600 if attributes.has_key('name'):
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3601 ps.current_ws_name = attributes['name']
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3602 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
3603 ps.aggregate_ws = True
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3604 ps.current_ws = None
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3605 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
3606 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
3607 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
3608 ps.seen_projects = list()
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3609 else:
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3610 ps.current_ws = None
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3611 target.open(name, attributes)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3612 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
3613
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3614 def _ws_end(name):
13824
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3615 closeAndResetHandler = False
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3616 if name == 'workingSet':
13824
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3617 if ps.aggregate_ws:
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3618 if ps.nested_ws:
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3619 ps.nested_ws = False
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3620 else:
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3621 ps.aggregate_ws = False
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3622 closeAndResetHandler = True
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3623 else:
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3624 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
3625 for p in ps.current_ws:
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3626 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
3627 _workingset_element(target, p)
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3628 closeAndResetHandler = True
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3629 if closeAndResetHandler:
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3630 target.close('workingSet')
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3631 parser.StartElementHandler = _ws_start
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3632 elif name == 'workingSetManager':
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3633 # 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
3634 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
3635 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
3636 _workingset_open(target, w)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3637 for p in workingSets[w]:
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3638 _workingset_element(target, p)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3639 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
3640
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3641 def _ws_item(name, attributes):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3642 if name == 'item':
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3643 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
3644 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
3645 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
3646 target.element(name, attributes)
14937
3de340bdb8d3 added support for adding sources to distribution
Doug Simon <doug.simon@oracle.com>
parents: 14918
diff changeset
3647 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
3648 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
3649 else:
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3650 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
3651 _workingset_element(target, p_name)
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3652 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
3653 elif name == 'workingSet':
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3654 ps.nested_ws = True
96d5cb754b68 address issue in Eclipse working set generation
Michael Haupt <michael.haupt@oracle.com>
parents: 13779
diff changeset
3655 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
3656
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3657 # process document
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3658 parser.StartElementHandler = _ws_start
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3659 parser.EndElementHandler = _ws_end
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3660 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
3661 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
3662
10061
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3663 target.close('workingSetManager')
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3664 return target
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3665
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3666 def _workingset_open(wsdoc, ws):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3667 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
3668
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3669 def _workingset_element(wsdoc, p):
b6dfe12478ff [GRAAL-308] pre-defined working sets for Eclipse
Michael Haupt <michael.haupt@oracle.com>
parents: 10060
diff changeset
3670 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
3671
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
3672 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
3673 """(re)generate NetBeans project configurations"""
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3674
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
3675 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
3676 _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
3677
78e6109ee411 mx refactoring for split-repo suites; should have no effect on existing repos
Mick Jordan <mick.jordan@oracle.com>
parents: 11701
diff changeset
3678 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
3679 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
3680 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
3681 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
3682 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
3683
13682
c4ff08d2aa0d fixed problem in netbeansinit that generated invalid annotation processor paths for projects
Doug Simon <doug.simon@oracle.com>
parents: 13620
diff changeset
3684 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
3685 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
3686 return
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
3687
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3688 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
3689 files = []
13475
4a3628c79ff9 separated external libs out from zipped up IDE configs
Doug Simon <doug.simon@oracle.com>
parents: 13473
diff changeset
3690 libFiles = []
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3691 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
3692 for p in suite.projects:
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3693 if p.native:
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3694 continue
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3695
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3696 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
3697 continue
767312416f6a added support to mx for specifying library sources
Doug Simon <doug.simon@oracle.com>
parents: 5824
diff changeset
3698
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3699 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
3700 os.makedirs(join(p.dir, 'nbproject'))
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3701
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3702 jdk = java(p.javaCompliance)
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3703 assert jdk
14764
5823c399e28f pylint fixes
Bernhard Urban <bernhard.urban@jku.at>
parents: 14763
diff changeset
3704
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3705 jdks.add(jdk)
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3706
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3707 out = XMLDoc()
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3708 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
3709 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
3710 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
3711 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
3712 out.open('exec', {'executable' : sys.executable})
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3713 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
3714 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
3715 out.element('arg', {'value' : 'archive'})
3c74a32bb262 generated NetBeans projects will also update graal.jar
Doug Simon <doug.simon@oracle.com>
parents: 8183
diff changeset
3716 out.element('arg', {'value' : '@GRAAL'})
3c74a32bb262 generated NetBeans projects will also update graal.jar
Doug Simon <doug.simon@oracle.com>
parents: 8183
diff changeset
3717 out.close('exec')
3c74a32bb262 generated NetBeans projects will also update graal.jar
Doug Simon <doug.simon@oracle.com>
parents: 8183
diff changeset
3718 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
3719 out.close('project')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3720 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
3721 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
3722
5217
70777e50f1e6 replace monkey patch with subclassing instead
Doug Simon <doug.simon@oracle.com>
parents: 5198
diff changeset
3723 out = XMLDoc()
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3724 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
3725 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
3726 out.open('configuration')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3727 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
3728 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
3729 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
3730 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
3731 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
3732 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
3733 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
3734 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
3735 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
3736 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
3737 out.close('data')
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
3738
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
3739 firstDep = True
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
3740 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
3741 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
3742 continue
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3743
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3744 if dep.isProject():
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
3745 n = dep.name.replace('.', '_')
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
3746 if firstDep:
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3747 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
3748 firstDep = False
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3749
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3750 out.open('reference')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3751 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
3752 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
3753 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
3754 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
3755 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
3756 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
3757 out.close('reference')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3758
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
3759 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
3760 out.close('references')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3761
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3762 out.close('configuration')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3763 out.close('project')
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3764 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
3765 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
3766
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3767 out = StringIO.StringIO()
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3768 jdkPlatform = 'JDK_' + str(jdk.version)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3769
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
3770 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
3771 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
3772 annotationProcessorSrcFolder = ""
9854
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
3773 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
3774 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
3775 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
3776
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3777 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
3778 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
3779 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
3780 annotation.processing.processors.list=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3781 annotation.processing.run.all.processors=true
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3782 application.title=""" + p.name + """
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3783 application.vendor=mx
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3784 build.classes.dir=${build.dir}
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3785 build.classes.excludes=**/*.java,**/*.form
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3786 # 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
3787 build.dir=bin
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3788 build.generated.dir=${build.dir}/generated
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3789 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
3790 # 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
3791 build.sysclasspath=ignore
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3792 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
3793 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
3794 # 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
3795 #debug.transport=dt_socket
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3796 debug.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3797 ${run.classpath}
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3798 debug.test.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3799 ${run.test.classpath}
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3800 # 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
3801 dist.dir=dist
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3802 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
3803 dist.javadoc.dir=${dist.dir}/javadoc
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3804 endorsed.classpath=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3805 excludes=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3806 includes=**
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3807 jar.compress=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3808 # 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
3809 javac.compilerargs=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3810 javac.deprecation=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3811 javac.source=1.7
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3812 javac.target=1.7
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3813 javac.test.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3814 ${javac.classpath}:\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3815 ${build.classes.dir}
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3816 javadoc.additionalparam=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3817 javadoc.author=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3818 javadoc.encoding=${source.encoding}
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3819 javadoc.noindex=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3820 javadoc.nonavbar=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3821 javadoc.notree=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3822 javadoc.private=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3823 javadoc.splitindex=true
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3824 javadoc.use=true
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3825 javadoc.version=false
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3826 javadoc.windowtitle=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3827 main.class=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3828 manifest.file=manifest.mf
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3829 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
3830 mkdist.disabled=false
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3831 platforms.""" + jdkPlatform + """.home=""" + jdk.jdk + """
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3832 platform.active=""" + jdkPlatform + """
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3833 run.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3834 ${javac.classpath}:\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3835 ${build.classes.dir}
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3836 # 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
3837 # (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
3838 # 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
3839 run.jvmargs=
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3840 run.test.classpath=\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3841 ${javac.test.classpath}:\\
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3842 ${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
3843 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
3844 """ + annotationProcessorSrcFolder + """
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3845 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
3846 print >> out, content
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3847
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3848 mainSrc = True
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3849 for src in p.srcDirs:
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3850 srcDir = join(p.dir, src)
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3851 if not exists(srcDir):
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3852 os.mkdir(srcDir)
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3853 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
3854 print >> out, ref + '=' + src
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3855 if mainSrc:
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3856 print >> out, 'src.dir=${' + ref + '}'
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3857 mainSrc = False
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3858 else:
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3859 print >> out, 'src.' + src + '.dir=${' + ref + '}'
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3860
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3861 javacClasspath = []
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3862
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
3863 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
3864 annotationProcessorOnlyDeps = []
9854
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
3865 if len(p.annotation_processors()) > 0:
394f38496856 made projects inherit annotation processors from dependencies
Doug Simon <doug.simon@oracle.com>
parents: 9847
diff changeset
3866 for ap in p.annotation_processors():
11374
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
3867 apDep = dependency(ap)
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
3868 if not apDep in deps:
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
3869 deps.append(apDep)
9cdf7a9d3475 Enable library as annotation processor
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11318
diff changeset
3870 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
3871
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3872 annotationProcessorReferences = []
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
3873
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
3874 for dep in deps:
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3875 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
3876 continue
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3877
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3878 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
3879 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
3880 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
3881 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
3882 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
3883 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
3884 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
3885 libFiles.append(path)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3886
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3887 elif dep.isProject():
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
3888 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
3889 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
3890 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
3891 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
3892 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
3893
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
3894 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
3895 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
3896 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
3897 annotationProcessorReferences.append('${' + ref + '}')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
3898
5198
887b45f6aa02 improved name of Eclipse launch file created for jar applications
Doug Simon <doug.simon@oracle.com>
parents: 5194
diff changeset
3899 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
3900 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
3901 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
3902
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3903 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
3904 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
3905 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
3906
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
3907 if updated:
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
3908 log('If using NetBeans:')
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3909 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
3910 for jdk in jdks:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
3911 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
3912 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
3913
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
3914 _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
3915 _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
3916
15060
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3917 def intellijinit(args, refreshOnly=False):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3918 """(re)generate Intellij project configurations"""
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 for suite in suites(True):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3921 _intellij_suite(args, suite, refreshOnly)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3922
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3923 def _intellij_suite(args, suite, refreshOnly=False):
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 libraries = set()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3926
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3927 ideaProjectDirectory = join(suite.dir, '.idea')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3928
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3929 if not exists(ideaProjectDirectory):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3930 os.mkdir(ideaProjectDirectory)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3931 nameFile = join(ideaProjectDirectory, '.name')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3932 update_file(nameFile, "Graal")
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3933 modulesXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3934 modulesXml.open('project', attributes={'version': '4'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3935 modulesXml.open('component', attributes={'name': 'ProjectModuleManager'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3936 modulesXml.open('modules')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3937
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3938
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3939 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
3940 path = join(p.dir, name)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3941 if exists(path):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3942 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
3943
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3944 annotationProcessorProfiles = {}
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3945
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3946 def _complianceToIntellijLanguageLevel(compliance):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3947 return 'JDK_1_' + str(compliance.value)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3948
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3949 # 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
3950 for p in suite.projects:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3951 if p.native:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3952 continue
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3953
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
3954 assert java(p.javaCompliance)
15060
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3955
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3956 if not exists(p.dir):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3957 os.makedirs(p.dir)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3958
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3959 annotationProcessorProfileKey = tuple(p.annotation_processors())
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3960
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3961 if not annotationProcessorProfileKey in annotationProcessorProfiles:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3962 annotationProcessorProfiles[annotationProcessorProfileKey] = [p]
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3963 else:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3964 annotationProcessorProfiles[annotationProcessorProfileKey].append(p)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3965
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3966 intellijLanguageLevel = _complianceToIntellijLanguageLevel(p.javaCompliance)
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 = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3969 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
3970
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3971 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
3972 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
3973 moduleXml.element('exclude-output')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3974
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3975 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
3976 for src in p.srcDirs:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3977 srcDir = join(p.dir, src)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3978 if not exists(srcDir):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3979 os.mkdir(srcDir)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3980 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
3981
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3982 if len(p.annotation_processors()) > 0:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3983 genDir = p.source_gen_dir()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3984 if not exists(genDir):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3985 os.mkdir(genDir)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3986 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
3987
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3988 for name in ['.externalToolBuilders', '.settings', 'nbproject']:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3989 _intellij_exclude_if_exists(moduleXml, p, name)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3990 moduleXml.close('content')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3991
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3992 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
3993 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
3994
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3995 deps = p.all_deps([], True, includeAnnotationProcessors=True)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3996 for dep in deps:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3997 if dep == p:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
3998 continue
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 dep.isLibrary():
15662
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
4001 libraries.add(dep)
50fbda571d99 mx: added jrelibrary dependency type
Doug Simon <doug.simon@oracle.com>
parents: 15638
diff changeset
4002 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
4003 elif dep.isProject():
15060
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4004 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
4005
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4006 moduleXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4007 moduleXml.close('module')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4008 moduleFile = join(p.dir, p.name + '.iml')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4009 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
4010
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4011 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
4012 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
4013
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4014 modulesXml.close('modules')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4015 modulesXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4016 modulesXml.close('project')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4017 moduleXmlFile = join(ideaProjectDirectory, 'modules.xml')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4018 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
4019
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4020 # TODO What about cross-suite dependencies?
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4021
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4022 librariesDirectory = join(ideaProjectDirectory, 'libraries')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4023
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4024 if not exists(librariesDirectory):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4025 os.mkdir(librariesDirectory)
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 # Setup the libraries that were used above
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4028 # 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
4029 for library in libraries:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4030 libraryXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4031
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4032 libraryXml.open('component', attributes={'name': 'libraryTable'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4033 libraryXml.open('library', attributes={'name': library.name})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4034 libraryXml.open('CLASSES')
15134
f0fc09c0845e Be sure to resolve and download librariesin mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15122
diff changeset
4035 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
4036 libraryXml.close('CLASSES')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4037 libraryXml.element('JAVADOC')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4038 if library.sourcePath:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4039 libraryXml.open('SOURCES')
15134
f0fc09c0845e Be sure to resolve and download librariesin mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15122
diff changeset
4040 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
4041 libraryXml.close('SOURCES')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4042 else:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4043 libraryXml.element('SOURCES')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4044 libraryXml.close('library')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4045 libraryXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4046
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4047 libraryFile = join(librariesDirectory, library.name + '.xml')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4048 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
4049
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4050
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4051
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4052 # 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
4053 compilerXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4054 compilerXml.open('project', attributes={'version': '4'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4055 compilerXml.open('component', attributes={'name': 'CompilerConfiguration'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4056
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4057 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
4058 compilerXml.element('resourceExtensions')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4059 compilerXml.open('wildcardResourcePatterns')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4060 compilerXml.element('entry', attributes={'name': '!?*.java'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4061 compilerXml.close('wildcardResourcePatterns')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4062
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4063 if annotationProcessorProfiles:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4064 compilerXml.open('annotationProcessing')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4065 for processors, modules in annotationProcessorProfiles.items():
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4066 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
4067 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
4068 compilerXml.element('outputRelativeToContentRoot', attributes={'value': 'true'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4069 compilerXml.open('processorPath', attributes={'useClasspath': 'false'})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4070 for apName in processors:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4071 pDep = dependency(apName)
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4072 for entry in pDep.all_deps([], True):
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4073 if entry.isLibrary():
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4074 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
4075 elif entry.isProject():
15060
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4076 assert entry.isProject()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4077 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
4078 compilerXml.close('processorPath')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4079 for module in modules:
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4080 compilerXml.element('module', attributes={'name': module.name})
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4081 compilerXml.close('profile')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4082 compilerXml.close('annotationProcessing')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4083
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4084 compilerXml.close('component')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4085 compilerXml.close('project')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4086 compilerFile = join(ideaProjectDirectory, 'compiler.xml')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4087 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
4088
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4089 # Wite misc.xml for global JDK config
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4090 miscXml = XMLDoc()
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4091 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
4092 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
4093 miscXml.close('project')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4094 miscFile = join(ideaProjectDirectory, 'misc.xml')
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4095 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
4096
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4097
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4098 # TODO look into copyright settings
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4099 # TODO should add vcs.xml support
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4100
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
4101 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
4102 """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
4103 def rm(path):
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations.
Doug Simon <doug.simon@oracle.com>
parents: 4270
diff changeset
4104 if exists(path):
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations.
Doug Simon <doug.simon@oracle.com>
parents: 4270
diff changeset
4105 os.remove(path)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4106
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
4107 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
4108 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
4109 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
4110 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
4111
4271
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations.
Doug Simon <doug.simon@oracle.com>
parents: 4270
diff changeset
4112 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
4113 if p.native:
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations.
Doug Simon <doug.simon@oracle.com>
parents: 4270
diff changeset
4114 continue
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4115
4271
311d193de5a2 Fixed regressions and Windows issues in generated IDE project configurations.
Doug Simon <doug.simon@oracle.com>
parents: 4270
diff changeset
4116 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
4117 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
4118 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
4119 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
4120 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
4121 rm(join(p.dir, '.project'))
10043
e063474076dd clean up .factorypath files on "mx ideclean"
Lukas Stadler <lukas.stadler@jku.at>
parents: 9857
diff changeset
4122 rm(join(p.dir, '.factorypath'))
15060
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4123 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
4124 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
4125 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
4126 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
4127 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
4128 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
4129 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
4130
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4131
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
4132 def ideinit(args, refreshOnly=False, buildProcessorJars=True):
15378
dea98caac669 Fix help text for ideinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 15376
diff changeset
4133 """(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
4134 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
4135 netbeansinit(args, refreshOnly=refreshOnly, buildProcessorJars=buildProcessorJars)
15060
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4136 intellijinit(args, refreshOnly=refreshOnly)
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
4137 if not refreshOnly:
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
4138 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
4139
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
4140 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
4141 """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
4142 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
4143 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
4144 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
4145 if dirpath == suite.dir:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4146 # no point in traversing .hg
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4147 if '.hg' in dirnames:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4148 dirnames.remove('.hg')
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4149 elif dirpath in projectDirs:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4150 # 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
4151 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
4152 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
4153 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
4154 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
4155 if len(indicators) != 0:
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4156 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
4157 shutil.rmtree(dirpath)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4158 log('Deleted ' + dirpath)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4159
11605
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
4160 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
4161 """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
4162
5701
d0a6e25de770 integrated mxtool changes from Maxine project
Doug Simon <doug.simon@oracle.com>
parents: 5699
diff changeset
4163 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
4164 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
4165 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
4166 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
4167 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
4168 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
4169 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
4170 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
4171 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
4172 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
4173 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
4174
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4175 args = parser.parse_args(args)
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4176
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4177 # 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
4178 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
4179 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
4180 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
4181 candidates = projects_opt_limit_to_suites()
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4182
5701
d0a6e25de770 integrated mxtool changes from Maxine project
Doug Simon <doug.simon@oracle.com>
parents: 5699
diff changeset
4183 # optionally restrict packages within a project
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4184 packages = []
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4185 if args.packages is not None:
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4186 packages = [name for name in args.packages.split(',')]
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4187
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4188 exclude_packages = []
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4189 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
4190 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
4191
5699
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4192 def outDir(p):
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4193 if args.base is None:
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4194 return join(p.dir, docDir)
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4195 return join(args.base, p.name, docDir)
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4196
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4197 def check_package_list(p):
5701
d0a6e25de770 integrated mxtool changes from Maxine project
Doug Simon <doug.simon@oracle.com>
parents: 5699
diff changeset
4198 return not exists(join(outDir(p), 'package-list'))
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4199
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4200 def assess_candidate(p, projects):
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4201 if p in projects:
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4202 return False
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4203 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
4204 projects.append(p)
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4205 return True
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4206 return False
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4207
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4208 projects = []
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4209 for p in candidates:
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4210 if not p.native:
5701
d0a6e25de770 integrated mxtool changes from Maxine project
Doug Simon <doug.simon@oracle.com>
parents: 5699
diff changeset
4211 if includeDeps:
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4212 deps = p.all_deps([], includeLibs=False, includeSelf=False)
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4213 for d in deps:
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4214 assess_candidate(d, projects)
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4215 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
4216 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
4217
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4218
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4219 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
4220 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
4221 pkgs = set()
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4222 for sourceDir in sourceDirs:
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4223 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
4224 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
4225 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
4226 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
4227 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
4228 pkgs.add(pkg)
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4229 return pkgs
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4230
5699
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4231 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
4232 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
4233 extraArgs += ['@' + args.argfile]
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4234 memory = '2g'
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4235 if args.memory is not None:
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4236 memory = args.memory
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4237 memory = '-J-Xmx' + memory
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4238
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4239 if not args.unified:
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4240 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
4241 # 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
4242 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
4243
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4244 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
4245 deps = p.all_deps([], includeLibs=False, includeSelf=False)
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4246 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
4247 out = outDir(p)
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4248 for d in deps:
5699
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4249 depOut = outDir(d)
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4250 links.append('-link')
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4251 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
4252 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
4253 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
4254 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
4255 delOverviewFile = False
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4256 if not exists(overviewFile):
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4257 with open(overviewFile, 'w') as fp:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4258 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
4259 delOverviewFile = True
5712
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4260 nowarnAPI = []
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4261 if not args.warnAPI:
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4262 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
4263
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
4264 # 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
4265 windowTitle = []
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
4266 if stdDoclet:
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
4267 windowTitle = ['-windowtitle', p.name + ' javadoc']
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4268 try:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4269 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
4270 projectJava = java(p.javaCompliance)
15419
f093fa76e872 made note about workaround for JDK-8041628
Doug Simon <doug.simon@oracle.com>
parents: 15408
diff changeset
4271
f093fa76e872 made note about workaround for JDK-8041628
Doug Simon <doug.simon@oracle.com>
parents: 15408
diff changeset
4272 # 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
4273 # this should be reverted to:
f093fa76e872 made note about workaround for JDK-8041628
Doug Simon <doug.simon@oracle.com>
parents: 15408
diff changeset
4274 # javadocExe = java().javadoc
f093fa76e872 made note about workaround for JDK-8041628
Doug Simon <doug.simon@oracle.com>
parents: 15408
diff changeset
4275 javadocExe = projectJava.javadoc
f093fa76e872 made note about workaround for JDK-8041628
Doug Simon <doug.simon@oracle.com>
parents: 15408
diff changeset
4276
f093fa76e872 made note about workaround for JDK-8041628
Doug Simon <doug.simon@oracle.com>
parents: 15408
diff changeset
4277 run([javadocExe, memory,
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4278 '-XDignore.symbol.file',
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4279 '-classpath', cp,
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4280 '-quiet',
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4281 '-d', out,
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4282 '-overview', overviewFile,
14916
66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14915
diff changeset
4283 '-sourcepath', sp,
66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14915
diff changeset
4284 '-source', str(projectJava.javaCompliance),
66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14915
diff changeset
4285 '-bootclasspath', projectJava.bootclasspath(),
66e9855f4ae8 Add -source -bootclasspath and -extdirs arguments to javadoc command
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14915
diff changeset
4286 '-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
4287 ([] 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
4288 links +
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4289 extraArgs +
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4290 nowarnAPI +
11605
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
4291 windowTitle +
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4292 list(pkgs))
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4293 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
4294 finally:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4295 if delOverviewFile:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4296 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
4297
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4298 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
4299 # 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
4300 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
4301
5171
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4302 pkgs = set()
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4303 sp = []
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4304 names = []
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4305 for p in projects:
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4306 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
4307 sp += p.source_dirs()
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4308 names.append(p.name)
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4309
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4310 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
4311 out = join(_primary_suite.dir, docDir)
5699
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4312 if args.base is not None:
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4313 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
4314 cp = classpath()
99ad84da5f99 added javadoc command (from Maxine version of mx)
Doug Simon <doug.simon@oracle.com>
parents: 5166
diff changeset
4315 sp = os.pathsep.join(sp)
5712
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4316 nowarnAPI = []
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4317 if not args.warnAPI:
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4318 nowarnAPI.append('-XDignore.symbol.file')
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4319 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
4320 run([java().javadoc, memory,
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4321 '-classpath', cp,
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4322 '-quiet',
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4323 '-d', out,
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4324 '-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
4325 ([] 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
4326 links +
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4327 extraArgs +
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4328 nowarnAPI +
dfcb73ac6ba2 made invalid javadoc cause a JDT error
Doug Simon <doug.simon@oracle.com>
parents: 5710
diff changeset
4329 list(pkgs))
5376
bfc9aeb1264c synchronized mxtool with Maxine
Doug Simon <doug.simon@oracle.com>
parents: 5252
diff changeset
4330 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
4331
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4332 def site(args):
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4333 """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
4334
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4335 parser = ArgumentParser(prog='site')
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4336 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
4337 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
4338 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
4339 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
4340 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
4341 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
4342 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
4343 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
4344 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
4345 args = parser.parse_args(args)
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4346
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4347 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
4348 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
4349 unified = join(tmpbase, 'all')
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4350
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4351 exclude_packages_arg = []
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4352 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
4353 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
4354
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4355 projects = sorted_deps()
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4356 projects_arg = []
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4357 if args.projects is not None:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4358 projects_arg = ['--projects', args.projects]
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4359 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
4360
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
4361 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
4362 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
4363 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
4364 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
4365
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4366 try:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4367 # 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
4368 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
4369
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4370 # 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
4371 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
4372 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
4373 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
4374 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
4375 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
4376 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
4377 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
4378 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
4379 <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
4380 <caption><span>Projects</span><span class="tabEnd">&nbsp;</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
4381 <tr><th class="colFirst" scope="col">Project</th><th class="colLast" scope="col">&nbsp;</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
4382 <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
4383 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
4384 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
4385 print >> fp2, '<tr class="{1}Color"><td class="colFirst"><a href="../{0}/javadoc/index.html",target = "_top">{0}</a></td><td class="colLast">&nbsp;</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
4386 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
4387
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
4388 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
4389 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
4390
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4391 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
4392 javadoc(['--base', tmpbase,
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4393 '--unified',
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4394 '--arg', '@-windowtitle', '--arg', '@' + title,
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4395 '--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
4396 '--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
4397
ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output
Doug Simon <doug.simon@oracle.com>
parents: 15403
diff changeset
4398 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
4399 shutil.rmtree(unified)
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4400 os.rename(join(tmpbase, 'javadoc'), unified)
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4401
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4402 # Generate dependency graph with Graphviz
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4403 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
4404 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
4405 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
4406 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
4407 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
4408 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
4409 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
4410 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
4411 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
4412
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
4413 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
4414 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
4415
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4416 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
4417 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
4418 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
4419 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
4420 with open(dot, 'w') as fp:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4421 dim = len(projects)
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4422 print >> fp, 'digraph projects {'
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4423 print >> fp, 'rankdir=BT;'
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4424 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
4425 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
4426 # print >> fp, 'edge [color="green"];'
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4427 for p in projects:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4428 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
4429 for dep in p.canonical_deps():
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4430 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
4431 print >> fp, '"' + p.name + '" -> "' + dep + '"'
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4432 depths = dict()
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4433 for p in projects:
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4434 d = p.max_depth()
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4435 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
4436 print >> fp, '}'
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4437
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4438 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
4439
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
4440 # 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
4441 # 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
4442 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
4443 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
4444 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
4445 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
4446 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
4447 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
4448
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
4449 # 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
4450 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
4451 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
4452
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4453 if exists(args.base):
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4454 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
4455 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
4456 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
4457 else:
ca16edfcecd5 mx: fixed site command by removing brittle post-processing of javadoc output
Doug Simon <doug.simon@oracle.com>
parents: 15403
diff changeset
4458 shutil.move(tmpbase, args.base)
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4459
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4460 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
4461
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4462 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
4463 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
4464 shutil.rmtree(tmpbase)
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4465
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4466 def _kwArg(kwargs):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4467 if len(kwargs) > 0:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4468 return kwargs.pop(0)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4469 return None
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4470
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
4471 def findclass(args, logToConsole=True):
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4472 """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
4473 matches = []
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4474 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
4475 if filename.endswith('.class'):
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4476 if isinstance(entry, zipfile.ZipFile):
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4477 classname = filename.replace('/', '.')
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4478 else:
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4479 classname = filename.replace(os.sep, '.')
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4480 classname = classname[:-len('.class')]
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4481 for a in args:
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4482 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
4483 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
4484 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
4485 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
4486 return matches
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4487
11295
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4488 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
4489 """
11295
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4490 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
4491
11203
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command
Doug Simon <doug.simon@oracle.com>
parents: 10585
diff changeset
4492 """
11318
345bce66c04a mx: fix for select_items
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11301
diff changeset
4493 if len(items) <= 1:
345bce66c04a mx: fix for select_items
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11301
diff changeset
4494 return items
345bce66c04a mx: fix for select_items
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11301
diff changeset
4495 else:
11295
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4496 if allowMultiple:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4497 log('[0] <all>')
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4498 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
4499 if descriptions is None:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4500 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
4501 else:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4502 assert len(items) == len(descriptions)
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4503 wrapper = textwrap.TextWrapper(subsequent_indent=' ')
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4504 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
4505 while True:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4506 if allowMultiple:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4507 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
4508 else:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4509 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
4510 try:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4511 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
4512 except:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4513 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
4514 continue
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4515
11295
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4516 if allowMultiple and 0 in s:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4517 return items
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4518
11295
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4519 indexes = []
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4520 for n in s:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4521 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
4522 log('Invalid selection: ' + str(n))
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4523 continue
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4524 else:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4525 indexes.append(n - 1)
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4526 if allowMultiple:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4527 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
4528 if len(indexes) == 1:
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4529 return items[indexes[0]]
bb70a309a7cf enhanced select_items to support multiple selections
Doug Simon <doug.simon@oracle.com>
parents: 11245
diff changeset
4530 return None
11203
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command
Doug Simon <doug.simon@oracle.com>
parents: 10585
diff changeset
4531
15087
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4532 def exportlibs(args):
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4533 """export libraries to an archive file"""
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4534
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4535 parser = ArgumentParser(prog='exportlibs')
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4536 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
4537 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
4538 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
4539 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
4540 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
4541 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
4542 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
4543 args = parser.parse_args(args)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4544
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4545 def createArchive(addMethod):
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4546 entries = {}
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4547 def add(path, arcname):
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4548 apath = os.path.abspath(path)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4549 if not entries.has_key(arcname):
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4550 entries[arcname] = apath
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4551 logv('[adding ' + path + ']')
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4552 addMethod(path, arcname=arcname)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4553 elif entries[arcname] != apath:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4554 logv('[warning: ' + apath + ' collides with ' + entries[arcname] + ' as ' + arcname + ']')
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4555 else:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4556 logv('[already added ' + path + ']')
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4557
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
4558 libsToExport = set()
15364
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4559 if args.include_all:
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4560 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
4561 libsToExport.add(lib)
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4562 else:
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4563 def isValidLibrary(dep):
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4564 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
4565 lib = _libs[dep]
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4566 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
4567 return lib
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4568 return None
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4569
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4570 # 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
4571 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
4572 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
4573 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
4574 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
4575 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
4576
15364
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4577 # 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
4578 size = 0
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4579 while size != len(libsToExport):
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4580 size = len(libsToExport)
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4581 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
4582 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
4583 r = isValidLibrary(dep)
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4584 if r:
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4585 libsToExport.add(r)
9693513ce95c mx exportlibs: add option to include all defined libaries
Bernhard Urban <bernhard.urban@jku.at>
parents: 15362
diff changeset
4586
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
4587 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
4588 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
4589 if lib.sha1:
9e7f87dc6395 mx exportlibs: include source dependencies and digest files
Bernhard Urban <bernhard.urban@jku.at>
parents: 15355
diff changeset
4590 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
4591 if lib.sourcePath:
9e7f87dc6395 mx exportlibs: include source dependencies and digest files
Bernhard Urban <bernhard.urban@jku.at>
parents: 15355
diff changeset
4592 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
4593 if lib.sourceSha1:
9e7f87dc6395 mx exportlibs: include source dependencies and digest files
Bernhard Urban <bernhard.urban@jku.at>
parents: 15355
diff changeset
4594 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
4595
15087
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4596 if args.extras:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4597 for e in args.extras:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4598 if os.path.isdir(e):
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4599 for root, _, filenames in os.walk(e):
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4600 for name in filenames:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4601 f = join(root, name)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4602 add(f, f)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4603 else:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4604 add(e, e)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4605
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4606 if args.arc == 'zip':
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4607 path = args.base + '.zip'
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4608 with zipfile.ZipFile(path, 'w') as zf:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4609 createArchive(zf.write)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4610 else:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4611 path = args.base + '.tar'
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4612 mode = 'w'
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4613 if args.arc != 'tar':
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4614 sfx = args.arc[1:]
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4615 mode = mode + ':' + sfx
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4616 path = path + '.' + sfx
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4617 with tarfile.open(path, mode) as tar:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4618 createArchive(tar.add)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4619 log('created ' + path)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4620
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4621 def digest(enabled, path, factory, suffix):
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4622 if enabled:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4623 d = factory()
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4624 with open(path, 'rb') as f:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4625 while True:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4626 buf = f.read(4096)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4627 if not buf:
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4628 break
15122
11a591a99515 mx: fixed bug in exportlibs
Doug Simon <doug.simon@oracle.com>
parents: 15118
diff changeset
4629 d.update(buf)
15087
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4630 with open(path + '.' + suffix, 'w') as fp:
15122
11a591a99515 mx: fixed bug in exportlibs
Doug Simon <doug.simon@oracle.com>
parents: 15118
diff changeset
4631 print >> fp, d.hexdigest()
15087
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4632 log('created ' + path + '.' + suffix)
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4633
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4634 digest(args.sha1, path, hashlib.sha1, 'sha1')
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4635 digest(args.md5, path, hashlib.md5, 'md5')
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4636
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4637 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
4638 """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
4639
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4640 javapExe = java().javap
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4641 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
4642 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
4643 else:
11203
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command
Doug Simon <doug.simon@oracle.com>
parents: 10585
diff changeset
4644 candidates = findclass(args, logToConsole=False)
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command
Doug Simon <doug.simon@oracle.com>
parents: 10585
diff changeset
4645 if len(candidates) == 0:
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command
Doug Simon <doug.simon@oracle.com>
parents: 10585
diff changeset
4646 log('no matches')
8ab76b7c6ff6 added interactive selection capability to 'mx javap' command
Doug Simon <doug.simon@oracle.com>
parents: 10585
diff changeset
4647 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
4648 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
4649
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4650 def show_projects(args):
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4651 """show all loaded projects"""
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4652 for s in suites():
11659
ec7aad9dfc47 made 'mx build' refresh IDE configs automatically
Doug Simon <doug.simon@oracle.com>
parents: 11620
diff changeset
4653 projectsFile = join(s.mxDir, 'projects')
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4654 if exists(projectsFile):
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4655 log(projectsFile)
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4656 for p in s.projects:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4657 log('\t' + p.name)
11759
8bcd76c3f23b mx.py whitespace fixes
Mick Jordan <mick.jordan@oracle.com>
parents: 11756
diff changeset
4658
11511
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4659 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
4660 """"""
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4661 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
4662 if not sys.stdout.isatty():
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4663 if default:
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4664 return default
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4665 else:
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4666 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
4667 questionMark = '? [yn]: '
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4668 if default:
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4669 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
4670 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
4671 while not answer:
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4672 answer = raw_input(question + questionMark)
3110bea9a6b0 mx: add helper method for yes/no question
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 11401
diff changeset
4673 return answer.lower().startswith('y')
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4674
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4675 def add_argument(*args, **kwargs):
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4676 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4677 Define how a single command-line argument.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4678 """
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4679 assert _argParser is not None
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4680 _argParser.add_argument(*args, **kwargs)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4681
11605
3676540f71cf Allow mxtool suites to be in separate repositories (CR-1367)
Mick Jordan <mick.jordan@oracle.com>
parents: 11597
diff changeset
4682 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
4683 for key, value in new_commands.iteritems():
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4684 if _commands.has_key(key):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4685 warn("redefining command '" + key + "' in suite " + suite.name)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4686 _commands[key] = value
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4687
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4688 def warn(msg):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4689 if _warn:
13968
6c6d1eacc398 mxtool: fix pylint 1.1.0 warnings
Bernhard Urban <bernhard.urban@jku.at>
parents: 13952
diff changeset
4690 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
4691
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4692 # Table of commands in alphabetical order.
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4693 # 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
4694 # 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
4695 # used in the call to str.format().
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4696 # 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
4697 _commands = {
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4698 'about': [about, ''],
4226
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
4699 'build': [build, '[options]'],
e03ff10d4bfc Made the gate clean the Java projects only.
Doug Simon <doug.simon@oracle.com>
parents: 4225
diff changeset
4700 'checkstyle': [checkstyle, ''],
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4701 'canonicalizeprojects': [canonicalizeprojects, ''],
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4702 'clean': [clean, ''],
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
4703 '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
4704 'eclipseformat': [eclipseformat, ''],
15087
f3e74d317e83 mx: added exportlibs command
Doug Simon <doug.simon@oracle.com>
parents: 15060
diff changeset
4705 'exportlibs': [exportlibs, ''],
5455
271e83dcfcef added findclass command to mx tool
Doug Simon <doug.simon@oracle.com>
parents: 5376
diff changeset
4706 '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
4707 'fsckprojects': [fsckprojects, ''],
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4708 '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
4709 'ideclean': [ideclean, ''],
4269
ffd5ce8fc736 Moved IDE project configuration into mx.py.
Doug Simon <doug.simon@oracle.com>
parents: 4258
diff changeset
4710 'ideinit': [ideinit, ''],
15060
858d2b91c1f8 Add a prototype for mx intellijinit
Gilles Duboscq <duboscq@ssw.jku.at>
parents: 14964
diff changeset
4711 'intellijinit': [intellijinit, ''],
15818
718034423138 mxtool: fix archive subcommand such that it will return a successful returncode
Bernhard Urban <bernhard.urban@jku.at>
parents: 15786
diff changeset
4712 'archive': [_archive, '[options]'],
4301
fad6f1ebeb44 mx.py: new projectgraph command
Lukas Stadler <lukas.stadler@jku.at>
parents: 4271
diff changeset
4713 'projectgraph': [projectgraph, ''],
11777
f3e5cbd1efae move pylint to mxtool
Mick Jordan <mick.jordan@oracle.com>
parents: 11759
diff changeset
4714 '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
4715 '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
4716 'javadoc': [javadoc, '[options]'],
5771
613a3ddb9a71 moved core site functionality into mx.py
Doug Simon <doug.simon@oracle.com>
parents: 5762
diff changeset
4717 'site': [site, '[options]'],
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
4718 'netbeansinit': [netbeansinit, ''],
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4719 'projects': [show_projects, ''],
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4720 }
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4721
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4722 _argParser = ArgParser()
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4723
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4724 def _suitename(mxDir):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4725 base = os.path.basename(mxDir)
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4726 parts = base.split('.')
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4727 # temporary workaround until mx.graal exists
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4728 if len(parts) == 1:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4729 return 'graal'
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4730 else:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4731 return parts[1]
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4732
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4733 def _is_suite_dir(d, mxDirName=None):
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4734 """
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4735 Checks if d contains a suite.
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4736 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
4737 """
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4738 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
4739 for f in os.listdir(d):
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4740 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
4741 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
4742 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
4743 return mxDir
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4744
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4745 def _check_primary_suite():
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4746 if _primary_suite is None:
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4747 abort('no primary suite found')
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4748 else:
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4749 return _primary_suite
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4750
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4751 def _findPrimarySuiteMxDirFrom(d):
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4752 """ 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
4753 while d:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4754 mxDir = _is_suite_dir(d)
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4755 if mxDir is not None:
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4756 return mxDir
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4757 parent = dirname(d)
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4758 if d == parent:
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4759 return None
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4760 d = parent
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4761
5699
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4762 return None
e9f7d16194a8 added --base argument to javadoc command
Doug Simon <doug.simon@oracle.com>
parents: 5581
diff changeset
4763
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4764 def _findPrimarySuiteMxDir():
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4765 # check for explicit setting
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4766 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
4767 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
4768 if mxDir is not None:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4769 return mxDir
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4770 else:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4771 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
4772
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4773 # try current working directory first
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4774 mxDir = _findPrimarySuiteMxDirFrom(os.getcwd())
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4775 if mxDir is not None:
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4776 return mxDir
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4777 # 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
4778 return _findPrimarySuiteMxDirFrom(dirname(__file__))
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4779
4241
8fece0287975 Made command timeout also kill any currently executing subprocess (group).
Doug Simon <doug.simon@oracle.com>
parents: 4239
diff changeset
4780 def main():
12477
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4781 primarySuiteMxDir = _findPrimarySuiteMxDir()
a5d83166dca6 mxtool hg support for suites
Mick Jordan <mick.jordan@oracle.com>
parents: 12455
diff changeset
4782 if primarySuiteMxDir:
12522
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4783 global _primary_suite
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4784 _primary_suite = _loadSuite(primarySuiteMxDir, True)
5ccee20550ea mxtool: fixes (GRAAL-557) and code cleanups
Mick Jordan <mick.jordan@oracle.com>
parents: 12521
diff changeset
4785 else:
13855
bc32c9f5719b remove multiple suite/repo support
Mick Jordan <mick.jordan@oracle.com>
parents: 13853
diff changeset
4786 abort('no primary suite found')
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4787
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4788 opts, commandAndArgs = _argParser._parse_cmd_line()
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4789
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4790 global _opts, _java_homes
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4791 _opts = opts
14763
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4792 defaultJdk = JavaConfig(opts.java_home, opts.java_dbg_port)
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4793 _java_homes = [defaultJdk]
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4794 if opts.extra_java_homes:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4795 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
4796 extraJdk = JavaConfig(java_home, opts.java_dbg_port)
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4797 if extraJdk > defaultJdk:
a6c1c3eb20c4 transition to JDK8
Doug Simon <doug.simon@oracle.com>
parents: 14745
diff changeset
4798 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
4799 _java_homes.append(extraJdk)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4800
4148
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7.
Doug Simon <doug.simon@oracle.com>
parents: 4147
diff changeset
4801 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
4802 s._post_init(opts)
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4803
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4804 if len(commandAndArgs) == 0:
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4805 _argParser.print_help()
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4806 return
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4807
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4808 command = commandAndArgs[0]
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4809 command_args = commandAndArgs[1:]
5032
e2de9649f0a9 Integrated mxtool updates from Maxine project.
Doug Simon <doug.simon@oracle.com>
parents: 4664
diff changeset
4810
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4811 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
4812 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
4813 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
4814 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
4815 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
4816 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
4817 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
4818 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
4819
11514
dc3c8df55905 added support for pylint and fixed errors/warnings it found
Doug Simon <doug.simon@oracle.com>
parents: 11511
diff changeset
4820 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
4821 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
4822 abort(1)
d4906ea4255b Handle SIGTERM : killing mx will properly kill subprocesses
Gilles Duboscq <gilles.m.duboscq@gmail.com>
parents: 4271
diff changeset
4823 signal.signal(signal.SIGTERM, term_handler)
14134
e71d421370f3 mx: proxy SIGQUIT to child process
Bernhard Urban <bernhard.urban@jku.at>
parents: 14133
diff changeset
4824
14135
ee66410c0679 mx: add option to send sigquit before killing child
Bernhard Urban <bernhard.urban@jku.at>
parents: 14134
diff changeset
4825 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
4826 _send_sigquit()
14153
e328f28f7401 fix for mx, did not compile on Windows
Christian Wirth <christian.wirth@oracle.com>
parents: 14136
diff changeset
4827 if get_os() != 'windows':
e328f28f7401 fix for mx, did not compile on Windows
Christian Wirth <christian.wirth@oracle.com>
parents: 14136
diff changeset
4828 signal.signal(signal.SIGQUIT, quit_handler)
14134
e71d421370f3 mx: proxy SIGQUIT to child process
Bernhard Urban <bernhard.urban@jku.at>
parents: 14133
diff changeset
4829
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4830 try:
4270
2158e26b50cf Made generated NetBeans projects use project cross referencing.
Doug Simon <doug.simon@oracle.com>
parents: 4269
diff changeset
4831 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
4832 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
4833 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
4834 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
4835 signal.alarm(opts.timeout)
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4836 retcode = c(command_args)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4837 if retcode is not None and retcode != 0:
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4838 abort(retcode)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4839 except KeyboardInterrupt:
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4840 # 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
4841 abort(1)
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4842
13471
020099961eb4 renamed JavaVersion to VersionSpec
Doug Simon <doug.simon@oracle.com>
parents: 13470
diff changeset
4843 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
4844
14103
9d8aaa3200a3 make mx respect umask when making jar files
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 13982
diff changeset
4845 currentUmask = None
9d8aaa3200a3 make mx respect umask when making jar files
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 13982
diff changeset
4846
3723
6c5f528c7aac Added a copy of the mxtool to repo.
Doug Simon <doug.simon@oracle.com>
parents:
diff changeset
4847 if __name__ == '__main__':
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4848 # 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
4849 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
4850
14103
9d8aaa3200a3 make mx respect umask when making jar files
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 13982
diff changeset
4851 # 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
4852 currentUmask = os.umask(0)
9d8aaa3200a3 make mx respect umask when making jar files
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 13982
diff changeset
4853 os.umask(currentUmask)
9d8aaa3200a3 make mx respect umask when making jar files
Tom Rodriguez <tom.rodriguez@oracle.com>
parents: 13982
diff changeset
4854
4144
34527a24bcf8 Adopted mxtool changes.
Doug Simon <doug.simon@oracle.com>
parents: 3732
diff changeset
4855 main()