Mercurial > hg > graal-compiler

comparison mx.graal/mx_graal.py @ 22054:0e095e2c24e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename com.oracle.jvmci to jdk.internal.jvmci
author twisti
date Mon, 22 Jun 2015 12:12:53 -0700
parents db48a62aba36
children c105214b91d5
comparison
equal deleted inserted replaced
22053:be8ed2908c59 22054:0e095e2c24e2
521 def _makeHotspotGeneratedSourcesDir(): 521 def _makeHotspotGeneratedSourcesDir():
522 """ 522 """
523 Gets the directory containing all the HotSpot sources generated from 523 Gets the directory containing all the HotSpot sources generated from
524 JVMCI Java sources. This directory will be created if it doesn't yet exist. 524 JVMCI Java sources. This directory will be created if it doesn't yet exist.
525 """ 525 """
526 hsSrcGenDir = join(mx.project('com.oracle.jvmci.hotspot').source_gen_dir(), 'hotspot') 526 hsSrcGenDir = join(mx.project('jdk.internal.jvmci.hotspot').source_gen_dir(), 'hotspot')
527 if not exists(hsSrcGenDir): 527 if not exists(hsSrcGenDir):
528 os.makedirs(hsSrcGenDir) 528 os.makedirs(hsSrcGenDir)
529 return hsSrcGenDir 529 return hsSrcGenDir
530 530
531 def _copyToJdk(src, dst, permissions=JDK_UNIX_PERMISSIONS_FILE): 531 def _copyToJdk(src, dst, permissions=JDK_UNIX_PERMISSIONS_FILE):
881 mustBuild = True 881 mustBuild = True
882 else: 882 else:
883 mustBuild = False 883 mustBuild = False
884 timestamp = os.path.getmtime(timestampFile) 884 timestamp = os.path.getmtime(timestampFile)
885 sources = [] 885 sources = []
886 for d in ['src', 'make', join('jvmci', 'com.oracle.jvmci.hotspot', 'src_gen', 'hotspot')]: 886 for d in ['src', 'make', join('jvmci', 'jdk.internal.jvmci.hotspot', 'src_gen', 'hotspot')]:
887 for root, dirnames, files in os.walk(join(_graal_home, d)): 887 for root, dirnames, files in os.walk(join(_graal_home, d)):
888 # ignore <graal>/src/share/tools 888 # ignore <graal>/src/share/tools
889 if root == join(_graal_home, 'src', 'share'): 889 if root == join(_graal_home, 'src', 'share'):
890 dirnames.remove('tools') 890 dirnames.remove('tools')
891 sources += [join(root, name) for name in files] 891 sources += [join(root, name) for name in files]
1066 mx.make_eclipse_launch(_suite, args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True)) 1066 mx.make_eclipse_launch(_suite, args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True))
1067 if _jacoco == 'on' or _jacoco == 'append': 1067 if _jacoco == 'on' or _jacoco == 'append':
1068 jacocoagent = mx.library("JACOCOAGENT", True) 1068 jacocoagent = mx.library("JACOCOAGENT", True)
1069 # Exclude all compiler tests and snippets 1069 # Exclude all compiler tests and snippets
1070 1070
1071 includes = ['com.oracle.graal.*', 'com.oracle.jvmci.*'] 1071 includes = ['com.oracle.graal.*', 'jdk.internal.jvmci.*']
1072 baseExcludes = [] 1072 baseExcludes = []
1073 for p in mx.projects(): 1073 for p in mx.projects():
1074 projsetting = getattr(p, 'jacoco', '') 1074 projsetting = getattr(p, 'jacoco', '')
1075 if projsetting == 'exclude': 1075 if projsetting == 'exclude':
1076 baseExcludes.append(p.name) 1076 baseExcludes.append(p.name)
2078 if len(args) == 1: 2078 if len(args) == 1:
2079 out = args[0] 2079 out = args[0]
2080 elif len(args) > 1: 2080 elif len(args) > 1:
2081 mx.abort('jacocoreport takes only one argument : an output directory') 2081 mx.abort('jacocoreport takes only one argument : an output directory')
2082 2082
2083 includes = ['com.oracle.graal', 'com.oracle.jvmci'] 2083 includes = ['com.oracle.graal', 'jdk.internal.jvmci']
2084 for p in mx.projects(): 2084 for p in mx.projects():
2085 projsetting = getattr(p, 'jacoco', '') 2085 projsetting = getattr(p, 'jacoco', '')
2086 if projsetting == 'include': 2086 if projsetting == 'include':
2087 includes.append(p.name) 2087 includes.append(p.name)
2088 2088
2363 for service in contents.split('\n'): 2363 for service in contents.split('\n'):
2364 self.jvmciServices.setdefault(service, []).append(provider) 2364 self.jvmciServices.setdefault(service, []).append(provider)
2365 return True 2365 return True
2366 elif arcname.startswith('META-INF/jvmci.options/'): 2366 elif arcname.startswith('META-INF/jvmci.options/'):
2367 # Need to create service files for the providers of the 2367 # Need to create service files for the providers of the
2368 # com.oracle.jvmci.options.Options service created by 2368 # jdk.internal.jvmci.options.Options service created by
2369 # com.oracle.jvmci.options.processor.OptionProcessor. 2369 # jdk.internal.jvmci.options.processor.OptionProcessor.
2370 optionsOwner = arcname[len('META-INF/jvmci.options/'):] 2370 optionsOwner = arcname[len('META-INF/jvmci.options/'):]
2371 provider = optionsOwner + '_Options' 2371 provider = optionsOwner + '_Options'
2372 self.expectedOptionsProviders.add(provider.replace('.', '/') + '.class') 2372 self.expectedOptionsProviders.add(provider.replace('.', '/') + '.class')
2373 self.services.setdefault('com.oracle.jvmci.options.Options', []).append(provider) 2373 self.services.setdefault('jdk.internal.jvmci.options.Options', []).append(provider)
2374 return False 2374 return False
2375 2375
2376 def __addsrc__(self, arcname, contents): 2376 def __addsrc__(self, arcname, contents):
2377 return False 2377 return False
2378 2378