[GR-27539] Allow to specify main class.

PullRequest: graalpython/1410

Author: fangerer

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -62,20 +62,15 @@
 
 public class GraalPythonMain extends AbstractLanguageLauncher {
     public static void main(String[] args) {
-        if (GraalPythonMain.startupNanoTime == -1) {
-            GraalPythonMain.startupNanoTime = System.nanoTime();
-        }
-        if (GraalPythonMain.startupWallClockTime == -1) {
-            GraalPythonMain.startupWallClockTime = System.currentTimeMillis();
-        }
+        GraalPythonMain.setStartupTime();
         new GraalPythonMain().launch(args);
     }
 
     private static final String LANGUAGE_ID = "python";
     private static final String MIME_TYPE = "text/x-python";
 
     // provided by GraalVM bash launchers, ignored in native image mode
-    private static final String BASH_LAUNCHER_EXEC_NAME = System.getProperty("org.graalvm.launcher.executablename");
+    protected static final String BASH_LAUNCHER_EXEC_NAME = System.getProperty("org.graalvm.launcher.executablename");
 
     private static long startupWallClockTime = -1;
     private static long startupNanoTime = -1;
@@ -103,6 +98,15 @@ public static void main(String[] args) {
     private String warnOptions = null;
     private String checkHashPycsMode = "default";
 
+    protected static void setStartupTime() {
+        if (GraalPythonMain.startupNanoTime == -1) {
+            GraalPythonMain.startupNanoTime = System.nanoTime();
+        }
+        if (GraalPythonMain.startupWallClockTime == -1) {
+            GraalPythonMain.startupWallClockTime = System.currentTimeMillis();
+        }
+    }
+
     @Override
     protected List<String> preprocessArguments(List<String> givenArgs, Map<String, String> polyglotOptions) {
         ArrayList<String> unrecognized = new ArrayList<>();

mx.graalpython/mx_graalpython.py

@@ -72,6 +72,8 @@
 SUITE_COMPILER = mx.suite("compiler", fatalIfMissing=False)
 SUITE_SULONG = mx.suite("sulong")
 
+GRAALPYTHON_MAIN_CLASS = "com.oracle.graal.python.shell.GraalPythonMain"
+
 
 if PY3:
     raw_input = input # pylint: disable=redefined-builtin;
@@ -128,7 +130,7 @@ def python(args, **kwargs):
     do_run_python(args, **kwargs)
 
 
-def do_run_python(args, extra_vm_args=None, env=None, jdk=None, extra_dists=None, cp_prefix=None, cp_suffix=None, **kwargs):
+def do_run_python(args, extra_vm_args=None, env=None, jdk=None, extra_dists=None, cp_prefix=None, cp_suffix=None, main_class=GRAALPYTHON_MAIN_CLASS, **kwargs):
     if not any(arg.startswith("--python.CAPI") for arg in args):
         capi_home = _get_capi_home()
         args.insert(0, "--experimental-options")
@@ -177,7 +179,7 @@ def do_run_python(args, extra_vm_args=None, env=None, jdk=None, extra_dists=None
     if extra_vm_args:
         vm_args += extra_vm_args
 
-    vm_args.append("com.oracle.graal.python.shell.GraalPythonMain")
+    vm_args.append(main_class)
     return mx.run_java(vm_args + graalpython_args, jdk=jdk, env=env, **kwargs)
 
 
@@ -1403,6 +1405,7 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
     suite=SUITE,
     name='Graal.Python',
     short_name='pyn',
+    installable_id='graalpython',
     dir_name='python',
     standalone_dir_name='graalpython-<version>-<graalvm_os>-<arch>',
     license_files=[],
@@ -1425,7 +1428,7 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
         mx_sdk.LanguageLauncherConfig(
             destination='bin/<exe:graalpython>',
             jar_distributions=['graalpython:GRAALPYTHON-LAUNCHER'],
-            main_class='com.oracle.graal.python.shell.GraalPythonMain',
+            main_class=GRAALPYTHON_MAIN_CLASS,
             build_args=[
                 '-H:+TruffleCheckBlackListedMethods',
                 '-H:+DetectUserDirectoriesInImageHeap',
@@ -1434,6 +1437,7 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
             language='python',
         )
     ],
+    priority=5
 ))