42
42
43
43
import org .graalvm .python .dsl .GraalPyExtension ;
44
44
import org .graalvm .python .tasks .VFSFilesListTask ;
45
- import org .graalvm .python .tasks .NativeImageConfigTask ;
45
+ import org .graalvm .python .tasks .MetaInfTask ;
46
46
import org .graalvm .python .tasks .ResourcesTask ;
47
47
import org .gradle .api .GradleException ;
48
48
import org .gradle .api .Plugin ;
54
54
import org .gradle .jvm .tasks .Jar ;
55
55
import org .gradle .language .jvm .tasks .ProcessResources ;
56
56
57
+ import java .io .File ;
57
58
import java .util .Collections ;
58
59
import java .util .List ;
59
60
60
61
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
-
63
62
64
63
public abstract class GraalPyGradlePlugin implements Plugin <Project > {
65
64
private static final String PYTHON_LAUNCHER_ARTIFACT_ID = "python-launcher" ;
@@ -68,10 +67,10 @@ public abstract class GraalPyGradlePlugin implements Plugin<Project> {
68
67
private static final String PYTHON_COMMUNITY_ARTIFACT_ID = "python-community" ;
69
68
private static final String PYTHON_ARTIFACT_ID = "python" ;
70
69
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 " ;
73
72
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 " ;
75
74
private static final String GRAALPY_VFS_FILESLIST_TASK = "graalPyVFSFilesList" ;
76
75
77
76
@@ -105,9 +104,9 @@ public void apply(Project project) {
105
104
t .setGroup (GRAALPY_GRADLE_PLUGIN_TASK_GROUP );
106
105
});
107
106
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 -> {
111
110
t .getManifestOutputDir ().convention (project .getLayout ().getBuildDirectory ().dir (GRAALPY_META_INF_DIRECTORY ));
112
111
t .setGroup (GRAALPY_GRADLE_PLUGIN_TASK_GROUP );
113
112
});
0 commit comments