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.

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

[23.1] Install *src.zip for svm-foreign.jar #401

Merged
merged 2 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/workflows/buildJDK.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@ jobs:
mkdir -p ${JAVA_HOME}
tar xf jdk.tar.gz -C ${JAVA_HOME} --strip-components=1
tar xf jdk-static-libs.tar.gz -C ${JAVA_HOME} --strip-components=1
# work-around for https://github.com/adoptium/temurin-build/issues/3602
pushd ${MAC_JAVA_HOME}
if [ -e lib/static/darwin-arm64 ]; then
mv lib/static/darwin-arm64 lib/static/darwin-amd64
fi
popd
echo ${MAC_JAVA_HOME}
${MAC_JAVA_HOME}/bin/java --version
- name: Build Mandrel JDK
Expand Down
8 changes: 3 additions & 5 deletions build.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ public static void main(String... args) throws IOException
FileSystem.copy(mandrelRepo.resolve(
Path.of("sdk", "mxbuild", PLATFORM, IS_WINDOWS ? "native-image.exe.image-bash" : "native-image.image-bash",
IS_WINDOWS ? "native-image.cmd" : "native-image")), nativeImage);
logger.debugf("Copy svm-preview...");
final Path svmForeign = mandrelJavaHome.resolve(Path.of("lib", "svm-preview", "builder", "svm-foreign.jar"));
FileSystem.copy(mandrelRepo.resolve(
Path.of("substratevm", "mxbuild", JDK_VERSION, "dists", JDK_VERSION, "svm-foreign.jar")), svmForeign);
}

if (!options.skipNative)
Expand Down Expand Up @@ -969,7 +965,9 @@ 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:svm-foreign.jar",
new Path[]{substrateDistPath.resolve("svm-foreign.jar"), Path.of("lib", "svm-preview", "builder", "svm-foreign.jar")})
);

macroPaths = Map.ofEntries(
Expand Down
Loading