extracted home and venv logic from maven and gradle plugin into embedding.tools

(cherry picked from commit 31cfe5e)

Author: tomasstupka

graalpython/graalpy-gradle-plugin/pom.xml

@@ -57,7 +57,6 @@ SOFTWARE.
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <!-- XXX -->
         <graalpy.version>24.2.0</graalpy.version>
         <gradle.version>6.1.1</gradle.version>
     </properties>
@@ -159,10 +158,6 @@ SOFTWARE.
     </dependencies>
 
     <repositories>
-<!--        <repository>-->
-<!--            <id>maven</id>-->
-<!--            <url>https://repo1.maven.org/maven2/</url>-->
-<!--        </repository>-->
         <repository>
             <id>gradle</id>
             <url>https://repo.gradle.org/gradle/libs-releases/</url>
@@ -173,16 +168,6 @@ SOFTWARE.
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>gradle-local</id>
-            <url>https://repo.gradle.org/gradle/libs-releases-local/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 
 

graalpython/graalpy-gradle-plugin/src/main/java/org/graalvm/python/GraalPyGradlePlugin.java

@@ -41,14 +41,16 @@
 package org.graalvm.python;
 
 import org.graalvm.python.dsl.GraalPyExtension;
-import org.graalvm.python.tasks.GenerateManifestTask;
-import org.graalvm.python.tasks.InstallPackagesTask;
+import org.graalvm.python.tasks.VFSFilesListTask;
+import org.graalvm.python.tasks.NativeImageConfigTask;
+import org.graalvm.python.tasks.ResourcesTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.DependencySet;
 import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.tasks.TaskProvider;
 import org.gradle.jvm.tasks.Jar;
 import org.gradle.language.jvm.tasks.ProcessResources;
 
@@ -61,13 +63,15 @@
 public abstract class GraalPyGradlePlugin implements Plugin<Project> {
     private static final String PYTHON_LAUNCHER_ARTIFACT_ID = "python-launcher";
     private static final String PYTHON_EMBEDDING_ARTIFACT_ID = "python-embedding";
-
     private static final String POLYGLOT_GROUP_ID = "org.graalvm.polyglot";
     private static final String PYTHON_COMMUNITY_ARTIFACT_ID = "python-community";
     private static final String PYTHON_ARTIFACT_ID = "python";
-    private static final String GRAALPY_GRADLE_PLUGIN_TASK_GROUP = "graalpy";
-
+    private static final String GRAALPY_GRADLE_PLUGIN_TASK_GROUP = "graalPy";
     private static final String DEFAULT_WRAPPER_DIRECTORY = "python-generated";
+    private static final String GRAALPY_RESOURCES_TASK = "graalPyResources";
+    private static final String GRAALPY_NATIVE_IMAGE_CONFIG_TASK = "graalPyNativeImageConfig";
+    private static final String GRAALPY_VFS_FILESLIST_TASK = "graalPyVFSFilesList";
+
 
     GraalPyExtension extension;
     Project project;
@@ -77,22 +81,12 @@ public void apply(Project project) {
         this.project = project;
         project.getPluginManager().apply(JavaPlugin.class);
 
-
         this.extension = project.getExtensions().create("graalPy", GraalPyExtension.class);
         extension.getPythonHome().getIncludes().convention(List.of(".*"));
         extension.getPythonHome().getExcludes().convention(Collections.emptyList());
         extension.getPackages().convention(Collections.emptyList());
 
-        var installPackagesTask = project.getTasks().register("installPackages", InstallPackagesTask.class);
-
-
-        final var generateManifestTask = project.getTasks().register("generateManifest", GenerateManifestTask.class);
-        project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME, t -> ((Jar) t).getMetaInf().from(generateManifestTask));
-        generateManifestTask.configure(t -> {
-            t.getManifestOutputDir().convention(project.getLayout().getBuildDirectory().dir("GRAAL-META-INF"));
-            t.setGroup(GRAALPY_GRADLE_PLUGIN_TASK_GROUP);
-        });
-
+        TaskProvider<ResourcesTask> installPackagesTask = project.getTasks().register(GRAALPY_RESOURCES_TASK, ResourcesTask.class);
         installPackagesTask.configure(t -> {
             t.getIncludes().set(extension.getPythonHome().getIncludes());
             t.getExcludes().set(extension.getPythonHome().getExcludes());
@@ -104,19 +98,33 @@ public void apply(Project project) {
             t.setGroup(GRAALPY_GRADLE_PLUGIN_TASK_GROUP);
         });
 
+        TaskProvider<NativeImageConfigTask> generateManifestTask = project.getTasks().register(GRAALPY_NATIVE_IMAGE_CONFIG_TASK, NativeImageConfigTask.class);
+        project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME, t -> ((Jar) t).getMetaInf().from(generateManifestTask));
+        generateManifestTask.configure(t -> {
+            t.getManifestOutputDir().convention(project.getLayout().getBuildDirectory().dir("GRAAL-META-INF"));
+            t.setGroup(GRAALPY_GRADLE_PLUGIN_TASK_GROUP);
+        });
+
+        TaskProvider<VFSFilesListTask> generateVFSFilesListTask = project.getTasks().register(GRAALPY_VFS_FILESLIST_TASK, VFSFilesListTask.class);
+        generateVFSFilesListTask.configure(t -> {
+            t.getResourcesDir().convention((((ProcessResources) project.getTasks().getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME)).getDestinationDir()));
+            t.setGroup(GRAALPY_GRADLE_PLUGIN_TASK_GROUP);
+        });
+        project.getTasks().getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, t -> t.finalizedBy(GRAALPY_VFS_FILESLIST_TASK));
+
         project.afterEvaluate(p -> {
             checkAndAddDependencies();
 
-            if (!extension.getPythonResourcesDirectory().isPresent())
+            if (!extension.getPythonResourcesDirectory().isPresent()) {
                 ((ProcessResources) project.getTasks().getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME)).with(project.copySpec().from(installPackagesTask));
+            }
 
             // Provide the default value after the isPresent check, otherwise isPresent always returns true
             extension.getPythonResourcesDirectory().convention(project.getLayout().getBuildDirectory().dir(DEFAULT_WRAPPER_DIRECTORY));
         });
 
     }
 
-
     private void checkAndAddDependencies() {
         project.getDependencies().add(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, "%s:%s:%s".formatted(GRAALPY_GROUP_ID, PYTHON_LAUNCHER_ARTIFACT_ID, getGraalPyVersion(project)));
         project.getDependencies().add(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, "%s:%s:%s".formatted(GRAALPY_GROUP_ID, PYTHON_EMBEDDING_ARTIFACT_ID, getGraalPyVersion(project)));