Skip to content

Commit 4a51452

Browse files
tomasstupkatomasstupka
committed
extract from o.graavlm.python.embedding those parts which are used only in polyglot app build time (by graalpy-maven-plugin)
1 parent 9b83dbd commit 4a51452

File tree

10 files changed

+53
-19
lines changed

10 files changed

+53
-19
lines changed

‎graalpython/graalpy-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ SOFTWARE.
108108

109109
<dependency>
110110
<groupId>org.graalvm.python</groupId>
111-
<artifactId>python-embedding</artifactId>
111+
<artifactId>python-embedding-tools</artifactId>
112112
<version>${graalpy.version}</version>
113113
</dependency>
114114
<dependency>

‎graalpython/graalpy-maven-plugin/src/main/java/org/graalvm/python/maven/plugin/ManageResourcesMojo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@
4747
import org.apache.maven.plugin.AbstractMojo;
4848
import org.apache.maven.plugin.MojoExecutionException;
4949
import org.apache.maven.plugin.logging.Log;
50+
5051
import org.apache.maven.plugins.annotations.*;
5152
import org.apache.maven.project.*;
5253
import org.eclipse.aether.graph.Dependency;
53-
import org.graalvm.python.embedding.utils.GraalPyRunner;
54-
import org.graalvm.python.embedding.utils.VFSUtils;
54+
import org.graalvm.python.embedding.tools.exec.GraalPyRunner;
55+
import org.graalvm.python.embedding.tools.vfs.VFSUtils;
5556

5657
import java.io.File;
5758
import java.io.FileWriter;

‎graalpython/graalpy-maven-plugin/src/main/java/org/graalvm/python/maven/plugin/MavenDelegateLog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -41,7 +41,7 @@
4141
package org.graalvm.python.maven.plugin;
4242

4343
import org.apache.maven.plugin.logging.Log;
44-
import org.graalvm.python.embedding.utils.SubprocessLog;
44+
import org.graalvm.python.embedding.tools.exec.SubprocessLog;
4545

4646
final class MavenDelegateLog implements SubprocessLog {
4747
private final Log delegate;

‎graalpython/org.graalvm.python.embedding.tools/src/META-INF/jbang-integration.list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.graalvm.python.embedding.tools.jbang.JBangIntegration

‎graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/GraalPyRunner.java renamed to ‎graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/exec/GraalPyRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package org.graalvm.python.embedding.utils;
41+
package org.graalvm.python.embedding.tools.exec;
4242

4343
import java.io.BufferedReader;
4444
import java.io.File;

‎graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/SubprocessLog.java renamed to ‎graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/exec/SubprocessLog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package org.graalvm.python.embedding.utils;
41+
package org.graalvm.python.embedding.tools.exec;
4242

4343
public interface SubprocessLog {
4444

‎graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/jbang/JBangIntegration.java renamed to ‎graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/jbang/JBangIntegration.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
* SOFTWARE.
4040
*/
4141

42-
package org.graalvm.python.embedding.jbang;
42+
package org.graalvm.python.embedding.tools.jbang;
4343

44-
import org.graalvm.python.embedding.utils.SubprocessLog;
45-
import org.graalvm.python.embedding.utils.VFSUtils;
46-
import org.graalvm.python.embedding.utils.GraalPyRunner;
44+
import org.graalvm.python.embedding.tools.exec.GraalPyRunner;
45+
import org.graalvm.python.embedding.tools.exec.SubprocessLog;
46+
import org.graalvm.python.embedding.tools.vfs.VFSUtils;
4747

4848
import java.io.File;
4949
import java.io.FileWriter;

‎graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/VFSUtils.java renamed to ‎graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/vfs/VFSUtils.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -38,7 +38,10 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package org.graalvm.python.embedding.utils;
41+
package org.graalvm.python.embedding.tools.vfs;
42+
43+
import org.graalvm.python.embedding.tools.exec.GraalPyRunner;
44+
import org.graalvm.python.embedding.tools.exec.SubprocessLog;
4245

4346
import java.io.File;
4447
import java.io.FileWriter;

‎graalpython/org.graalvm.python.embedding/src/META-INF/jbang-integration.list

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎mx.graalpython/suite.py

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,13 @@
326326
"javaCompliance": "17+",
327327
"checkstyle": "com.oracle.graal.python",
328328
},
329+
"org.graalvm.python.embedding.tools": {
330+
"subDir": "graalpython",
331+
"sourceDirs": ["src"],
332+
"jacoco": "include",
333+
"javaCompliance": "17+",
334+
"checkstyle": "com.oracle.graal.python",
335+
},
329336

330337
"com.oracle.graal.python.annotations": {
331338
"subDir": "graalpython",
@@ -918,12 +925,11 @@
918925
"name": "org.graalvm.python.embedding",
919926
"exports": [
920927
"org.graalvm.python.embedding.utils",
921-
"org.graalvm.python.embedding.jbang",
922928
]
923929
},
924930
"useModulePath": True,
925931
"dependencies": [
926-
"org.graalvm.python.embedding",
932+
"org.graalvm.python.embedding"
927933
],
928934
"distDependencies": [
929935
"sdk:POLYGLOT",
@@ -935,6 +941,30 @@
935941
"tag": ["default", "public"],
936942
},
937943

944+
},
945+
"GRAALPYTHON_EMBEDDING_TOOLS" : {
946+
"moduleInfo": {
947+
"name": "org.graalvm.python.embedding.tools",
948+
"exports": [
949+
"org.graalvm.python.embedding.tools.vfs",
950+
"org.graalvm.python.embedding.tools.exec",
951+
"org.graalvm.python.embedding.tools.jbang",
952+
]
953+
},
954+
"useModulePath": True,
955+
"dependencies": [
956+
"org.graalvm.python.embedding.tools",
957+
],
958+
"distDependencies": [
959+
"sdk:POLYGLOT",
960+
],
961+
"description": "GraalPy Embedding Tools",
962+
"maven": {
963+
"groupId": "org.graalvm.python",
964+
"artifactId": "python-embedding-tools",
965+
"tag": ["default", "public"],
966+
},
967+
938968
},
939969

940970
"GRAALPYTHON-LAUNCHER": {
@@ -1430,8 +1460,8 @@
14301460
"subDir": "graalpython",
14311461
"noMavenJavadoc": True,
14321462
"dependencies": [
1433-
"GRAALPYTHON_EMBEDDING",
1434-
"GRAALPYTHON-LAUNCHER"
1463+
"GRAALPYTHON-LAUNCHER",
1464+
"GRAALPYTHON_EMBEDDING_TOOLS",
14351465
],
14361466
"maven": {
14371467
"tag": ["default", "public"],

0 commit comments

Comments
 (0)