truffle: mxtool/mx.py annotate

annotate mxtool/mx.py @ 4147:55376d8953a6

Improved 'build' and 'clean' commands.

author	Doug Simon <doug.simon@oracle.com>
date	Mon, 19 Dec 2011 22:22:56 +0100
parents	9aee7df31417
children	bf5efc22fb3f

rev	line source
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1 #!/usr/bin/python
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 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	5 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
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 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	28 # mx is a command line tool inspired by mvn (http://maven.apache.org/)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	29 # and hg (http://mercurial.selenic.com/). It includes a mechanism for
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	30 # managing the dependencies between a set of projects (like Maven)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	31 # as well as making it simple to run commands
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	32 # (like hg is the interface to the Mercurial commands).
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	33 #
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	34 # The organizing principle of mx is a project suite. A suite is a directory
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	35 # containing one or more projects. It's not coincidental that this closely
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	36 # matches the layout of one or more projects in a Mercurial repository.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	37 # The configuration information for a suite lives in an 'mx' sub-directory
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	38 # at the top level of the suite.
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	39 #
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	40 # When launched, mx treats the current working directory as a suite.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	41 # This is the primary suite. All other suites are called included suites.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	42 #
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	43 # The configuration files (i.e. in the 'mx' sub-directory) of a suite are:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	44 #
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	45 # projects - Defines the projects and libraries in the suite and the dependencies between them
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	46 # commands.py - Suite specific extensions to the commands available to mx. This is only processed
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	47 # for the primary suite.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	48 # includes - Other suites to be loaded. This is a recursive.
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	49 # env - A set of environment variable definitions.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	50 #
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	51 # The MX_INCLUDES environment variable can also be used to specify other suites.
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	52 # This value of this variable has the same format as a Java class path.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	53 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	54 # The includes and env files are typically not put under version control
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	55 # as they usually contain local file-system paths.
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	56 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	57 # The projects file is like the pom.xml file from Maven except that
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	58 # it is a properties file (not XML). Each non-comment line
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	59 # in the file specifies an attribute of a project or library. The main
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	60 # difference between a project and a library is that the former contains
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	61 # source code built by the mx tool where as the latter is an external
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	62 # dependency. The format of the projects file is
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	63 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	64 # Library specification format:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	65 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	66 # library@<name>@<prop>=<value>
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	67 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	68 # Built-in library properties (* = required):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	69 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	70 # *path: the file system path for the library to appear on a class path
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	71 # urls: a comma seperated list of URLs from which the library can be downloaded
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	72 # optional: if "true" then this library will be omitted from a class path if it doesn't exist on the file system and no URLs are specified
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	73 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	74 # Project specification format:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	75 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	76 # project@<name>@<prop>=<value>
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	77 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	78 # The name of a project also denotes the directory it is in.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	79 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	80 # Built-in project properties:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	81 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	82 # *sourceDirs: a comma separated list of source directoriy names (relative to the project directory)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	83 # dependencies: a comma separated list of the libraries and project the project depends upon (transitive dependencies may be omitted)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	84 # checkstyle: the project whose Checkstyle configuration (i.e. <project>/.checkstyle_checks.xml) is used
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	85 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	86 # Other properties can be specified for projects and libraries for use by extension commands.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	87 #
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	88 # Values can use environment variables with Bash syntax (e.g. ${HOME}).
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	89
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	90 import sys
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	91 import os
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	92 import subprocess
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	93 from collections import Callable
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	94 from threading import Thread
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	95 from argparse import ArgumentParser, REMAINDER
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	96 from os.path import join, dirname, exists, getmtime, isabs, expandvars, isdir
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	97 import shlex
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	98 import types
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	99 import urllib2
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	100 import contextlib
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	101 import StringIO
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	102 import zipfile
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	103 import shutil, fnmatch, re, xml.dom.minidom
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	104
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	105 DEFAULT_JAVA_ARGS = '-ea -Xss2m -Xmx1g'
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	106
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	107 _projects = dict()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	108 _libs = dict()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	109 _suites = dict()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	110 _opts = None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	111 _java = None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	112
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	113 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	114 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	115 """
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	116 class Dependency:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	117 def __init__(self, suite, name):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	118 self.name = name
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	119 self.suite = suite
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	120
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	121 def __str__(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	122 return self.name
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	123
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	124 def __eq__(self, other):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	125 return self.name == other.name
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	126
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	127 def __ne__(self, other):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	128 return self.name != other.name
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	129
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	130 def __hash__(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	131 return hash(self.name)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	132
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	133 def isLibrary(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	134 return isinstance(self, Library)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	135
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	136 class Project(Dependency):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	137 def __init__(self, suite, name, srcDirs, deps, dir):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	138 Dependency.__init__(self, suite, name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	139 self.srcDirs = srcDirs
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	140 self.deps = deps
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	141 self.checkstyleProj = name
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	142 self.native = False
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	143 self.dir = dir
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	144
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	145 def all_deps(self, deps, includeLibs):
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	146 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	147 Add the transitive set of dependencies for this project, including
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	148 libraries if 'includeLibs' is true, to the 'deps' list.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	149 """
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	150 if self in deps:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	151 return deps
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	152 for name in self.deps:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	153 assert name != self.name
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	154 dep = _libs.get(name, None)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	155 if dep is not None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	156 if includeLibs and not dep in deps:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	157 deps.append(dep)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	158 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	159 dep = project(name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	160 if not dep in deps:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	161 dep.all_deps(deps, includeLibs)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	162 if not self in deps:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	163 deps.append(self)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	164 return deps
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	165
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	166 def _compute_max_dep_distances(self, name, distances, dist):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	167 currentDist = distances.get(name);
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	168 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	169 distances[name] = dist
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	170 p = project(name, False)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	171 if p is not None:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	172 for dep in p.deps:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	173 self._compute_max_dep_distances(dep, distances, dist + 1)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	174
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	175 def canonical_deps(self):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	176 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	177 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	178 via other dependencies).
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	179 """
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	180 distances = dict()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	181 result = set()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	182 self._compute_max_dep_distances(self.name, distances, 0)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	183 for n,d in distances.iteritems():
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	184 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	185 if d == 1:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	186 result.add(n)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	187
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	188
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	189 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	190 return self.deps
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	191 return result;
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	192
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	193
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	194 def source_dirs(self):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	195 """
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	196 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	197 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	198 return [join(self.dir, s) for s in self.srcDirs]
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	199
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	200 def output_dir(self):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	201 """
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	202 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	203 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	204 if self.native:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	205 return None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	206 return join(self.dir, 'bin')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	207
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	208 def append_to_classpath(self, cp, resolve):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	209 if not self.native:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	210 cp.append(self.output_dir())
3723 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 class Library(Dependency):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	213 def __init__(self, suite, name, path, mustExist, urls):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	214 Dependency.__init__(self, suite, name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	215 self.path = path
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	216 self.urls = urls
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	217 self.mustExist = mustExist
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	218
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	219 def get_path(self, resolve):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	220 path = self.path
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	221 if not isabs(path):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	222 path = join(self.suite.dir, path)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	223 if resolve and self.mustExist and not exists(path):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	224 assert not len(self.urls) == 0, 'cannot find required library ' + self.name + " " + path;
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	225 download(path, self.urls)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	226 return path
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	227
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	228 def append_to_classpath(self, cp, resolve):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	229 path = self.get_path(resolve)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	230 if exists(path) or not resolve:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	231 cp.append(path)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	232
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	233 class Suite:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	234 def __init__(self, dir, primary):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	235 self.dir = dir
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	236 self.projects = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	237 self.libs = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	238 self.includes = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	239 self.commands = None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	240 self._load(join(dir, 'mx'), primary=primary)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	241
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	242 def _load_projects(self, mxDir):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	243 libsMap = dict()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	244 projsMap = dict()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	245 projectsFile = join(mxDir, 'projects')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	246 if not exists(projectsFile):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	247 return
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	248 with open(projectsFile) as f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	249 for line in f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	250 line = line.strip()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	251 if len(line) != 0 and line[0] != '#':
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	252 key, value = line.split('=', 1)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	253
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	254 parts = key.split('@')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	255
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	256 if len(parts) == 2:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	257 pass
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	258 if len(parts) != 3:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	259 abort('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	260 kind, name, attr = parts
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	261 if kind == 'project':
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	262 m = projsMap
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	263 elif kind == 'library':
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	264 m = libsMap
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	265 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	266 abort('Property name does not start with "project@" or "library@": ' + key)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	267
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	268 attrs = m.get(name)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	269 if attrs is None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	270 attrs = dict()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	271 m[name] = attrs
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	272 value = expandvars_in_property(value)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	273 attrs[attr] = value
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	274
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	275 def pop_list(attrs, name):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	276 v = attrs.pop(name, None)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	277 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	278 return []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	279 return [n.strip() for n in v.split(',')]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	280
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	281 for name, attrs in projsMap.iteritems():
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	282 srcDirs = pop_list(attrs, 'sourceDirs')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	283 deps = pop_list(attrs, 'dependencies')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	284 subDir = attrs.pop('subDir', None);
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	285 if subDir is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	286 dir = join(self.dir, name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	287 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	288 dir = join(self.dir, subDir, name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	289 p = Project(self, name, srcDirs, deps, dir)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	290 p.checkstyleProj = attrs.pop('checkstyle', name)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	291 p.native = attrs.pop('native', '') == 'true'
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	292 p.__dict__.update(attrs)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	293 self.projects.append(p)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	294
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	295 for name, attrs in libsMap.iteritems():
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	296 path = attrs['path']
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	297 mustExist = attrs.pop('optional', 'false') != 'true'
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	298 urls = pop_list(attrs, 'urls')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	299 l = Library(self, name, path, mustExist, urls)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	300 l.__dict__.update(attrs)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	301 self.libs.append(l)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	302
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	303 def _load_commands(self, mxDir):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	304 commands = join(mxDir, 'commands.py')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	305 if exists(commands):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	306 # temporarily extend the Python path
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	307 sys.path.insert(0, mxDir)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	308
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	309 mod = __import__('commands')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	310
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	311 # revert the Python path
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	312 del sys.path[0]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	313
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	314 if not hasattr(mod, 'mx_init'):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	315 abort(commands + ' must define an mx_init(env) function')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	316
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	317 mod.mx_init()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	318 self.commands = mod
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	319
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	320 def _load_includes(self, mxDir):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	321 includes = join(mxDir, 'includes')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	322 if exists(includes):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	323 with open(includes) as f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	324 for line in f:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	325 self.includes.append(expandvars_in_property(line.strip()))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	326
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	327 def _load_env(self, mxDir):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	328 e = join(mxDir, 'env')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	329 if exists(e):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	330 with open(e) as f:
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	331 for line in f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	332 line = line.strip()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	333 if len(line) != 0 and line[0] != '#':
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	334 key, value = line.split('=', 1)
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	335 os.environ[key.strip()] = expandvars_in_property(value.strip())
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	336
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	337 def _load(self, mxDir, primary):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	338 self._load_includes(mxDir)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	339 self._load_projects(mxDir)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	340 self._load_env(mxDir)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	341 if primary:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	342 self._load_commands(mxDir)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	343
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	344 def get_os():
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	345 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	346 Get a canonical form of sys.platform.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	347 """
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	348 if sys.platform.startswith('darwin'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	349 return 'darwin'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	350 elif sys.platform.startswith('linux'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	351 return 'linux'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	352 elif sys.platform.startswith('sunos'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	353 return 'solaris'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	354 elif sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	355 return 'windows'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	356 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	357 abort('Unknown operating system ' + sys.platform)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	358
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	359 def _loadSuite(dir, primary=False):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	360 mxDir = join(dir, 'mx')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	361 if not exists(mxDir) or not isdir(mxDir):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	362 return
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	363 if not _suites.has_key(dir):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	364 suite = Suite(dir, primary)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	365 _suites[dir] = suite
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	366 for p in suite.projects:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	367 existing = _projects.get(p.name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	368 if existing is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	369 abort('cannot override project ' + p.name + ' in ' + p.dir + " with project of the same name in " + existing.dir)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	370 _projects[p.name] = p
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	371 for l in suite.libs:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	372 existing = _libs.get(l.name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	373 if existing is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	374 abort('cannot redefine library ' + l.name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	375 _libs[l.name] = l
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	376
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	377 def suites():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	378 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	379 Get the list of all loaded suites.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	380 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	381 return _suites.values()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	382
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	383 def projects():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	384 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	385 Get the list of all loaded projects.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	386 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	387 return _projects.values()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	388
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	389 def project(name, fatalIfMissing=True):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	390 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	391 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	392 not exist and 'fatalIfMissing' is true.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	393 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	394 p = _projects.get(name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	395 if p is None and fatalIfMissing:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	396 abort('project named ' + name + ' not found')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	397 return p
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	398
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	399 def library(name, fatalIfMissing=True):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	400 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	401 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	402 not exist and 'fatalIfMissing' is true.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	403 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	404 l = _libs.get(name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	405 if l is None and fatalIfMissing:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	406 abort('library named ' + name + ' not found')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	407 return l
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	408
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	409 def _as_classpath(deps, resolve):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	410 cp = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	411 if _opts.cp_prefix is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	412 cp = [_opts.cp_prefix]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	413 for d in deps:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	414 d.append_to_classpath(cp, resolve)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	415 if _opts.cp_suffix is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	416 cp += [_opts.cp_suffix]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	417 return os.pathsep.join(cp)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	418
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	419 def classpath(names=None, resolve=True):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	420 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	421 Get the class path for a list of given projects, resolving each entry in the
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	422 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	423 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	424 if names is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	425 return _as_classpath(sorted_deps(True), resolve)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	426 deps = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	427 if isinstance(names, types.StringTypes):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	428 project(names).all_deps(deps, True)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	429 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	430 for n in names:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	431 project(n).all_deps(deps, True)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	432 return _as_classpath(deps, resolve)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	433
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	434 def sorted_deps(includeLibs=False):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	435 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	436 Gets the loaded projects and libraries sorted such that dependencies
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	437 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	438 true, libraries are omitted from the result.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	439 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	440 deps = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	441 for p in _projects.itervalues():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	442 p.all_deps(deps, includeLibs)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	443 return deps
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	444
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	445 class ArgParser(ArgumentParser):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	446
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	447 # 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	448 def format_help(self):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	449 return ArgumentParser.format_help(self) + _format_commands()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	450
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	451
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	452 def __init__(self):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	453 self.java_initialized = False
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	454 ArgumentParser.__init__(self, prog='mx')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	455
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	456 self.add_argument('-v', action='store_true', dest='verbose', help='enable verbose output')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	457 self.add_argument('-d', action='store_true', dest='java_dbg', help='make Java processes wait on port 8000 for a debugger')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	458 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	459 self.add_argument('--cp-sfx', dest='cp_suffix', help='class path suffix', metavar='<arg>')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	460 self.add_argument('--J', dest='java_args', help='Java VM arguments (e.g. --J @-dsa)', metavar='@<args>', default=DEFAULT_JAVA_ARGS)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	461 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	462 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	463 self.add_argument('--user-home', help='users home directory', metavar='<path>', default=os.path.expanduser('~'))
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	464 self.add_argument('--java-home', help='JDK installation directory (must be JDK 6 or later)', metavar='<path>', default=_default_java_home())
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	465
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	466 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	467 if args is None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	468 args = sys.argv[1:]
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	469
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	470 self.add_argument('commandAndArgs', nargs=REMAINDER, metavar='command args...')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	471
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	472 opts = self.parse_args()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	473
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	474 if opts.java_home is None or opts.java_home == '':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	475 abort('Could not find Java home. Use --java-home option or ensure JAVA_HOME environment variable is set.')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	476
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	477 if opts.user_home is None or opts.user_home == '':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	478 abort('Could not find user home. Use --user-home option or ensure HOME environment variable is set.')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	479
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	480 os.environ['JAVA_HOME'] = opts.java_home
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	481 os.environ['HOME'] = opts.user_home
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	482
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	483 commandAndArgs = opts.__dict__.pop('commandAndArgs')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	484
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	485 for s in suites():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	486 mod = s.commands
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	487 if hasattr(mod is not None and mod, 'mx_post_parse_cmd_line'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	488 mod.mx_post_parse_cmd_line(opts)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	489
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	490 return opts, commandAndArgs
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	491
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	492 def _format_commands():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	493 msg = '\navailable commands:\n\n'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	494 for cmd in sorted(commands.iterkeys()):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	495 c, _ = commands[cmd][:2]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	496 doc = c.__doc__
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	497 if doc is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	498 doc = ''
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	499 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	500 return msg + '\n'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	501
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	502 def java():
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	503 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	504 Get a JavaConfig object containing Java commands launch details.
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	505 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	506 assert _java is not None
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	507 return _java
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	508
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	509 def run_java(args, nonZeroIsFatal=True, out=None, err=None, cwd=None):
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	510 return run(java().format_cmd(args), 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	511
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	512 def run(args, nonZeroIsFatal=True, out=None, err=None, cwd=None):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	513 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	514 Run a command in a subprocess, wait for it to complete and return the exit status of the process.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	515 If the exit status is non-zero and `nonZeroIsFatal` is true, then the program is exited with
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	516 the same exit status.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	517 Each line of the standard output and error streams of the subprocess are redirected to the
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	518 provided out and err functions if they are not None.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	519 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	520
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	521 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	522 for arg in args:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	523 assert isinstance(arg, types.StringTypes), 'argument is not a string: ' + str(arg)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	524
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	525 if _opts.verbose:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	526 log(' '.join(args))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	527
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	528 try:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	529 if out is None and err is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	530 retcode = subprocess.call(args, cwd=cwd)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	531 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	532 def redirect(stream, f):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	533 for line in iter(stream.readline, ''):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	534 f(line)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	535 stream.close()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	536 p = subprocess.Popen(args, cwd=cwd, stdout=None if out is None else subprocess.PIPE, stderr=None if err is None else subprocess.PIPE)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	537 if out is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	538 t = Thread(target=redirect, args=(p.stdout, out))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	539 t.daemon = True # thread dies with the program
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	540 t.start()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	541 if err is not None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	542 t = Thread(target=redirect, args=(p.stderr, err))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	543 t.daemon = True # thread dies with the program
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	544 t.start()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	545 retcode = p.wait()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	546 except OSError as e:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	547 log('Error executing \'' + ' '.join(args) + '\': ' + str(e))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	548 if _opts.verbose:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	549 raise e
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	550 abort(e.errno)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	551
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	552
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	553 if retcode and nonZeroIsFatal:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	554 if _opts.verbose:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	555 raise subprocess.CalledProcessError(retcode, ' '.join(args))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	556 abort(retcode)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	557
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	558 return retcode
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	559
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	560 def exe_suffix(name):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	561 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	562 Gets the platform specific suffix for an executable
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	563 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	564 if os == 'windows':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	565 return name + '.exe'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	566 return name
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	567
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	568 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	569 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	570 """
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	571 class JavaConfig:
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	572 def __init__(self, opts):
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	573 self.jdk = opts.java_home
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	574 self.debug = opts.java_dbg
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	575 self.java = exe_suffix(join(self.jdk, 'bin', 'java'))
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	576 self.javac = exe_suffix(join(self.jdk, 'bin', 'javac'))
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	577 self.javap = exe_suffix(join(self.jdk, 'bin', 'javap'))
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	578
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	579 def delAtAndSplit(s):
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	580 return shlex.split(s.lstrip('@'))
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	581
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	582 self.java_args = delAtAndSplit(_opts.java_args)
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	583 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	584 self.java_args_sfx = sum(map(delAtAndSplit, _opts.java_args_sfx), [])
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	585
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	586 # 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	587 try:
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	588 subprocess.check_output([self.java, '-d64', '-version'], stderr=subprocess.STDOUT)
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	589 self.java_args = ['-d64'] + self.java_args
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	590 except subprocess.CalledProcessError as e:
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	591 try:
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	592 subprocess.check_output([self.java, '-version'], stderr=subprocess.STDOUT)
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	593 except subprocess.CalledProcessError as e:
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	594 print e.output
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	595 abort(e.returncode)
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	596
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	597 if self.debug:
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	598 self.java_args += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000']
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	599
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	600 def format_cmd(self, args):
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	601 return [self.java] + self.java_args_pfx + self.java_args + self.java_args_sfx + args
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	602
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	603 def _default_java_home():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	604 javaHome = os.getenv('JAVA_HOME')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	605 if javaHome is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	606 if exists('/usr/lib/java/java-6-sun'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	607 javaHome = '/usr/lib/java/java-6-sun'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	608 elif exists('/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	609 javaHome = '/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	610 elif exists('/usr/jdk/latest'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	611 javaHome = '/usr/jdk/latest'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	612 return javaHome
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	613
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	614 def check_get_env(key):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	615 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	616 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	617 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	618 value = os.environ.get(key)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	619 if value is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	620 abort('Required environment variable ' + key + ' must be set')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	621 return value
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	622
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	623 def log(msg=None):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	624 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	625 Write a message to the console.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	626 All script output goes through this method thus allowing a subclass
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	627 to redirect it.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	628 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	629 if msg is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	630 print
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	631 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	632 print msg
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	633
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	634 def expand_project_in_class_path_arg(cpArg):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	635 cp = []
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	636 for part in cpArg.split(os.pathsep):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	637 if part.startswith('@'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	638 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	639 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	640 cp.append(part)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	641 return os.pathsep.join(cp)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	642
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	643 def expand_project_in_args(args):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	644 for i in range(len(args)):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	645 if args[i] == '-cp' or args[i] == '-classpath':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	646 if i + 1 < len(args):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	647 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	648 return
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	649
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	650
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	651 def gmake_cmd():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	652 for a in ['make', 'gmake', 'gnumake']:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	653 try:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	654 output = subprocess.check_output([a, '--version'])
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	655 if 'GNU' in output:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	656 return a;
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	657 except:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	658 pass
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	659 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	660
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	661 def expandvars_in_property(value):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	662 result = expandvars(value)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	663 if '$' in result or '%' in result:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	664 abort('Property contains an undefined environment variable: ' + value)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	665 return result
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	666
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	667
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	668 def abort(codeOrMessage):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	669 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	670 Aborts the program with a SystemExit exception.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	671 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	672 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	673 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	674 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	675 raise SystemExit(codeOrMessage)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	676
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	677 def download(path, urls, verbose=False):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	678 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	679 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	680 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	681 is written to the file indicated by 'path'.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	682 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	683 d = dirname(path)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	684 if d != '' and not exists(d):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	685 os.makedirs(d)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	686
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	687 def url_open(url):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	688 userAgent = 'Mozilla/5.0 (compatible)'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	689 headers = { 'User-Agent' : userAgent }
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	690 req = urllib2.Request(url, headers=headers)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	691 return urllib2.urlopen(req);
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	692
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	693 for url in urls:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	694 try:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	695 if (verbose):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	696 log('Downloading ' + url + ' to ' + path)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	697 if url.startswith('zip:') or url.startswith('jar:'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	698 i = url.find('!/')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	699 if i == -1:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	700 abort('Zip or jar URL does not contain "!/": ' + url)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	701 url, _, entry = url[len('zip:'):].partition('!/')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	702 with contextlib.closing(url_open(url)) as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	703 data = f.read()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	704 zipdata = StringIO.StringIO(f.read())
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	705
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	706 zf = zipfile.ZipFile(zipdata, 'r')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	707 data = zf.read(entry)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	708 with open(path, 'w') as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	709 f.write(data)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	710 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	711 with contextlib.closing(url_open(url)) as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	712 data = f.read()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	713 with open(path, 'w') as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	714 f.write(data)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	715 return
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	716 except IOError as e:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	717 log('Error reading from ' + url + ': ' + str(e))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	718 except zipfile.BadZipfile as e:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	719 log('Error in zip file downloaded from ' + url + ': ' + str(e))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	720
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	721 # now try it with Java - urllib2 does not handle meta refreshes which are used by Sourceforge
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	722 myDir = dirname(__file__)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	723
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	724 javaSource = join(myDir, 'URLConnectionDownload.java')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	725 javaClass = join(myDir, 'URLConnectionDownload.class')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	726 if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	727 subprocess.check_call([java().javac, '-d', myDir, javaSource])
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	728 if run([java().java, '-cp', myDir, 'URLConnectionDownload', path] + urls) != 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	729 abort('Could not download to ' + path + ' from any of the following URLs:\n\n ' +
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	730 '\n '.join(urls) + '\n\nPlease use a web browser to do the download manually')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	731
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	732 def update_file(path, content):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	733 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	734 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	735 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	736 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	737 existed = exists(path)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	738 try:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	739 old = None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	740 if existed:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	741 with open(path, 'rb') as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	742 old = f.read()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	743
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	744 if old == content:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	745 return False
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	746
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	747 with open(path, 'wb') as f:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	748 f.write(content)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	749
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	750 log(('modified ' if existed else 'created ') + path)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	751 return True;
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	752 except IOError as e:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	753 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	754
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	755 # Builtin commands
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	756
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	757 def build(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	758 """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	759
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	760 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	761 and linkers for the various source code types."""
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	762
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	763 parser = ArgumentParser(prog='mx build');
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	764 parser.add_argument('-f', action='store_true', dest='force', help='force compilation even if class files are up to date')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	765 parser.add_argument('-c', action='store_true', dest='clean', help='removes existing build output')
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	766 parser.add_argument('--source', dest='compliance', help='Java compliance level', default='1.6')
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	767 parser.add_argument('--Wapi', action='store_true', dest='warnAPI', help='show warnings about using internal APIs')
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	768 parser.add_argument('--no-native', action='store_false', dest='native', help='do not build native projects')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	769 parser.add_argument('--jdt', help='Eclipse installation or path to ecj.jar for using the Eclipse batch compiler instead of javac', metavar='<path>')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	770
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	771 args = parser.parse_args(args)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	772
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	773 jdtJar = None
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	774 if args.jdt is not None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	775 if args.jdt.endswith('.jar'):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	776 jdtJar=args.jdt
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	777 elif isdir(args.jdt):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	778 plugins = join(args.jdt, 'plugins')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	779 choices = [f for f in os.listdir(plugins) if fnmatch.fnmatch(f, 'org.eclipse.jdt.core_*.jar')]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	780 if len(choices) != 0:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	781 jdtJar = join(plugins, sorted(choices, reverse=True)[0])
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	782
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	783 built = set()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	784 for p in sorted_deps():
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	785
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	786 if p.native:
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	787 log('Calling GNU make {0}...'.format(p.dir))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	788
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	789 if args.clean:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	790 run([gmake_cmd(), 'clean'], cwd=p.dir)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	791
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	792 run([gmake_cmd()], cwd=p.dir)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	793 built.add(p.name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	794 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	795
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	796 outputDir = p.output_dir()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	797 if exists(outputDir):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	798 if args.clean:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	799 log('Cleaning {0}...'.format(outputDir))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	800 shutil.rmtree(outputDir)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	801 os.mkdir(outputDir)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	802 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	803 os.mkdir(outputDir)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	804
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	805 cp = classpath(p.name)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	806 sourceDirs = p.source_dirs()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	807 mustBuild = args.force
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	808 if not mustBuild:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	809 for dep in p.all_deps([], False):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	810 if dep.name in built:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	811 mustBuild = True
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	812
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	813 for sourceDir in sourceDirs:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	814 javafilelist = []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	815 nonjavafilelist = []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	816 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	817 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	818 javafilelist += javafiles
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	819 nonjavafilelist += [join(root, name) for name in files if not name.endswith('.java')]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	820 if not mustBuild:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	821 for javafile in javafiles:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	822 classfile = outputDir + javafile[len(sourceDir):-len('java')] + 'class'
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	823 if not exists(classfile) or os.path.getmtime(javafile) > os.path.getmtime(classfile):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	824 mustBuild = True
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	825 break
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	826
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	827 if not mustBuild:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	828 log('[all class files in {0} are up to date - skipping]'.format(sourceDir))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	829 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	830
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	831 if len(javafilelist) == 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	832 log('[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	833 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	834
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	835 built.add(p.name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	836
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	837 argfileName = join(p.dir, 'javafilelist.txt')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	838 argfile = open(argfileName, 'w')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	839 argfile.write('\n'.join(javafilelist))
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	840 argfile.close()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	841
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	842 try:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	843 if jdtJar is None:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	844 log('Compiling Java sources in {0} with javac...'.format(sourceDir))
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	845 errFilt = None
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	846 if not args.warnAPI:
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	847 class Filter:
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	848 """
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	849 Class to errFilt the 'is Sun proprietary API and may be removed in a future release'
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	850 warning when compiling the VM classes.
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	851
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	852 """
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	853 def __init__(self):
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	854 self.c = 0
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	855
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	856 def eat(self, line):
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	857 if 'proprietary API':
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	858 self.c = 2
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	859 elif self.c != 0:
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	860 self.c -= 1
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	861 else:
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	862 print line.rstrip()
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	863 errFilt=Filter().eat
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	864
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	865 run([java().javac, '-g', '-J-Xmx1g', '-source', args.compliance, '-classpath', cp, '-d', outputDir, '@' + argfile.name], err=errFilt)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	866 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	867 log('Compiling Java sources in {0} with JDT...'.format(sourceDir))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	868 jdtProperties = join(p.dir, '.settings', 'org.eclipse.jdt.core.prefs')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	869 if not exists(jdtProperties):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	870 raise SystemError('JDT properties file {0} not found'.format(jdtProperties))
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	871 run([java().java, '-Xmx1g', '-jar', jdtJar,
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	872 '-properties', jdtProperties,
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	873 '-' + args.compliance,
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	874 '-cp', cp, '-g',
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	875 '-warn:-unusedImport,-unchecked',
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	876 '-d', outputDir, '@' + argfile.name])
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	877 finally:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	878 os.remove(argfileName)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	879
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	880
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	881 for name in nonjavafilelist:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	882 dst = join(outputDir, name[len(sourceDir) + 1:])
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	883 if exists(dirname(dst)):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	884 shutil.copyfile(name, dst)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	885
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	886 def canonicalizeprojects(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	887 """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	888
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	889 The exit code of this command reflects how many files were updated."""
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	890
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	891 changedFiles = 0
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	892 for s in suites():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	893 projectsFile = join(s.dir, 'mx', 'projects')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	894 if not exists(projectsFile):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	895 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	896 with open(projectsFile) as f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	897 out = StringIO.StringIO()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	898 pattern = re.compile('project@([^@]+)@dependencies=.*')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	899 for line in f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	900 line = line.strip()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	901 m = pattern.match(line)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	902 if m is None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	903 out.write(line + '\n')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	904 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	905 p = project(m.group(1))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	906 out.write('project@' + m.group(1) + '@dependencies=' + ','.join(p.canonical_deps()) + '\n')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	907 content = out.getvalue()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	908 if update_file(projectsFile, content):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	909 changedFiles += 1
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	910 return changedFiles;
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	911
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	912 def checkstyle(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	913 """run Checkstyle on the Java sources
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	914
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	915 Run Checkstyle over the Java sources. Any errors or warnings
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	916 produced by Checkstyle result in a non-zero exit code.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	917
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	918 If no projects are given, then all Java projects are checked."""
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	919
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	920 for p in sorted_deps():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	921 if p.native:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	922 continue
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	923 sourceDirs = p.source_dirs()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	924 dotCheckstyle = join(p.dir, '.checkstyle')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	925
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	926 if not exists(dotCheckstyle):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	927 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	928
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	929 for sourceDir in sourceDirs:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	930 javafilelist = []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	931 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	932 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	933 if len(javafilelist) == 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	934 log('[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	935 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	936
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	937 timestampFile = join(p.suite.dir, 'mx', '.checkstyle' + sourceDir[len(p.suite.dir):].replace(os.sep, '_') + '.timestamp')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	938 mustCheck = False
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	939 if exists(timestampFile):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	940 timestamp = os.path.getmtime(timestampFile)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	941 for f in javafilelist:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	942 if os.path.getmtime(f) > timestamp:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	943 mustCheck = True
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	944 break
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	945 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	946 mustCheck = True
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	947
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	948 if not mustCheck:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	949 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	950 continue
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	951
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	952 if exists(timestampFile):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	953 os.utime(timestampFile, None)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	954 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	955 file(timestampFile, 'a')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	956
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	957 dotCheckstyleXML = xml.dom.minidom.parse(dotCheckstyle)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	958 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	959 configLocation = localCheckConfig.getAttribute('location')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	960 configType = localCheckConfig.getAttribute('type')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	961 if configType == 'project':
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	962 # Eclipse plugin "Project Relative Configuration" format:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	963 #
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	964 # '/<project_name>/<suffix>'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	965 #
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	966 if configLocation.startswith('/'):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	967 name, _, suffix = configLocation.lstrip('/').partition('/')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	968 config = join(project(name).dir, suffix)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	969 else:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	970 config = join(p.dir, configLocation)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	971 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	972 log('[unknown Checkstyle configuration type "' + configType + '" in {0} - skipping]'.format(sourceDir))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	973 continue
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	974
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	975 exclude = join(p.dir, '.checkstyle.exclude')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	976
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	977 if exists(exclude):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	978 with open(exclude) as f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	979 # Convert patterns to OS separators
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	980 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	981 def match(name):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	982 for p in patterns:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	983 if p in name:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	984 log('excluding: ' + name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	985 return True
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	986 return False
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	987
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	988 javafilelist = [name for name in javafilelist if not match(name)]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	989
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	990 auditfileName = join(p.dir, 'checkstyleOutput.txt')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	991 log('Running Checkstyle on {0} using {1}...'.format(sourceDir, config))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	992
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	993 try:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	994
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	995 # Checkstyle is unable to read the filenames to process from a file, and the
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	996 # CreateProcess function on Windows limits the length of a command line to
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	997 # 32,768 characters (http://msdn.microsoft.com/en-us/library/ms682425%28VS.85%29.aspx)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	998 # so calling Checkstyle must be done in batches.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	999 while len(javafilelist) != 0:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1000 i = 0
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1001 size = 0
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1002 while i < len(javafilelist):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1003 s = len(javafilelist[i]) + 1
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1004 if (size + s < 30000):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1005 size += s
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1006 i += 1
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1007 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1008 break
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1009
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1010 batch = javafilelist[:i]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1011 javafilelist = javafilelist[i:]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1012 try:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1013 run_java(['-Xmx1g', '-jar', library('CHECKSTYLE').get_path(True), '-c', config, '-o', auditfileName] + batch)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1014 finally:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1015 if exists(auditfileName):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1016 with open(auditfileName) as f:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1017 warnings = [line.strip() for line in f if 'warning:' in line]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1018 if len(warnings) != 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1019 map(log, warnings)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1020 return 1
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1021 finally:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1022 if exists(auditfileName):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1023 os.unlink(auditfileName)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1024 return 0
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1025
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1026 def clean(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1027 """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	1028
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1029 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	1030 generated images.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1031 """
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1032
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1033 for p in projects():
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1034 if p.native:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1035 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	1036 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1037 outputDir = p.output_dir()
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1038 if outputDir != '' and exists(outputDir):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1039 log('Removing {0}...'.format(outputDir))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1040 shutil.rmtree(outputDir)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1041
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1042 def help_(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1043 """show help for a given command
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1044
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1045 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	1046
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1047 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	1048 if len(args) == 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1049 _argParser.print_help()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1050 return
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1051
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1052 name = args[0]
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1053 if not commands.has_key(name):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1054 _argParser.error('unknown command: ' + name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1055
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1056 value = commands[name]
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1057 (func, usage) = value[:2]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1058 doc = func.__doc__
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1059 if len(value) > 2:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1060 docArgs = value[2:]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1061 fmtArgs = []
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1062 for d in docArgs:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1063 if isinstance(d, Callable):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1064 fmtArgs += [d()]
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1065 else:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1066 fmtArgs += [str(d)]
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1067 doc = doc.format(*fmtArgs)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1068 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	1069
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1070
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1071 # Commands are in alphabetical order in this file.
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1072
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1073 def javap(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1074 """launch javap with a -classpath option denoting all available classes
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1075
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1076 Run the JDK javap class file disassembler with the following prepended options:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1077
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1078 -private -verbose -classpath <path to project classes>"""
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1079
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	1080 javap = java().javap
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1081 if not exists(javap):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1082 abort('The javap executable does not exists: ' + javap)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1083 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1084 run([javap, '-private', '-verbose', '-classpath', classpath()] + args)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1085
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1086 def show_projects(args):
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1087 """show all loaded projects"""
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1088 for s in suites():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1089 projectsFile = join(s.dir, 'mx', 'projects')
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1090 if exists(projectsFile):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1091 log(projectsFile)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1092 for p in s.projects:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1093 log('\t' + p.name)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1094
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1095 def add_argument(args, *kwargs):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1096 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1097 Define how a single command-line argument.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1098 """
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1099 assert _argParser is not None
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1100 _argParser.add_argument(args, *kwargs)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1101
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1102 # Table of commands in alphabetical order.
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1103 # 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	1104 # If any of the format args are instances of Callable, then they are called with an 'env' are before being
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1105 # used in the call to str.format().
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1106 # Extensions should update this table directly
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1107 commands = {
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1108 'build': [build, '[options] projects...'],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1109 'checkstyle': [checkstyle, 'projects...'],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1110 'canonicalizeprojects': [canonicalizeprojects, ''],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1111 'clean': [clean, ''],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1112 'help': [help_, '[command]'],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1113 'javap': [javap, ''],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1114 'projects': [show_projects, ''],
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1115 }
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1116
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1117 _argParser = ArgParser()
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1118
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1119 def main():
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1120 MX_INCLUDES = os.environ.get('MX_INCLUDES', None)
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1121 if MX_INCLUDES is not None:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1122 for path in MX_INCLUDES.split(os.pathsep):
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1123 d = join(path, 'mx')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1124 if exists(d) and isdir(d):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1125 _loadSuite(path)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1126
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1127 cwdMxDir = join(os.getcwd(), 'mx')
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1128 if exists(cwdMxDir) and isdir(cwdMxDir):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1129 _loadSuite(os.getcwd(), True)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1130
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1131 opts, commandAndArgs = _argParser._parse_cmd_line()
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1132 global _opts, _java
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1133 _opts = opts
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	1134 _java = JavaConfig(opts)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1135
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1136 if len(commandAndArgs) == 0:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1137 _argParser.print_help()
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1138 return
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1139
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1140 command = commandAndArgs[0]
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1141 command_args = commandAndArgs[1:]
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1142
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1143 if not commands.has_key(command):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1144 abort('mx: unknown command \'{0}\'\n{1}use "mx help" for more options'.format(command, _format_commands()))
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1145
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1146 c, _ = commands[command][:2]
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1147 try:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1148 retcode = c(command_args)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1149 if retcode is not None and retcode != 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1150 abort(retcode)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1151 except KeyboardInterrupt:
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1152 # 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	1153 abort(1)
3723 6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1154
6c5f528c7aac Added a copy of the mxtool to repo. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1155 if __name__ == '__main__':
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1156 # 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	1157 sys.modules['mx'] = sys.modules.pop('__main__')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1158
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3732 diff changeset	1159 main()

Mercurial > hg > truffle

annotate mxtool/mx.py @ 4147:55376d8953a6