[GR-63732] Added deliverable parameter to NativeImageProject.

Author: tzezula

sdk/mx.sdk/mx_sdk_vm_ng.py

@@ -201,8 +201,9 @@ def clean(self, forBuild=False):
         mx.rmtree(self.witness_file(), ignore_errors=True)
 
 class NativeImageProject(mx.Project, metaclass=ABCMeta):
-    def __init__(self, suite, name, deps, workingSets, theLicense=None, **kw_args):
+    def __init__(self, suite, name, deps, workingSets, theLicense=None, deliverable=None, **kw_args):
         super().__init__(suite, name, subDir=None, srcDirs=[], deps=deps, workingSets=workingSets, d=suite.dir, theLicense=theLicense, **kw_args)
+        self.deliverable = deliverable if deliverable else name
         if not hasattr(self, 'buildDependencies'):
             self.buildDependencies = []
         if not _external_bootstrap_graalvm and _has_stage1_components():
@@ -221,9 +222,8 @@ def output_file(self):
     def output_file_name(self):
         pass
 
-    @abstractmethod
     def base_file_name(self):
-        pass
+        return self.deliverable
 
     @abstractmethod
     def options_file_name(self):
@@ -294,9 +294,6 @@ def resolveDeps(self):
         if mx_sdk_vm_impl._force_bash_launchers(self.output_file_name(), build_by_default=True):
             self.ignore = "Skipped executable"
 
-    def base_file_name(self):
-        return self.name
-
     def output_file_name(self):
         return mx.exe_suffix(self.base_file_name())
 
@@ -307,6 +304,12 @@ def name_suffix(self):
         return mx.exe_suffix("")
 
 class NativeImageLibraryProject(NativeImageProject):
+
+    def __init__(self, suite, name, deps, workingSets, theLicense=None, deliverable=None, **kw_args):
+        if not deliverable:
+            deliverable = name[3:] if name.startswith('lib') else name
+        super().__init__(suite, name, deps, workingSets, theLicense, deliverable, **kw_args)
+
     def resolveDeps(self):
         super().resolveDeps()
         if mx_sdk_vm_impl._skip_libraries(self.output_file_name(), build_by_default=True):
@@ -324,12 +327,6 @@ def getArchivableResults(self, use_relpath=True, single=False):
                 if isfile(absolute_path) and e.endswith('.h'):
                     yield absolute_path, e
 
-    def base_file_name(self):
-        name = self.name
-        if name.startswith('lib'):
-            name = name[3:]
-        return name
-
     def output_file_name(self):
         return mx.add_lib_prefix(mx.add_lib_suffix(self.base_file_name()))
 

truffle/mx.truffle/mx_truffle.py

@@ -1493,7 +1493,7 @@ def _qualname(distribution_name):
         if build_for_current_platform:
             # 2. Register a project building the isolate library
             isolate_deps = [language_pom_distribution, 'truffle-enterprise:TRUFFLE_ENTERPRISE']
-            build_library = __PolyglotIsolateProject(language_suite, language_id, isolate_deps, isolate_build_options)
+            build_library = PolyglotIsolateProject(language_suite, language_id, isolate_deps, isolate_build_options)
             register_project(build_library)
 
             # 3. Register layout distribution with isolate library and isolate resources
@@ -1611,7 +1611,7 @@ def _qualname(distribution_name):
 mx.add_argument('--polyglot-isolates', action='store', help='Comma-separated list of languages for which the polyglot isolate library should be built. Setting the value to `true` builds all polyglot isolate libraries.')
 
 
-class __PolyglotIsolateProject(mx_sdk_vm_ng.LanguageLibraryProject):
+class PolyglotIsolateProject(mx_sdk_vm_ng.LanguageLibraryProject):
     """
     A language library project dedicated to construct a language polyglot isolate library.
     Instances are created by register_polyglot_isolate_distributions when a language
@@ -1623,7 +1623,7 @@ def __init__(self, language_suite, language_id, isolate_deps, isolate_build_opti
             '-H:APIFunctionPrefix=truffle_isolate_',
             '-H:+CopyLanguageResources'
         ] + isolate_build_options
-        super().__init__(language_suite, f'lib{language_id}vm', isolate_deps, ['Truffle'], None, **{'build_args': build_args})
+        super().__init__(language_suite, f'{language_id}.isolate', isolate_deps, ['Truffle'], None, f'{language_id}vm', **{'build_args': build_args})
 
     def resolveDeps(self):
         super().resolveDeps()