Mercurial > hg > truffle
changeset 16918:b03a16cc5245
add support for installing distribution jars into jre/lib/ext directory
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 25 Aug 2014 12:57:49 +0200 |
| parents | 6af9d523222a |
| children | 0fe4732e5181 |
| files | make/Makefile make/defs.make mx/mx_graal.py |
| diffstat | 3 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Sat Aug 23 19:31:44 2014 +0200 +++ b/make/Makefile Mon Aug 25 12:57:49 2014 +0200 @@ -567,6 +567,9 @@ $(EXPORT_JRE_LIB_DIR)/%.jar: $(SHARED_DIR)/%.jar $(install-file) +$(EXPORT_JRE_LIB_EXT_DIR)/%.jar: $(SHARED_DIR)/%.jar + $(install-file) + $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% $(install-file)
--- a/make/defs.make Sat Aug 23 19:31:44 2014 +0200 +++ b/make/defs.make Mon Aug 25 12:57:49 2014 +0200 @@ -331,6 +331,7 @@ EXPORT_JRE_DIR = $(EXPORT_PATH)/jre EXPORT_JRE_BIN_DIR = $(EXPORT_JRE_DIR)/bin EXPORT_JRE_LIB_DIR = $(EXPORT_JRE_DIR)/lib +EXPORT_JRE_LIB_EXT_DIR = $(EXPORT_JRE_LIB_DIR)/ext EXPORT_JRE_LIB_ARCH_DIR = $(EXPORT_JRE_LIB_DIR)/$(LIBARCH) # non-universal macosx builds need to appear universal
--- a/mx/mx_graal.py Sat Aug 23 19:31:44 2014 +0200 +++ b/mx/mx_graal.py Mon Aug 25 12:57:49 2014 +0200 @@ -757,6 +757,10 @@ for jdkDist in _jdkDeployedDists: dist = mx.distribution(jdkDist.name) defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/' + basename(dist.path) + if jdkDist.isExtension: + defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_EXT_DIR)/' + basename(dist.path) + else: + defLine = 'EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/' + basename(dist.path) if defLine not in defs: mx.abort('Missing following line in ' + defsPath + '\n' + defLine) shutil.copy(dist.path, opts2.export_dir)