Skip to content

Commit 25f5d73

Browse files
tomasstupkaelkorchi
authored andcommitted
generate graalpy resources and meta-inf into build/generated/graalpy
(cherry picked from commit c6f71cf)
1 parent ebf62cd commit 25f5d73

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
import org.graalvm.python.dsl.GraalPyExtension;
4444
import org.graalvm.python.tasks.VFSFilesListTask;
45-
import org.graalvm.python.tasks.NativeImageConfigTask;
45+
import org.graalvm.python.tasks.MetaInfTask;
4646
import org.graalvm.python.tasks.ResourcesTask;
4747
import org.gradle.api.GradleException;
4848
import org.gradle.api.Plugin;
@@ -54,12 +54,11 @@
5454
import org.gradle.jvm.tasks.Jar;
5555
import org.gradle.language.jvm.tasks.ProcessResources;
5656

57+
import java.io.File;
5758
import java.util.Collections;
5859
import java.util.List;
5960

6061
import static org.graalvm.python.embedding.tools.vfs.VFSUtils.GRAALPY_GROUP_ID;
61-
import static org.graalvm.python.embedding.tools.vfs.VFSUtils.VFS_ROOT;
62-
6362

6463
public abstract class GraalPyGradlePlugin implements Plugin<Project> {
6564
private static final String PYTHON_LAUNCHER_ARTIFACT_ID = "python-launcher";
@@ -68,10 +67,10 @@ public abstract class GraalPyGradlePlugin implements Plugin<Project> {
6867
private static final String PYTHON_COMMUNITY_ARTIFACT_ID = "python-community";
6968
private static final String PYTHON_ARTIFACT_ID = "python";
7069
private static final String GRAALPY_GRADLE_PLUGIN_TASK_GROUP = "graalPy";
71-
private static final String DEFAULT_RESOURCES_DIRECTORY = "graalpy-resources";
72-
private static final String GRAALPY_META_INF_DIRECTORY = "graalpy-meta-inf";
70+
private static final String DEFAULT_RESOURCES_DIRECTORY = "generated" + File.separator + "graalpy" + File.separator + "resources";
71+
private static final String GRAALPY_META_INF_DIRECTORY = "generated" + File.separator + "graalpy" + File.separator + "META-INF";
7372
private static final String GRAALPY_RESOURCES_TASK = "graalPyResources";
74-
private static final String GRAALPY_NATIVE_IMAGE_CONFIG_TASK = "graalPyNativeImageConfig";
73+
private static final String GRAALPY_META_INF_TASK_TASK = "graalPyMetaInf";
7574
private static final String GRAALPY_VFS_FILESLIST_TASK = "graalPyVFSFilesList";
7675

7776

@@ -105,9 +104,9 @@ public void apply(Project project) {
105104
t.setGroup(GRAALPY_GRADLE_PLUGIN_TASK_GROUP);
106105
});
107106

108-
TaskProvider<NativeImageConfigTask> nativeImageConfigTask = project.getTasks().register(GRAALPY_NATIVE_IMAGE_CONFIG_TASK, NativeImageConfigTask.class);
109-
project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME, t -> ((Jar) t).getMetaInf().from(nativeImageConfigTask));
110-
nativeImageConfigTask.configure(t -> {
107+
TaskProvider<MetaInfTask> metaInfTask = project.getTasks().register(GRAALPY_META_INF_TASK_TASK, MetaInfTask.class);
108+
project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME, t -> ((Jar) t).getMetaInf().from(metaInfTask));
109+
metaInfTask.configure(t -> {
111110
t.getManifestOutputDir().convention(project.getLayout().getBuildDirectory().dir(GRAALPY_META_INF_DIRECTORY));
112111
t.setGroup(GRAALPY_GRADLE_PLUGIN_TASK_GROUP);
113112
});
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import org.gradle.api.tasks.TaskAction;
4949
import java.io.IOException;
5050

51-
public abstract class NativeImageConfigTask extends DefaultTask {
51+
public abstract class MetaInfTask extends DefaultTask {
5252

5353
private static final String GRAALPY_GRADLE_PLUGIN_ARTIFACT_ID = "graalpy-gradle-plugin";
5454

0 commit comments

Comments
 (0)