truffle: mx/commands.py annotate

annotate mx/commands.py @ 4153:38c782b84ac2

Merge.

author	Doug Simon <doug.simon@oracle.com>
date	Tue, 20 Dec 2011 15:50:25 +0100
parents	527724d26036 c78bace5086a
children	394404b2d9bd

rev	line source
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	1 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	2 # commands.py - the default commands available to gl.py
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	3 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	4 # ----------------------------------------------------------------------------------------------------
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	5 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	6 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	8 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	9 # This code is free software; you can redistribute it and/or modify it
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	10 # under the terms of the GNU General Public License version 2 only, as
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	11 # published by the Free Software Foundation.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	12 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	13 # This code is distributed in the hope that it will be useful, but WITHOUT
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	14 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	15 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	16 # version 2 for more details (a copy is included in the LICENSE file that
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	17 # accompanied this code).
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	18 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	19 # You should have received a copy of the GNU General Public License version
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	20 # 2 along with this work; if not, write to the Free Software Foundation,
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	21 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	22 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	23 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	24 # or visit www.oracle.com if you need additional information or have any
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	25 # questions.
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	26 #
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	27 # ----------------------------------------------------------------------------------------------------
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	28
4152 527724d26036 Added PyDev configuration for mxtool. Doug Simon <doug.simon@oracle.com> parents: 4148 diff changeset	29 import os, sys, shutil, StringIO
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	30 from os.path import join, exists, dirname, isfile, isdir, isabs
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	31 import mx
4150 c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	32 import sanitycheck
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	33
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	34 _graal_home = dirname(dirname(__file__))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	35 _vmbuild = 'product'
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	36
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	37 def clean(args):
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	38 """cleans the GraalVM source tree"""
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4146 diff changeset	39 mx.clean(args)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	40 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='16')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	41 mx.run([mx.gmake_cmd(), 'clean'], cwd=join(_graal_home, 'make'))
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	42
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	43 def example(args):
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	44 """run some or all Graal examples"""
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	45 examples = {
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	46 'safeadd': ['com.oracle.max.graal.examples.safeadd', 'com.oracle.max.graal.examples.safeadd.Main'],
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	47 'vectorlib': ['com.oracle.max.graal.examples.vectorlib', 'com.oracle.max.graal.examples.vectorlib.Main'],
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	48 }
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	49
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	50 def run_example(verbose, project, mainClass):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	51 cp = mx.classpath(project)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	52 sharedArgs = ['-Xcomp', '-XX:CompileOnly=Main', mainClass]
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	53
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	54 res = []
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	55 mx.log("=== Server VM ===")
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	56 printArg = '-XX:+PrintCompilation' if verbose else '-XX:-PrintCompilation'
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	57 res.append(vm(['-cp', cp, printArg] + sharedArgs, vm="-server"))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	58 mx.log("=== Graal VM ===")
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	59 printArg = '-G:+PrintCompilation' if verbose else '-G:-PrintCompilation'
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	60 res.append(vm(['-cp', cp, printArg, '-G:-Extend', '-G:-Inline'] + sharedArgs))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	61 mx.log("=== Graal VM with extensions ===")
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	62 res.append(vm(['-cp', cp, printArg, '-G:+Extend', '-G:-Inline'] + sharedArgs))
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	63
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	64 if len([x for x in res if x != 0]) != 0:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	65 return 1
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	66 return 0
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	67
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	68 verbose = False
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	69 if '-v' in args:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	70 verbose = True
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	71 args = [a for a in args if a != '-v']
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	72
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	73 if len(args) == 0:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	74 args = examples.keys()
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	75 for a in args:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	76 config = examples.get(a)
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	77 if config is None:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	78 mx.log('unknown example: ' + a + ' {available examples = ' + str(examples.keys()) + '}')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	79 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	80 mx.log('--------- ' + a + ' ------------')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	81 project, mainClass = config
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	82 run_example(verbose, project, mainClass)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	83
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	84 def dacapo(args):
3722 7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	85 """run one or all DaCapo benchmarks"""
7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	86 runs = dict()
7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	87 while len(args) != 0 and not args[0].startswith('-'):
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	88 bm = args[0]
3722 7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	89 del args[0]
4150 c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	90 n = sanitycheck.dacapoSanityWarmup.get(bm)[sanitycheck.SanityCheckLevel.Normal]
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	91 if (n is None):
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	92 mx.abort('unknown benchmark: ' + bm + '\nselect one of: ' + str(sanitycheck.dacapoSanityWarmup.keys()))
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	93 runs[bm] = n
3722 7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	94
7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	95 if len(runs) == 0:
4150 c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	96 for (key, ns) in sanitycheck.dacapoSanityWarmup.items():
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	97 runs[key] = ns[sanitycheck.SanityCheckLevel.Normal]
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	98
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	99 for (bench, n) in runs.items():
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	100 vm(args + sanitycheck.getDacapoCmd(bench, n=n))
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	101
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	102 def sanitychecks(args):
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	103 """runs sanity checks"""
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	104 checks = sanitycheck.getSanityChecks(sanitycheck.SanityCheckLevel.Gate)
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	105 for check in checks:
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	106 if not sanitycheck.runSanityCheck(check['cmd'], check['success']):
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	107 mx.abort("Sanity checks FAILED")
c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	108 mx.log("Sanity checks PASSED")
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	109
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	110 def _jdk7(build='product', create=False):
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	111 jdk7 = join(_graal_home, 'jdk1.7.0')
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	112 if not exists(jdk7):
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	113 # Assume we are running with a JDK7
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	114 assert mx.java().version.startswith('1.7')
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	115 srcJdk = mx.java().jdk
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	116 mx.log('Creating ' + jdk7 + ' from ' + srcJdk)
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	117 os.mkdir(jdk7)
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	118 for d in ['bin', 'db', 'include', 'jre', 'lib', 'man']:
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	119 src = join(srcJdk, d)
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	120 dst = join(jdk7, d)
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	121 if not exists(src):
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	122 mx.abort('Host JDK 7 directory is missing: ' + src)
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	123 shutil.copytree(src, dst)
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	124
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	125 if build == 'product':
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	126 return jdk7
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	127 elif build in ['debug', 'fastdebug', 'optimized']:
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	128 res = join(jdk7, build)
71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	129 if not exists(res):
71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	130 if not create:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	131 mx.abort('The ' + build + ' VM has not been created - run \'mx clean; mx make ' + build + '\'')
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	132 mx.log('Creating ' + res)
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	133 os.mkdir(res)
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	134 for d in ['bin', 'db', 'include', 'jre', 'lib', 'man']:
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	135 shutil.copytree(join(jdk7, d), join(res, d))
71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	136 return res
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	137 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	138 mx.abort('Unknown build type: ' + build)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	139
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	140 def build(args):
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	141 """builds the GraalVM binary and compiles the Graal classes
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	142
3722 7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	143 The optional argument specifies what type of VM to build."""
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	144
4146 4eb5b2469b6f Fixed 'build' command. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	145 build = 'product'
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4146 diff changeset	146 if len(args) != 0 and not args[0].startswith('-'):
55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4146 diff changeset	147 build = args.pop(0)
4146 4eb5b2469b6f Fixed 'build' command. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	148
4eb5b2469b6f Fixed 'build' command. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	149 # Call mx.build to compile the Java sources
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4146 diff changeset	150 mx.build(args + ['--source', '1.7'])
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	151
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	152 def fix_jvm_cfg(jdk):
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	153 jvmCfg = join(jdk, 'jre', 'lib', 'amd64', 'jvm.cfg')
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	154 found = False
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	155 if not exists(jvmCfg):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	156 mx.abort(jvmCfg + ' does not exist')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	157
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	158 with open(jvmCfg) as f:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	159 for line in f:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	160 if '-graal KNOWN' in line:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	161 found = True
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	162 break
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	163 if not found:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	164 mx.log('Appending "-graal KNOWN" to ' + jvmCfg)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	165 with open(jvmCfg, 'a') as f:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	166 f.write('-graal KNOWN\n')
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	167
4146 4eb5b2469b6f Fixed 'build' command. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	168
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	169 jdk7 = _jdk7(build, True)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	170 if build == 'debug':
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	171 build = 'jvmg'
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	172
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	173 fix_jvm_cfg(jdk7)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	174
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	175 graalVmDir = join(jdk7, 'jre', 'lib', 'amd64', 'graal')
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	176 if not exists(graalVmDir):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	177 mx.log('Creating Graal directory in JDK7: ' + graalVmDir)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	178 os.makedirs(graalVmDir)
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	179
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	180 def filterXusage(line):
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	181 if not 'Xusage.txt' in line:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	182 sys.stderr.write(line + os.linesep)
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	183
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	184 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='3', ALT_BOOTDIR=jdk7, INSTALL='y')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	185 mx.run([mx.gmake_cmd(), build + 'graal'], cwd=join(_graal_home, 'make'), err=filterXusage)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	186
4150 c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	187 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None):
3722 7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	188 """run the GraalVM"""
7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	189
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	190 build = _vmbuild
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	191 if mx.java().debug:
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	192 args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	193 os.environ['GRAAL'] = join(_graal_home, 'graal')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	194 exe = join(_jdk7(build), 'bin', mx.exe_suffix('java'))
4150 c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	195 return mx.run([exe, vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	196
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	197 def ideinit(args):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	198 """(re)generate Eclipse project configurations
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	199
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	200 The exit code of this command reflects how many files were updated."""
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	201
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	202
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	203 def println(out, obj):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	204 out.write(str(obj) + '\n')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	205
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	206 for p in mx.projects():
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	207 if p.native:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	208 continue
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	209
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	210 if not exists(p.dir):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	211 os.makedirs(p.dir)
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	212
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	213 changedFiles = 0
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	214
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	215 out = StringIO.StringIO()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	216
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	217 println(out, '<?xml version="1.0" encoding="UTF-8"?>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	218 println(out, '<classpath>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	219 for src in p.srcDirs:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	220 srcDir = join(p.dir, src)
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	221 if not exists(srcDir):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	222 os.mkdir(srcDir)
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	223 println(out, '\t<classpathentry kind="src" path="' + src + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	224
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	225 # Every Java program depends on the JRE
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	226 println(out, '\t<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	227
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	228 for dep in p.all_deps([], True):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	229 if dep == p:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	230 continue;
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	231
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	232 if dep.isLibrary():
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	233 if hasattr(dep, 'eclipse.container'):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	234 println(out, '\t<classpathentry exported="true" kind="con" path="' + getattr(dep, 'eclipse.container') + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	235 elif hasattr(dep, 'eclipse.project'):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	236 println(out, '\t<classpathentry combineaccessrules="false" exported="true" kind="src" path="/' + getattr(dep, 'eclipse.project') + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	237 else:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	238 path = dep.path
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	239 if dep.mustExist:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	240 if isabs(path):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	241 println(out, '\t<classpathentry exported="true" kind="lib" path="' + path + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	242 else:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	243 println(out, '\t<classpathentry exported="true" kind="lib" path="/' + path + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	244 else:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	245 println(out, '\t<classpathentry combineaccessrules="false" exported="true" kind="src" path="/' + dep.name + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	246
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	247 println(out, '\t<classpathentry kind="output" path="' + getattr(p, 'eclipse.output', 'bin') + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	248 println(out, '</classpath>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	249
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	250 if mx.update_file(join(p.dir, '.classpath'), out.getvalue()):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	251 changedFiles += 1
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	252
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	253 out.close()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	254
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	255 csConfig = join(mx.project(p.checkstyleProj).dir, '.checkstyle_checks.xml')
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	256 if exists(csConfig):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	257 out = StringIO.StringIO()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	258
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	259 dotCheckstyle = join(p.dir, ".checkstyle")
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	260 checkstyleConfigPath = '/' + p.checkstyleProj + '/.checkstyle_checks.xml'
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	261 println(out, '<?xml version="1.0" encoding="UTF-8"?>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	262 println(out, '<fileset-config file-format-version="1.2.0" simple-config="true">')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	263 println(out, '\t<local-check-config name="Graal Checks" location="' + checkstyleConfigPath + '" type="project" description="">')
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	264 println(out, '\t\t<additional-data name="protect-config-file" value="false"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	265 println(out, '\t</local-check-config>')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	266 println(out, '\t<fileset name="all" enabled="true" check-config-name="Graal Checks" local="true">')
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	267 println(out, '\t\t<file-match-pattern match-pattern="." include-pattern="true"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	268 println(out, '\t</fileset>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	269 println(out, '\t<filter name="FileTypesFilter" enabled="true">')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	270 println(out, '\t\t<filter-data value="java"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	271 println(out, '\t</filter>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	272
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	273 exclude = join(p.dir, '.checkstyle.exclude')
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	274 if exists(exclude):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	275 println(out, '\t<filter name="FilesFromPackage" enabled="true">')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	276 with open(exclude) as f:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	277 for line in f:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	278 if not line.startswith('#'):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	279 line = line.strip()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	280 exclDir = join(p.dir, line)
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	281 assert isdir(exclDir), 'excluded source directory listed in ' + exclude + ' does not exist or is not a directory: ' + exclDir
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	282 println(out, '\t\t<filter-data value="' + line + '"/>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	283 println(out, '\t</filter>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	284
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	285 println(out, '</fileset-config>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	286
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	287 if mx.update_file(dotCheckstyle, out.getvalue()):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	288 changedFiles += 1
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	289
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	290 out.close()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	291
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	292
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	293 out = StringIO.StringIO()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	294
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	295 println(out, '<?xml version="1.0" encoding="UTF-8"?>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	296 println(out, '<projectDescription>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	297 println(out, '\t<name>' + p.name + '</name>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	298 println(out, '\t<comment></comment>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	299 println(out, '\t<projects>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	300 println(out, '\t</projects>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	301 println(out, '\t<buildSpec>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	302 println(out, '\t\t<buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	303 println(out, '\t\t\t<name>org.eclipse.jdt.core.javabuilder</name>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	304 println(out, '\t\t\t<arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	305 println(out, '\t\t\t</arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	306 println(out, '\t\t</buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	307 if exists(csConfig):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	308 println(out, '\t\t<buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	309 println(out, '\t\t\t<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	310 println(out, '\t\t\t<arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	311 println(out, '\t\t\t</arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	312 println(out, '\t\t</buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	313 println(out, '\t</buildSpec>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	314 println(out, '\t<natures>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	315 println(out, '\t\t<nature>org.eclipse.jdt.core.javanature</nature>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	316 if exists(csConfig):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	317 println(out, '\t\t<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	318 println(out, '\t</natures>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	319 println(out, '</projectDescription>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	320
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	321 if mx.update_file(join(p.dir, '.project'), out.getvalue()):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	322 changedFiles += 1
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	323
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	324 out.close()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	325
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	326 out = StringIO.StringIO()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	327
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	328 settingsDir = join(p.dir, ".settings")
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	329 if not exists(settingsDir):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	330 os.mkdir(settingsDir)
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	331
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	332 myDir = dirname(__file__)
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	333
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	334 with open(join(myDir, 'org.eclipse.jdt.core.prefs')) as f:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	335 content = f.read()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	336 if mx.update_file(join(settingsDir, 'org.eclipse.jdt.core.prefs'), content):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	337 changedFiles += 1
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	338
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	339 with open(join(myDir, 'org.eclipse.jdt.ui.prefs')) as f:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	340 content = f.read()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	341 if mx.update_file(join(settingsDir, 'org.eclipse.jdt.ui.prefs'), content):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	342 changedFiles += 1
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	343
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	344 if changedFiles != 0:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	345 mx.abort(changedFiles)
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	346
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	347 def mx_init():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	348 _vmbuild = 'product'
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	349 mx.add_argument('--product', action='store_const', dest='vmbuild', const='product', help='select the product VM')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	350 mx.add_argument('--debug', action='store_const', dest='vmbuild', const='debug', help='select the debug VM')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	351 mx.add_argument('--fastdebug', action='store_const', dest='vmbuild', const='fastdebug', help='select the fast debug VM')
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	352 mx.add_argument('--optimized', action='store_const', dest='vmbuild', const='optimized', help='select the optimized VM')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	353 commands = {
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	354 'build': [build, '[product\|debug\|fastdebug\|optimized]'],
3722 7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	355 'dacapo': [dacapo, '[benchmark] [VM options]'],
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	356 'example': [example, '[-v] example names...'],
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	357 'clean': [clean, ''],
3722 7c5524a4e86e Unified the way a specific build of the VM is chosen for any mx command that runs the GraalVM. Doug Simon <doug.simon@oracle.com> parents: 3721 diff changeset	358 'vm': [vm, '[-options] class [args...]'],
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	359 'ideinit': [ideinit, ''],
4150 c78bace5086a start work on integrating old hooks into mx, work on sanity checks Gilles Duboscq <gilles.m.duboscq@gmail.com> parents: 4148 diff changeset	360 'sanity' : [sanitychecks, ''],
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	361 }
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	362 mx.commands.update(commands)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	363
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	364 def mx_post_parse_cmd_line(opts):
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	365 version = mx.java().version
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	366 parts = version.split('.')
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	367 assert len(parts) >= 2
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	368 assert parts[0] == '1'
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	369 major = int(parts[1])
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	370 if not major >= 7:
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	371 mx.abort('Requires Java version 1.7 or greater, got version ' + version)
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	372
bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	373
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	374 global _vmbuild
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	375 if not opts.vmbuild is None:
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	376 _vmbuild = opts.vmbuild

Mercurial > hg > truffle

annotate mx/commands.py @ 4153:38c782b84ac2