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

Account for split of graal-sdk artefact #360

Merged
merged 1 commit into from
Sep 4, 2023
Merged

Account for split of graal-sdk artefact #360

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
10 changes: 9 additions & 1 deletion 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", "SVM,GRAAL_SDK,SVM_DRIVER,SVM_AGENT,SVM_DIAGNOSTICS_AGENT")
, BuildArgs.of("--only",
build.IS_WINDOWS ?
"native-image.exe.image-bash," +
Expand Down Expand Up @@ -880,6 +880,13 @@ class Mx
artifacts = Map.ofEntries(
new SimpleEntry<>("org.graalvm.sdk:graal-sdk.jar",
new Path[]{sdkDistPath.resolve("graal-sdk.jar"), Path.of("lib", "jvmci", "graal-sdk.jar")}),
// See https://github.com/oracle/graal/pull/7171 which split sdk jar into separate modules
new SimpleEntry<>("org.graalvm.sdk:nativeimage.jar",
new Path[]{sdkDistPath.resolve("nativeimage.jar"), Path.of("lib", "jvmci", "nativeimage.jar")}),
new SimpleEntry<>("org.graalvm.sdk:collections.jar",
new Path[]{sdkDistPath.resolve("collections.jar"), Path.of("lib", "jvmci", "collections.jar")}),
new SimpleEntry<>("org.graalvm.sdk:word.jar",
new Path[]{sdkDistPath.resolve("word.jar"), Path.of("lib", "jvmci", "word.jar")}),
new SimpleEntry<>("org.graalvm.nativeimage:svm.jar",
new Path[]{substrateDistPath.resolve("svm.jar"), Path.of("lib", "svm", "builder", "svm.jar")}),
new SimpleEntry<>("org.graalvm.nativeimage:native-image-base.jar",
Expand Down Expand Up @@ -1172,6 +1179,7 @@ static void patchSuites(Tasks.FileReplace.Effects effects, Path mandrelRepo)
"^ +\"org.graalvm.polyglot.proxy\",", "",
"^ +\"org.graalvm.polyglot.io\",", "",
"^ +\"org.graalvm.polyglot.management\",", "",
"^ +\"org.graalvm.options\",", "",
"^ +\"org.graalvm.polyglot.impl to org.graalvm.truffle, com.oracle.truffle.enterprise\",", "",
"^ +\"org.graalvm.polyglot.impl.AbstractPolyglotImpl\"", "",
"^ +\"org.graalvm.polyglot to org.graalvm.truffle\"", "");
Expand Down