truffle: mx/commands.py annotate

annotate mx/commands.py @ 4187:ac5c2bdfcca2

Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format.

author	Doug Simon <doug.simon@oracle.com>
date	Tue, 03 Jan 2012 13:54:11 +0100
parents	4af146831ed6
children	a2caa019ba3a

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 #
4187 ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	6 # Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
3718 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
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	29 import os, sys, shutil, StringIO, zipfile, tempfile, re, time, datetime, platform, subprocess
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	30 from os.path import join, exists, dirname, isdir, isfile, isabs, basename
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	31 from argparse import ArgumentParser, REMAINDER
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	32 import mx
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__))
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	35 _vmSourcesAvailable = exists(join(_graal_home, 'make')) and exists(join(_graal_home, 'src'))
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	36 _vmbuild = 'product'
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	37 _winSDK = 'C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\'
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	38 _mksHome = 'C:\\cygwin\\bin'
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	39
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	40 def clean(args):
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	41 """cleans the GraalVM source tree"""
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4146 diff changeset	42 mx.clean(args)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	43 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	44 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	45
4184 fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	46 def copyrightcheck(args):
fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	47 """run copyright check on the Mercurial controlled source files"""
4187 ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	48 res = mx.run_java(['-cp', mx.classpath('com.oracle.max.base', resolve=False), 'com.sun.max.tools.CheckCopyright', '-cfp=' + join(mx.project('com.oracle.max.base').dir, '.copyright.regex')] + args)
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	49 mx.log("copyright check result = " + str(res))
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	50 return res
4184 fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	51
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	52 def export(args):
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	53 """create a GraalVM zip file for distribution"""
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	54
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	55 parser = ArgumentParser(prog='mx export');
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	56 parser.add_argument('--omit-vm-build', action='store_false', dest='vmbuild', help='omit VM build step')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	57 parser.add_argument('--omit-dist-init', action='store_false', dest='distInit', help='omit class files and IDE configurations from distribution')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	58 parser.add_argument('zipfile', nargs=REMAINDER, metavar='zipfile')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	59
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	60 args = parser.parse_args(args)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	61
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	62 tmp = tempfile.mkdtemp(prefix='tmp', dir=_graal_home)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	63 if args.vmbuild:
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	64 # Make sure the product VM binary is up to date
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	65 build(['product'])
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	66
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	67 mx.log('Copying Java sources and mx files...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	68 mx.run(('hg archive -I graal -I mx -I mxtool -I mx.sh ' + tmp).split())
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	69
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	70 # Copy the GraalVM JDK
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	71 mx.log('Copying GraalVM JDK...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	72 src = _jdk()
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	73 dst = join(tmp, basename(src))
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	74 shutil.copytree(src, dst)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	75 zfName = join(_graal_home, 'graalvm-' + mx.get_os() + '.zip')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	76 zf = zipfile.ZipFile(zfName, 'w')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	77 for root, _, files in os.walk(tmp):
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	78 for f in files:
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	79 name = join(root, f)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	80 arcname = name[len(tmp) + 1:]
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	81 zf.write(join(tmp, name), arcname)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	82
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	83 # create class files and IDE configurations
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	84 if args.distInit:
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	85 mx.log('Creating class files...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	86 mx.run('mx build'.split(), cwd=tmp)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	87 mx.log('Creating IDE configurations...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	88 mx.run('mx ideinit'.split(), cwd=tmp)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	89
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	90 # clean up temp directory
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	91 mx.log('Cleaning up...')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	92 shutil.rmtree(tmp)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	93
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	94 mx.log('Created distribution in ' + zfName)
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	95
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	96 def example(args):
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	97 """run some or all Graal examples"""
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	98 examples = {
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	99 '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	100 '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	101 }
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	102
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	103 def run_example(verbose, project, mainClass):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	104 cp = mx.classpath(project)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	105 sharedArgs = ['-Xcomp', '-XX:CompileOnly=Main', mainClass]
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	106
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	107 res = []
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	108 mx.log("=== Server VM ===")
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	109 printArg = '-XX:+PrintCompilation' if verbose else '-XX:-PrintCompilation'
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	110 res.append(vm(['-cp', cp, printArg] + sharedArgs, vm="-server"))
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	111 mx.log("=== Graal VM ===")
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	112 printArg = '-G:+PrintCompilation' if verbose else '-G:-PrintCompilation'
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	113 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	114 mx.log("=== Graal VM with extensions ===")
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	115 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	116
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	117 if len([x for x in res if x != 0]) != 0:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	118 return 1
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	119 return 0
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	120
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	121 verbose = False
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	122 if '-v' in args:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	123 verbose = True
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	124 args = [a for a in args if a != '-v']
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	125
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	126 if len(args) == 0:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	127 args = examples.keys()
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	128 for a in args:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	129 config = examples.get(a)
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	130 if config is None:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	131 mx.log('unknown example: ' + a + ' {available examples = ' + str(examples.keys()) + '}')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	132 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	133 mx.log('--------- ' + a + ' ------------')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	134 project, mainClass = config
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	135 run_example(verbose, project, mainClass)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	136
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	137 def dacapo(args):
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	138 """run one or all DaCapo benchmarks
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	139
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	140 DaCapo options are distinguised from VM options by a '@' prefix.
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	141 For example, '@--iterations @5' will pass '--iterations 5' to the
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	142 DaCapo harness."""
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	143
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	144 benchmarks = [
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	145 'avrora',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	146 'batik',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	147 'eclipse',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	148 'fop',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	149 'h2',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	150 'jython',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	151 'luindex',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	152 'lusearch',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	153 'pmd',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	154 'sunflow',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	155 'tomcat',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	156 'tradebeans',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	157 'tradesoap',
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	158 'xalan'
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	159 ]
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	160
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	161 dacapo = mx.get_env('DACAPO_CP')
d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	162 if dacapo is None:
d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	163 dacapo = _graal_home + r'/lib/dacapo-9.12-bach.jar'
d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	164
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	165 if not isfile(dacapo) or not dacapo.endswith('.jar'):
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	166 mx.abort('Specified DaCapo jar file does not exist or is not a jar file: ' + dacapo)
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	167
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	168 vmOpts = ['-Xms1g', '-Xmx2g', '-cp', dacapo]
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	169
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	170 selected = []
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	171 while len(args) != 0 and args[0][0] not in ['-', '@']:
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	172 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	173 del args[0]
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	174 if bm not in benchmarks:
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	175 mx.abort('unknown benchmark: ' + bm + '\nselect one of: ' + str(benchmarks))
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	176 selected.append(bm)
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	177
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	178 if len(selected) != 0:
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	179 benchmarks = selected
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	180
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	181 # Extract DaCapo options
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	182 dacapoArgs = [(arg[1:]) for arg in args if arg.startswith('@')]
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	183
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	184 # The remainder are VM options
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	185 vmOpts += [arg for arg in args if not arg.startswith('@')]
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	186
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	187 dacapoSuccess = re.compile(r"^===== DaCapo 9\.12 ([a-zA-Z0-9_]+) PASSED in ([0-9]+) msec =====$")
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	188 passed = []
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	189
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	190 for bm in benchmarks:
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	191 def errFilter(line):
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	192 if dacapoSuccess.match(line):
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	193 passed.append(bm)
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	194 sys.stderr.write(line)
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	195 vm(vmOpts + ['Harness'] + dacapoArgs + [bm], err=errFilter)
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	196
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	197 failed = list(set(benchmarks).difference(set(passed)))
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	198
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	199 if len(failed) != 0:
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	200 mx.abort('Benchmark failures: ' + str(failed))
b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	201
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	202 def _jdk(build='product', create=False):
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	203 """
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	204 Get the JDK into which Graal is installed, creating it first if necessary.
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	205 """
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	206 jdk = join(_graal_home, 'jdk' + mx.java().version)
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	207 if not exists(jdk):
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	208 srcJdk = mx.java().jdk
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	209 mx.log('Creating ' + jdk + ' from ' + srcJdk)
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	210 os.mkdir(jdk)
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	211 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	212 src = join(srcJdk, d)
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	213 dst = join(jdk, d)
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	214 if not exists(src):
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	215 mx.abort('Host JDK directory is missing: ' + src)
4148 bf5efc22fb3f Replace downloading of JDK 7 with copying of host JDK 7. Doug Simon <doug.simon@oracle.com> parents: 4147 diff changeset	216 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	217
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	218 jvmCfg = join(jdk, 'jre', 'lib', 'amd64', 'jvm.cfg')
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	219 found = False
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	220 if not exists(jvmCfg):
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	221 mx.abort(jvmCfg + ' does not exist')
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	222
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	223 with open(jvmCfg) as f:
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	224 for line in f:
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	225 if '-graal KNOWN' in line:
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	226 found = True
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	227 break
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	228 if not found:
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	229 mx.log('Appending "-graal KNOWN" to ' + jvmCfg)
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	230 with open(jvmCfg, 'a') as f:
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	231 f.write('-graal KNOWN\n')
394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	232
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	233 if build == 'product':
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	234 return jdk
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	235 elif build in ['debug', 'fastdebug', 'optimized']:
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	236 res = join(jdk, build)
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	237 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	238 if not create:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	239 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	240 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	241 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	242 for d in ['bin', 'db', 'include', 'jre', 'lib', 'man']:
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	243 shutil.copytree(join(jdk, d), join(res, d))
3721 71b1204a74b4 Automated creation of debug, fastdebug and optimized subdirectories of the JDK. Doug Simon <doug.simon@oracle.com> parents: 3718 diff changeset	244 return res
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	245 else:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	246 mx.abort('Unknown build type: ' + build)
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	247
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	248 # run a command in the windows SDK Debug Shell
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	249 def runInDebugShell(cmd, workingDir, logFile=None, findInOutput=None, respondTo={}):
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	250 newLine = os.linesep
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	251 STARTTOKEN = 'RUNINDEBUGSHELL_STARTSEQUENCE'
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	252 ENDTOKEN = 'RUNINDEBUGSHELL_ENDSEQUENCE'
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	253 p = subprocess.Popen('cmd.exe /E:ON /V:ON /K ""' + _winSDK + '/Bin/SetEnv.cmd" & echo ' + STARTTOKEN + '"', \
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	254 shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	255 output = p.stdout
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	256 input = p.stdin
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	257 if logFile:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	258 log = open(logFile, 'w')
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	259 ret = False
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	260 while True:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	261 line = output.readline().decode()
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	262 if logFile:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	263 log.write(line)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	264 line = line.strip()
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	265 mx.log(line)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	266 if line == STARTTOKEN:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	267 input.write('cd /D ' + workingDir + ' & ' + cmd + ' & echo ' + ENDTOKEN + newLine)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	268 for regex in respondTo.keys():
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	269 match = regex.search(line)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	270 if match:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	271 input.write(respondTo[regex] + newLine)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	272 if findInOutput:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	273 match = findInOutput.search(line)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	274 if match:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	275 ret = True
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	276 if line == ENDTOKEN:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	277 break
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	278 input.write('exit' + newLine)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	279 if logFile:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	280 log.close()
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	281 return ret
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	282
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	283 def build(args):
9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	284 """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	285
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	286 The optional argument specifies what type of VM to build."""
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	287
4146 4eb5b2469b6f Fixed 'build' command. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	288 build = 'product'
4147 55376d8953a6 Improved 'build' and 'clean' commands. Doug Simon <doug.simon@oracle.com> parents: 4146 diff changeset	289 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	290 build = args.pop(0)
4146 4eb5b2469b6f Fixed 'build' command. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	291
4eb5b2469b6f Fixed 'build' command. Doug Simon <doug.simon@oracle.com> parents: 4145 diff changeset	292 # 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	293 mx.build(args + ['--source', '1.7'])
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	294
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	295 if not _vmSourcesAvailable:
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	296 return
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	297
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	298 jdk = _jdk(build, True)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	299 if build == 'debug':
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	300 build = 'jvmg'
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	301
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	302 graalVmDir = join(jdk, 'jre', 'lib', 'amd64', 'graal')
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	303 if not exists(graalVmDir):
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	304 mx.log('Creating Graal directory in JDK7: ' + graalVmDir)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	305 os.makedirs(graalVmDir)
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	306
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	307 def filterXusage(line):
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	308 if not 'Xusage.txt' in line:
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	309 sys.stderr.write(line + os.linesep)
42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	310
4177 c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	311 if platform.system() == 'Windows':
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	312 compilelogfile = _graal_home + '/graalCompile.log'
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	313 runInDebugShell('msbuild ' + _graal_home + r'\build\vs-amd64\jvm.vcproj /p:Configuration=compiler1_product /target:clean', _graal_home)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	314 winCompileCmd = r'set HotSpotMksHome=' + _mksHome + r'& set OUT_DIR=' + jdk + r'& set JAVA_HOME=' + jdk + r'& set path=%JAVA_HOME%\bin;%path%;%HotSpotMksHome%& cd /D "' +_graal_home + r'\make\windows"& call create.bat ' + _graal_home + ''
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	315 print(winCompileCmd)
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	316 winCompileSuccess = re.compile(r"^Writing \.vcxproj file:")
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	317 if not runInDebugShell(winCompileCmd, _graal_home, compilelogfile, winCompileSuccess):
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	318 mx.log('Error executing create command')
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	319 return
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	320 winBuildCmd = 'msbuild ' + _graal_home + r'\build\vs-amd64\jvm.vcxproj /p:Configuration=compiler1_product /p:Platform=x64'
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	321 winBuildSuccess = re.compile('Build succeeded.')
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	322 if not runInDebugShell(winBuildCmd, _graal_home, compilelogfile, winBuildSuccess):
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	323 mx.log('Error building project')
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	324 return
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	325 else:
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	326 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='3', ALT_BOOTDIR=jdk, INSTALL='y')
c843578c269d Make building work on Windows. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4163 diff changeset	327 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	328
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	329 def vm(args, vm='-graal', nonZeroIsFatal=True, out=None, err=None, cwd=None, timeout=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	330 """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	331
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	332 build = _vmbuild if _vmSourcesAvailable else 'product'
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	333 if mx.java().debug:
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	334 args = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000'] + args
4155 394404b2d9bd Removed strict requirement for GRAAL environment variable. It only needs to be set now if the graal directory is not in the directory hierarchy of GraalVM JDK. Doug Simon <doug.simon@oracle.com> parents: 4153 diff changeset	335 exe = join(_jdk(build), 'bin', mx.exe_suffix('java'))
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	336 return mx.run([exe, vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	337
4145 9aee7df31417 Removed 'tests' command. Doug Simon <doug.simon@oracle.com> parents: 4144 diff changeset	338 def ideinit(args):
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	339 """(re)generate Eclipse project configurations"""
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	340
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	341
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	342 def println(out, obj):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	343 out.write(str(obj) + '\n')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	344
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	345 for p in mx.projects():
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	346 if p.native:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	347 continue
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	348
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	349 if not exists(p.dir):
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	350 os.makedirs(p.dir)
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	351
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	352 out = StringIO.StringIO()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	353
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	354 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	355 println(out, '<classpath>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	356 for src in p.srcDirs:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	357 srcDir = join(p.dir, src)
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	358 if not exists(srcDir):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	359 os.mkdir(srcDir)
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	360 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	361
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	362 # 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	363 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	364
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	365 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	366 if dep == p:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	367 continue;
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	368
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	369 if dep.isLibrary():
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	370 if hasattr(dep, 'eclipse.container'):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	371 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	372 elif hasattr(dep, 'eclipse.project'):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	373 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	374 else:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	375 path = dep.path
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	376 if dep.mustExist:
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	377 if isabs(path):
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	378 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	379 else:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	380 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	381 else:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	382 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	383
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	384 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	385 println(out, '</classpath>')
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	386 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	387 out.close()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	388
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	389 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	390 if exists(csConfig):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	391 out = StringIO.StringIO()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	392
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	393 dotCheckstyle = join(p.dir, ".checkstyle")
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	394 checkstyleConfigPath = '/' + p.checkstyleProj + '/.checkstyle_checks.xml'
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	395 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	396 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	397 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	398 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	399 println(out, '\t</local-check-config>')
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	400 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	401 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	402 println(out, '\t</fileset>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	403 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	404 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	405 println(out, '\t</filter>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	406
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	407 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	408 if exists(exclude):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	409 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	410 with open(exclude) as f:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	411 for line in f:
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	412 if not line.startswith('#'):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	413 line = line.strip()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	414 exclDir = join(p.dir, line)
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	415 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	416 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	417 println(out, '\t</filter>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	418
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	419 println(out, '</fileset-config>')
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	420 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	421 out.close()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	422
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	423
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	424 out = StringIO.StringIO()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	425
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	426 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	427 println(out, '<projectDescription>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	428 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	429 println(out, '\t<comment></comment>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	430 println(out, '\t<projects>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	431 println(out, '\t</projects>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	432 println(out, '\t<buildSpec>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	433 println(out, '\t\t<buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	434 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	435 println(out, '\t\t\t<arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	436 println(out, '\t\t\t</arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	437 println(out, '\t\t</buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	438 if exists(csConfig):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	439 println(out, '\t\t<buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	440 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	441 println(out, '\t\t\t<arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	442 println(out, '\t\t\t</arguments>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	443 println(out, '\t\t</buildCommand>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	444 println(out, '\t</buildSpec>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	445 println(out, '\t<natures>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	446 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	447 if exists(csConfig):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	448 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	449 println(out, '\t</natures>')
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	450 println(out, '</projectDescription>')
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	451 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	452 out.close()
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	453
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	454 out = StringIO.StringIO()
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	455 settingsDir = join(p.dir, ".settings")
3732 3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	456 if not exists(settingsDir):
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	457 os.mkdir(settingsDir)
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	458
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	459 myDir = dirname(__file__)
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	460
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	461 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	462 content = f.read()
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	463 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	464
3e2e8b8abdaf Updated mxtool to allow projects in subdirectories. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 3730 diff changeset	465 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	466 content = f.read()
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	467 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	468
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	469 # Table of unit tests.
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	470 # Keys are project names, values are package name lists.
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	471 # All source files in the given (project,package) pairs are scanned for lines
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	472 # containing '@Test'. These are then detemrined to be the classes defining
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	473 # unit tests.
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	474 _unittests = {
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	475 'com.oracle.max.graal.tests': ['com.oracle.max.graal.compiler.tests'],
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	476 }
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	477
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	478 def _add_test_classes(testClassList, searchDir, pkgRoot):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	479 pkgDecl = re.compile(r"^package\s+([a-zA-Z_][\w\.])\s;$")
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	480 for root, _, files in os.walk(searchDir):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	481 for name in files:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	482 if name.endswith('.java') and name != 'package-info.java':
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	483 hasTest = False
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	484 with open(join(root, name)) as f:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	485 pkg = None
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	486 for line in f:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	487 if line.startswith("package "):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	488 match = pkgDecl.match(line)
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	489 if match:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	490 pkg = match.group(1)
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	491 else:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	492 if line.strip().startswith('@Test'):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	493 hasTest = True
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	494 break
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	495 if hasTest:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	496 assert pkg is not None
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	497 testClassList.append(pkg + '.' + name[:-len('.java')])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	498
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	499 def unittest(args):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	500 """run the Graal Compiler Unit Tests in the GraalVM
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	501
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	502 If filters are supplied, only tests whose fully qualified name
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	503 include a filter as a substring are run. Negative filters are
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	504 those with a '-' prefix."""
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	505
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	506 pos = [a for a in args if a[0] != '-']
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	507 neg = [a[1:] for a in args if a[0] == '-']
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	508
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	509 def containsAny(c, substrings):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	510 for s in substrings:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	511 if s in c:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	512 return True
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	513 return False
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	514
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	515 for proj in _unittests.iterkeys():
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	516 p = mx.project(proj)
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	517 classes = []
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	518 for pkg in _unittests[proj]:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	519 _add_test_classes(classes, join(p.dir, 'src'), pkg)
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	520
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	521 if len(pos) != 0:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	522 classes = [c for c in classes if containsAny(c, pos)]
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	523 if len(neg) != 0:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	524 classes = [c for c in classes if not containsAny(c, neg)]
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	525
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	526 # (ds) The boot class path must be used for some reason I don't quite understand
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	527 vm(['-XX:-BootstrapGraal', '-esa', '-Xbootclasspath/a:' + mx.classpath(proj), 'org.junit.runner.JUnitCore'] + classes)
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	528
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	529 def gate(args):
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	530 """run the tests used to validate a push
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	531
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	532 If this commands exits with a 0 exit code, then the source code is in
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	533 a state that would be accepted for integration into the main repository."""
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	534
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	535 start = time.time()
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	536
4160 338d46581e03 Added clean step to gate. Doug Simon <doug.simon@oracle.com> parents: 4159 diff changeset	537 # 1. Clean
4163 48f89a17f86a Trivial change to test gate. Doug Simon <doug.simon@oracle.com> parents: 4162 diff changeset	538 # clean([])
4160 338d46581e03 Added clean step to gate. Doug Simon <doug.simon@oracle.com> parents: 4159 diff changeset	539
338d46581e03 Added clean step to gate. Doug Simon <doug.simon@oracle.com> parents: 4159 diff changeset	540 # 2. Checkstyle
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	541 mx.log(time.strftime('%d %b %Y %H:%M:%S - Running Checkstyle...'))
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	542 if mx.checkstyle([]) != 0:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	543 mx.abort('Checkstyle warnings were found')
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	544
4160 338d46581e03 Added clean step to gate. Doug Simon <doug.simon@oracle.com> parents: 4159 diff changeset	545 # 3. Canonical mx/projects
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	546 mx.log(time.strftime('%d %b %Y %H:%M:%S - Ensuring mx/projects files are canonicalized...'))
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	547 if mx.canonicalizeprojects([]) != 0:
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	548 mx.abort('Rerun "mx canonicalizeprojects" and check-in the modified mx/projects files.')
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	549
4160 338d46581e03 Added clean step to gate. Doug Simon <doug.simon@oracle.com> parents: 4159 diff changeset	550 # 4. Build
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	551 mx.log(time.strftime('%d %b %Y %H:%M:%S - Build...'))
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	552 build([])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	553
4187 ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	554 # 5 Copyright check (disabled until the copyrght notices in the HotSpot source files are supported by the CheckCopyright tool)
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	555 #mx.log(time.strftime('%d %b %Y %H:%M:%S - Running copyright check...'))
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	556 #hgNode = mx.get_env('hg_node')
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	557 #if hgNode is None:
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	558 # copyrightcheck(['-modified', '-reporterrors=true', '-continueonerror'])
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	559 #else:
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	560 # revTip = int(subprocess.check_output(['hg', 'tip', '--template', "'{rev}'"]).strip("'"))
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	561 # revLast = int(subprocess.check_output(['hg', 'log', '-r', hgNode, '--template', "'{rev}'"]).strip("'"))
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	562 # changesetCount = revTip - revLast + 1
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	563 # mx.log(time.strftime('Checking ' + str(changesetCount) + ' changesets...'))
ac5c2bdfcca2 Disabled copyright check in the gate until the CheckCopyright tools supports the HotSpot copyright notice format. Doug Simon <doug.simon@oracle.com> parents: 4185 diff changeset	564 # copyrightcheck(['-last=' + str(changesetCount), '-reporterrors=true', '-continueonerror'])
4184 fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	565
fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	566 # 6. Bootstrap with system assertions enabled
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	567 mx.log(time.strftime('%d %b %Y %H:%M:%S - Bootstrap with -esa...'))
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	568 vm(['-esa', '-version'])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	569
4184 fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	570 # 7. Run unittests
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	571 mx.log(time.strftime('%d %b %Y %H:%M:%S - Running unit tests...'))
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	572 unittest([])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	573
4184 fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	574 # 8. Run selected DaCapo benchmarks
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	575 mx.log(time.strftime('%d %b %Y %H:%M:%S - Running DaCapo benchmarks...'))
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	576 dacapo(['eclipse'])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	577 #dacapo(['tradesoap'])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	578 dacapo(['batik'])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	579 dacapo(['avrora'])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	580 dacapo(['fop'])
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	581
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	582 duration = datetime.timedelta(seconds=time.time() - start)
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	583 mx.log(time.strftime('%d %b %Y %H:%M:%S - Gate done (duration - ' + str(duration) + ')'))
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	584
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	585 def mx_init():
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	586 _vmbuild = 'product'
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	587 commands = {
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	588 'build': [build, ''],
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	589 'clean': [clean, ''],
4184 fa6b78681c54 Added copyright check to the gate. Doug Simon <doug.simon@oracle.com> parents: 4178 diff changeset	590 'copyrightcheck': [copyrightcheck, ''],
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	591 'dacapo': [dacapo, '[benchmark] [VM options\|DaCapo options]'],
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	592 'example': [example, '[-v] example names...'],
4159 e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	593 'gate' : [gate, ''],
e253ca26b2d5 Added 'unittest' command to run the Graal unit tests. Doug Simon <doug.simon@oracle.com> parents: 4157 diff changeset	594 'unittest' : [unittest, '[filters...]'],
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	595 'vm': [vm, '[-options] class [args...]'],
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	596 'ideinit': [ideinit, '']
3718 42e655a6a6f3 Added mx configuration. Doug Simon <doug.simon@oracle.com> parents: diff changeset	597 }
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	598
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	599 if (_vmSourcesAvailable):
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	600 mx.add_argument('--product', action='store_const', dest='vmbuild', const='product', help='select the product VM')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	601 mx.add_argument('--debug', action='store_const', dest='vmbuild', const='debug', help='select the debug VM')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	602 mx.add_argument('--fastdebug', action='store_const', dest='vmbuild', const='fastdebug', help='select the fast debug VM')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	603 mx.add_argument('--optimized', action='store_const', dest='vmbuild', const='optimized', help='select the optimized VM')
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	604
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	605 commands.update({
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	606 'export': [export, '[-options] [zipfile]'],
4157 b26279781d95 Simplified 'dacapo' command and made it more suitable for gate usage. Doug Simon <doug.simon@oracle.com> parents: 4156 diff changeset	607 'build': [build, '[product\|debug\|fastdebug\|optimized]']
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	608 })
843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	609
4144 34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	610 mx.commands.update(commands)
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	611
34527a24bcf8 Adopted mxtool changes. Doug Simon <doug.simon@oracle.com> parents: 3736 diff changeset	612 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	613 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	614 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	615 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	616 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	617 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	618 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	619 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	620
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	621 if (_vmSourcesAvailable):
4178 d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	622 if hasattr(opts, 'vmbuild'):
d1b26c17910a Add the Dacapo benchmarks to the "lib" folder instead of using the environment variable. Fixed an issue in the downloader. Thomas Wuerthinger <thomas.wuerthinger@oracle.com> parents: 4177 diff changeset	623 global _vmbuild
4156 843c8d6720da Added 'export' command for creating a GraalVM zip file distribution without the Mercurial data or VM sources. Doug Simon <doug.simon@oracle.com> parents: 4155 diff changeset	624 _vmbuild = opts.vmbuild

Mercurial > hg > truffle

annotate mx/commands.py @ 4187:ac5c2bdfcca2