[GR-19840] LibGraal adds an entry to the jlink.copyfiles file.

PullRequest: graal/12718

Author: ansalond

sdk/mx.sdk/mx_sdk_vm.py

@@ -98,7 +98,7 @@ def __prepare__(mcs, name, this_bases):
 
 
 class AbstractNativeImageConfig(_with_metaclass(ABCMeta, object)):
-    def __init__(self, destination, jar_distributions, build_args, use_modules=None, links=None, is_polyglot=False, dir_jars=False, home_finder=False, build_time=1, build_args_enterprise=None):  # pylint: disable=super-init-not-called
+    def __init__(self, destination, jar_distributions, build_args, use_modules=None, links=None, is_polyglot=False, dir_jars=False, home_finder=False, jlink_copyfiles=False, build_time=1, build_args_enterprise=None):  # pylint: disable=super-init-not-called
         """
         :type destination: str
         :type jar_distributions: list[str]
@@ -108,6 +108,7 @@ def __init__(self, destination, jar_distributions, build_args, use_modules=None,
         :type is_polyglot: bool
         :param bool dir_jars: If true, all jars in the component directory are added to the classpath.
         :type home_finder: bool
+        :type jlink_copyfiles: bool
         :type build_time: int
         :type build_args_enterprise: list[str] | None
         """
@@ -119,6 +120,7 @@ def __init__(self, destination, jar_distributions, build_args, use_modules=None,
         self.is_polyglot = is_polyglot
         self.dir_jars = dir_jars
         self.home_finder = home_finder
+        self.jlink_copyfiles = jlink_copyfiles
         self.build_time = build_time
         self.build_args_enterprise = build_args_enterprise or []
         self.relative_home_paths = {}
@@ -200,11 +202,11 @@ def __init__(self, destination, jar_distributions, main_class, build_args, langu
 
 
 class LibraryConfig(AbstractNativeImageConfig):
-    def __init__(self, destination, jar_distributions, build_args, jvm_library=False, use_modules=None, home_finder=False, **kwargs):
+    def __init__(self, destination, jar_distributions, build_args, jvm_library=False, use_modules=None, home_finder=False, jlink_copyfiles=False, **kwargs):
         """
         :param bool jvm_library
         """
-        super(LibraryConfig, self).__init__(destination, jar_distributions, build_args, use_modules=use_modules, home_finder=home_finder, **kwargs)
+        super(LibraryConfig, self).__init__(destination, jar_distributions, build_args, use_modules=use_modules, home_finder=home_finder, jlink_copyfiles=jlink_copyfiles, **kwargs)
         self.jvm_library = jvm_library
 
 

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -50,6 +50,7 @@
 import json
 import os
 from os.path import relpath, join, dirname, basename, exists, isfile, normpath, abspath, isdir, islink, isabs
+import pipes
 import pprint
 import re
 import shlex
@@ -330,6 +331,8 @@ def _get_main_component(components):
 """:type: dict[str, (str, str)]"""
 _parent_info_cache = {}
 
+_jlink_copy_plugin = None
+
 def _graalvm_maven_attributes(tag='graalvm'):
     """
     :type tag: str
@@ -609,7 +612,7 @@ def _find_escaping_links(root_dir):
         _libpolyglot_component = mx_sdk_vm.graalvm_component_by_name('libpoly', fatalIfMissing=False)
         assert _libpolyglot_component is None or len(_libpolyglot_component.library_configs) == 1
         _libpolyglot_macro_dir = (_macros_dir + '/' + GraalVmNativeProperties.macro_name(_libpolyglot_component.library_configs[0]) + '/') if _macros_dir is not None and _libpolyglot_component is not None else None
-
+        _jlink_copyfiles = set()
         for _component in sorted(self.components, key=lambda c: c.name):
             mx.logv('Adding {} ({}) to the {} {}'.format(_component.name, _component.__class__.__name__, name, self.__class__.__name__))
             _component_type_base = _get_component_type_base(_component)
@@ -724,7 +727,11 @@ def _find_escaping_links(root_dir):
                     _svm_library_home = _component_base
                 _svm_library_dest = _svm_library_home + _library_config.destination
                 if not stage1 and _get_svm_support().is_supported():
-                    _source_type = 'skip' if _skip_libraries(_library_config) else 'dependency'
+                    if _skip_libraries(_library_config):
+                        _source_type = 'skip'
+                    else:
+                        _source_type = 'dependency'
+                        _jlink_copyfiles.add(_svm_library_dest[len('<jre_base>/'):])
                     _library_project_name = GraalVmNativeImage.project_name(_library_config)
                     # add `LibraryConfig.destination` and the generated header files to the layout
                     _add(layout, _svm_library_dest, _source_type + ':' + _library_project_name, _component)
@@ -794,6 +801,9 @@ def _find_escaping_links(root_dir):
             _metadata = self._get_metadata(_suites)
             _add(layout, _base + 'release', "string:{}".format(_metadata))
 
+        if is_graalvm and add_jdk_base and _has_jlink_copy_plugin() and _jlink_copyfiles:
+            _add(layout, '<jdk_base>/conf/jlink.copyfiles', 'string:{}'.format('\n'.join(sorted(_jlink_copyfiles))))
+
         if has_graal_compiler:
             _add(layout, '<jre_base>/lib/jvmci/compiler-name', 'string:graal')
 
@@ -3748,6 +3758,18 @@ def _base_jdk_info():
         return base_jdk_info.split(':')
 
 
+def _has_jlink_copy_plugin():
+    global _jlink_copy_plugin
+    if _jlink_copy_plugin is None:
+        out = mx.LinesOutputCapture()
+        args = [_src_jdk.exe_path('jlink'), '--list-plugins']
+        exit_status = mx.run(args, out=out, err=out, nonZeroIsFatal=False)
+        if exit_status:
+            raise mx.abort('Failed to run \"{}\". Output:\n{}'.format(' '.join([pipes.quote(str(arg)) for arg in args]), '\n'.join(out.lines)))
+        _jlink_copy_plugin = any('--copy-files' in line for line in out.lines)
+    return _jlink_copy_plugin
+
+
 def mx_post_parse_cmd_line(args):
     if _src_jdk_version >= 9:
         for component in registered_graalvm_components():

substratevm/mx.substratevm/mx_substratevm.py

@@ -1192,6 +1192,7 @@ def _native_image_launcher_extra_jvm_args():
         mx_sdk_vm.LibraryConfig(
             destination="<lib:jvmcicompiler>",
             jvm_library=True,
+            jlink_copyfiles=True,
             jar_distributions=libgraal_jar_distributions,
             build_args=libgraal_build_args + ['--features=com.oracle.svm.graal.hotspot.libgraal.LibGraalFeature'],
         ),