Mercurial > hg > truffle

comparison mx/mx_graal.py @ 21788:c1610658bba0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed regression causing mx not to install jars into $(SHARED_DIR)
author Doug Simon <doug.simon@oracle.com>
date Mon, 08 Jun 2015 20:24:05 +0200
parents b6ee5d3f3255
children 6db6070d30b9
comparison
equal deleted inserted replaced
21787:2766fee1809a 21788:c1610658bba0
888 jvmciJars.append(dist.path) 888 jvmciJars.append(dist.path)
889 else: 889 else:
890 defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/' + basename(dist.path) 890 defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/' + basename(dist.path)
891 if defLine not in defs: 891 if defLine not in defs:
892 mx.abort('Missing following line in ' + defsPath + '\n' + defLine) 892 mx.abort('Missing following line in ' + defsPath + '\n' + defLine)
893 shutil.copy(dist.path, opts2.export_dir) 893 shutil.copy(dist.path, opts2.export_dir)
894 894
895 services, optionsFiles = _extractJVMCIFiles(jdkJars, jvmciJars, join(opts2.export_dir, 'services'), join(opts2.export_dir, 'options')) 895 services, optionsFiles = _extractJVMCIFiles(jdkJars, jvmciJars, join(opts2.export_dir, 'services'), join(opts2.export_dir, 'options'))
896 if not opts2.use_make: 896 if not opts2.use_make:
897 for service in services: 897 for service in services:
898 defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/' + service 898 defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/' + service