Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly build graal-sdk and add nativeimage, word and collections #359

Closed
wants to merge 1 commit into from
+10 −2
Closed

Explicitly build graal-sdk and add nativeimage, word and collections #359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions build.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ class Mx
Pattern.compile("\"version\"\\s*:\\s*\"([0-9.]*)\"");

static final List<BuildArgs> BUILD_JAVA_STEPS = List.of(
BuildArgs.of("--no-native", "--dependencies", "SVM,SVM_DRIVER,SVM_AGENT,SVM_DIAGNOSTICS_AGENT")
BuildArgs.of("--no-native", "--dependencies", "GRAAL_SDK,SVM,SVM_DRIVER,SVM_AGENT,SVM_DIAGNOSTICS_AGENT")
, BuildArgs.of("--only",
build.IS_WINDOWS ?
"native-image.exe.image-bash," +
Expand Down Expand Up @@ -903,7 +903,13 @@ class Mx
new SimpleEntry<>("org.graalvm.nativeimage:svm-diagnostics-agent.jar",
new Path[]{substrateDistPath.resolve("svm-diagnostics-agent.jar"), Path.of("lib", "graalvm", "svm-diagnostics-agent.jar")}),
new SimpleEntry<>("org.graalvm.nativeimage:svm-configure.jar",
new Path[]{substrateDistPath.resolve("svm-configure.jar"), Path.of("lib", "graalvm", "svm-configure.jar")})
new Path[]{substrateDistPath.resolve("svm-configure.jar"), Path.of("lib", "graalvm", "svm-configure.jar")}),
new SimpleEntry<>("org.graalvm.nativeimage:nativeimage.jar",
new Path[]{sdkDistPath.resolve("nativeimage.jar"), Path.of("lib", "jvmci", "nativeimage.jar")}),
new SimpleEntry<>("org.graalvm.word:word.jar",
new Path[]{sdkDistPath.resolve("word.jar"), Path.of("lib", "jvmci", "word.jar")}),
new SimpleEntry<>("org.graalvm.word:collections.jar",
new Path[]{sdkDistPath.resolve("collections.jar"), Path.of("lib", "jvmci", "collections.jar")})
);

macroPaths = Map.ofEntries(
Expand Down Expand Up @@ -1168,6 +1174,8 @@ static void patchSuites(Tasks.FileReplace.Effects effects, Path mandrelRepo)
path = mandrelRepo.resolve(suitePy);
dependenciesToPatch = Map.of(
// Mandrel doesn't use polyglot
"^ +\"sdk:POLYGLOT\",", "",
"^ +\"transitive org.graalvm.polyglot\",", "",
Comment on lines +1177 to +1178
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to break deployment of the graal-sdk artefact which has polyglot as one of its dependencies. I'm proposing an alternative fix in #360

"^ +\"org.graalvm.polyglot\",", "",
"^ +\"org.graalvm.polyglot.proxy\",", "",
"^ +\"org.graalvm.polyglot.io\",", "",
Expand Down