Mercurial > hg > graal-compiler

comparison mx/mx_graal.py @ 21554:b1530a6cce8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed com.oracle.graal.[debug|options|hotspotvmconfig]* modules to com.oracle.jvmci.[debug|options|hotspotvmconfig]* modules (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Tue, 26 May 2015 23:21:15 +0200
parents 5324104ac4f3
children be896a1983c0
comparison
equal deleted inserted replaced
21553:0910a9497b02 21554:b1530a6cce8c
716 716
717 dist = mx.distribution(deployableDist.name) 717 dist = mx.distribution(deployableDist.name)
718 718
719 if dist.name == 'GRAAL_TRUFFLE': 719 if dist.name == 'GRAAL_TRUFFLE':
720 # The content in graalRuntime.inline.hpp is generated from Graal 720 # The content in graalRuntime.inline.hpp is generated from Graal
721 # classes that implement com.oracle.graal.api.runtime.Service 721 # classes that contain com.oracle.jvmci.options.Option annotated fields.
722 # or contain com.oracle.graal.options.Option annotated fields.
723 # Since GRAAL_TRUFFLE is the leaf most distribution containing 722 # Since GRAAL_TRUFFLE is the leaf most distribution containing
724 # such classes, the generation is triggered when GRAAL_TRUFFLE 723 # such classes, the generation is triggered when GRAAL_TRUFFLE
725 # is (re)built. 724 # is (re)built.
726 _update_graalRuntime_inline_hpp(dist) 725 _update_graalRuntime_inline_hpp(dist)
727 jdks = _jdksDir() 726 jdks = _jdksDir()
989 mustBuild = True 988 mustBuild = True
990 else: 989 else:
991 mustBuild = False 990 mustBuild = False
992 timestamp = os.path.getmtime(timestampFile) 991 timestamp = os.path.getmtime(timestampFile)
993 sources = [] 992 sources = []
994 for d in ['src', 'make', join('graal', 'com.oracle.graal.hotspot', 'src_gen', 'hotspot')]: 993 for d in ['src', 'make', join('graal', 'com.oracle.jvmci.hotspot', 'src_gen', 'hotspot')]:
995 for root, dirnames, files in os.walk(join(_graal_home, d)): 994 for root, dirnames, files in os.walk(join(_graal_home, d)):
996 # ignore <graal>/src/share/tools 995 # ignore <graal>/src/share/tools
997 if root == join(_graal_home, 'src', 'share'): 996 if root == join(_graal_home, 'src', 'share'):
998 dirnames.remove('tools') 997 dirnames.remove('tools')
999 sources += [join(root, name) for name in files] 998 sources += [join(root, name) for name in files]
1157 mx.make_eclipse_launch(args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True)) 1156 mx.make_eclipse_launch(args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True))
1158 if _jacoco == 'on' or _jacoco == 'append': 1157 if _jacoco == 'on' or _jacoco == 'append':
1159 jacocoagent = mx.library("JACOCOAGENT", True) 1158 jacocoagent = mx.library("JACOCOAGENT", True)
1160 # Exclude all compiler tests and snippets 1159 # Exclude all compiler tests and snippets
1161 1160
1162 includes = ['com.oracle.graal.*'] 1161 includes = ['com.oracle.graal.*', 'com.oracle.jvmci.*']
1163 baseExcludes = [] 1162 baseExcludes = []
1164 for p in mx.projects(): 1163 for p in mx.projects():
1165 projsetting = getattr(p, 'jacoco', '') 1164 projsetting = getattr(p, 'jacoco', '')
1166 if projsetting == 'exclude': 1165 if projsetting == 'exclude':
1167 baseExcludes.append(p.name) 1166 baseExcludes.append(p.name)