Refine is_module_launcher into use_modules to allow differentiating module laucher and module image-build

Author: olpaw

sdk/mx.sdk/mx_sdk_vm.py

@@ -93,19 +93,19 @@ def __prepare__(mcs, name, this_bases):
 
 
 class AbstractNativeImageConfig(_with_metaclass(ABCMeta, object)):
-    def __init__(self, destination, jar_distributions, build_args, is_module_launcher=False, links=None, is_polyglot=False, dir_jars=False, home_finder=False, build_time=1):  # 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, build_time=1):  # pylint: disable=super-init-not-called
         """
         :type destination: str
         :type jar_distributions: list[str]
         :type build_args: list[str]
-        :type is_module_launcher: bool
         :type links: list[str]
+        :param str use_modules: Run (with 'laucher') or run and build image with module support (with 'image').
         :param bool dir_jars: If true, all jars in the component directory are added to the classpath.
         """
         self.destination = mx_subst.path_substitutions.substitute(destination)
         self.jar_distributions = jar_distributions
         self.build_args = build_args
-        self.module_launcher = is_module_launcher
+        self.use_modules = use_modules
         self.links = [mx_subst.path_substitutions.substitute(link) for link in links] if links else []
         self.is_polyglot = is_polyglot
         self.dir_jars = dir_jars
@@ -135,20 +135,20 @@ def get_add_exports_list(required_exports, custom_target_module_str=None):
 class LauncherConfig(AbstractNativeImageConfig):
     def __init__(self, destination, jar_distributions, main_class, build_args, is_main_launcher=True,
                  default_symlinks=True, is_sdk_launcher=False, custom_launcher_script=None, extra_jvm_args=None,
-                 is_module_launcher=False, main_module=None, option_vars=None, home_finder=True, **kwargs):
+                 use_modules=None, main_module=None, option_vars=None, home_finder=True, **kwargs):
         """
         :param str main_class
         :param bool is_main_launcher
         :param bool default_symlinks
         :param bool is_sdk_launcher: Whether it uses org.graalvm.launcher.Launcher
-        :param bool is_module_launcher: Whether it uses classpath or module-path for the application
-        :param str main_module: Specifies the main module. Mandatory if this is a module_launcher
+        :param str use_modules: Run (with 'laucher') or run and build image with module support (with 'image').
+        :param str main_module: Specifies the main module. Mandatory if use_modules is not None
         :param str custom_launcher_script: Custom launcher script, to be used when not compiled as a native image
         """
-        super(LauncherConfig, self).__init__(destination, jar_distributions, build_args, is_module_launcher, home_finder=home_finder, **kwargs)
+        super(LauncherConfig, self).__init__(destination, jar_distributions, build_args, use_modules, home_finder=home_finder, **kwargs)
         self.main_class = main_class
         self.is_main_launcher = is_main_launcher
-        assert not is_module_launcher or main_module
+        assert use_modules is None or main_module
         self.main_module = main_module
         self.default_symlinks = default_symlinks
         self.is_sdk_launcher = is_sdk_launcher
@@ -165,7 +165,7 @@ def add_relative_home_path(self, language, path):
         self.relative_home_paths[language] = path
 
     def get_add_exports(self, missing_jars):
-        if not self.module_launcher:
+        if self.use_modules is None:
             return ''
         distributions = self.jar_distributions
         distributions_transitive = mx.classpath_entries(distributions)

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -1286,12 +1286,13 @@ def _write_ln(s):
             _write_ln(u'ImagePath=' + java_properties_escape("${.}/" + relpath(dirname(graalvm_image_destination), graalvm_location).replace(os.sep, '/')))
             if requires:
                 _write_ln(u'Requires=' + java_properties_escape(' '.join(requires), ' ', len('Requires')))
+            build_with_module_path = image_config.use_modules == 'image'
             if isinstance(image_config, mx_sdk.LauncherConfig):
                 _write_ln(u'ImageClass=' + java_properties_escape(image_config.main_class))
-                if image_config.module_launcher:
+                if build_with_module_path:
                     _write_ln(u'ImageModule=' + java_properties_escape(image_config.main_module))
             if location_classpath:
-                image_path_arg = u'ImageModulePath=' if image_config.module_launcher else u'ImageClasspath='
+                image_path_arg = u'ImageModulePath=' if build_with_module_path else u'ImageClasspath='
                 _write_ln(image_path_arg + java_properties_escape(':'.join(("${.}/" + e.replace(os.sep, '/') for e in location_classpath)), ':', len('ImageClasspath')))
             _write_ln(u'Args=' + java_properties_escape(' '.join(build_args), ' ', len('Args')))
         return self._contents
@@ -1845,7 +1846,7 @@ def _get_main_class():
             return self.subject.native_image_config.main_class
 
         def _is_module_launcher():
-            return str(self.subject.native_image_config.module_launcher)
+            return str(self.subject.native_image_config.use_modules is not None)
 
         def _get_main_module():
             return str(self.subject.native_image_config.main_module)

substratevm/mx.substratevm/mx_substratevm.py

@@ -894,7 +894,7 @@ def _native_image_launcher_extra_jvm_args():
     support_distributions=['substratevm:NATIVE_IMAGE_GRAALVM_SUPPORT'],
     launcher_configs=[
         mx_sdk_vm.LauncherConfig(
-            is_module_launcher=not svm_java8(),
+            use_modules='image' if USE_NI_JPMS else 'launcher' if not svm_java8() else None,
             destination="bin/<exe:native-image>",
             jar_distributions=["substratevm:SVM_DRIVER"],
             main_module="org.graalvm.nativeimage.driver",