various fixes and cleanups for polyglot app pom

(cherry picked from commit 60c1bd1)

Author: timfel

graalpython/lib-graalpython/modules/standalone/__main__.py

@@ -126,6 +126,7 @@ class AbstractStandalone:
 
     def __init__(self, parsed_args):
         self.parsed_args = parsed_args
+        self.graalvm_version = MVN_PYTHON_COMMUNITY_VERSION if MVN_PYTHON_COMMUNITY_VERSION else __graalpython__.get_graalvm_version()
 
     @abc.abstractmethod
     def create(self):
@@ -163,6 +164,8 @@ def create_pom_file(self, template, pom):
                     line = line.replace("{vfs-venv-prefix}", VFS_VENV_PREFIX)
                 if "{files-list-name}" in line:
                     line = line.replace("{files-list-name}", FILES_LIST_NAME)
+                if "{graal-version}" in line:
+                    line = line.replace("{graal-version}", self.graalvm_version)
                 f.write(line)
 
     def create_launcher_file(self, template, launcher, java_pkg=""):
@@ -322,15 +325,11 @@ class NativeExecutable(Standalone):
 
     def __init__(self, parsed_args):
         super().__init__(parsed_args)
-
         self.target_dir = tempfile.mkdtemp()
         self.modules_path = os.path.join(self.target_dir, "modules")
         self.mvn_code_prefix = ""
         self.mvn_resource_prefix = ""
         self.launcher_file = os.path.join(self.target_dir, MODULE_NAME, JAVA_BINDING_LAUNCHER_FILE)
-
-        self.graalvm_version = MVN_PYTHON_COMMUNITY_VERSION if MVN_PYTHON_COMMUNITY_VERSION else __graalpython__.get_graalvm_version()
-
         self.jdk_version = __graalpython__.get_jdk_version()
 
     def create(self):

graalpython/lib-graalpython/modules/standalone/app/graalpy.cmd

@@ -16,7 +16,7 @@ del VTabCreator.java
 REM Store each argument separated by vtab
 for %%I in (%*) do call :sub %%I
 
-mvn -f "%~dp0"pom.xml exec:java -Dexec.mainClass=com.oracle.graal.python.shell.GraalPythonMain -Dorg.graalvm.launcher.executablename=%0
+mvn -f "%~dp0"pom.xml exec:exec -Dexec.executable=java -Dexec.args="--module-path %%classpath -Dorg.graalvm.launcher.executablename=%0 --module org.graalvm.py.launcher/com.oracle.graal.python.shell.GraalPythonMain"
 
 goto :eof
 

graalpython/lib-graalpython/modules/standalone/app/graalpy.sh

@@ -13,8 +13,8 @@ done
 location="$( cd -P "$( dirname "$source" )" && pwd )"
 
 for var in "$@"; do    
-    args="$args$(printf "\v")$var"
+    args="${args}$(printf "\v")${var}"
 done
 
 export GRAAL_PYTHON_ARGS=$args
-mvn -f $location/pom.xml exec:java -Dexec.mainClass=com.oracle.graal.python.shell.GraalPythonMain -Dorg.graalvm.launcher.executablename=$0
+mvn -f "${location}/pom.xml" exec:exec -Dexec.executable=java -Dexec.args="--module-path %classpath '-Dorg.graalvm.launcher.executablename=$0' --module org.graalvm.py.launcher/com.oracle.graal.python.shell.GraalPythonMain"

graalpython/lib-graalpython/modules/standalone/templates/polyglot_app_pom.xml

@@ -55,37 +55,23 @@
         <graalpy.venv.executable>/bin/python</graalpy.venv.executable>
     </properties>
 
-    <!-- XXX remove me -->
-    <repositories>
-        <repository>
-            <id>myrepo</id>
-            <url>file:///tmp/local_repo</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-  
     <dependencies>
         <dependency>
             <groupId>org.graalvm.polyglot</groupId>
             <artifactId>polyglot</artifactId>
-            <version>23.1.0-dev</version>
+            <version>{graal-version}</version>
         </dependency>
         <dependency>
             <groupId>org.graalvm.polyglot</groupId>
             <artifactId>python-community</artifactId>
-            <version>23.1.0-dev</version>
+            <version>{graal-version}</version>
             <scope>runtime</scope>
             <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.graalvm.python</groupId>
             <artifactId>python-launcher</artifactId>
-            <version>23.1.0-dev</version>
+            <version>{graal-version}</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>