From 47eb85f6156bec74c34ee73e6f6258727c47a4b7 Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Wed, 30 Jun 2021 13:39:33 +0300 Subject: [PATCH 1/2] Remove newly added truffle dependencies & update jvmti-agent-base location https://github.com/oracle/graal/commit/1e639c93bdd56031fffc8b45f48bde3ec4f6fb11 introduces some more dependencies on Truffle that Mandrel doesn't really depend on https://github.com/oracle/graal/commit/d81403ae7725610dc809b1d9a61797b15f5632de change the location of the jvmti-agent-base.jar Both changes were part of https://github.com/oracle/graal/pull/3446 --- build.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build.java b/build.java index 9e4aca88..365a3030 100644 --- a/build.java +++ b/build.java @@ -799,6 +799,9 @@ static void removeDependencies(Tasks.FileReplace.Effects effects, Function dependencies = Arrays.asList( "truffle:TRUFFLE_NFI", "com.oracle.svm.truffle", + "com.oracle.svm.truffle.api to org.graalvm.truffle", + "com.oracle.truffle.api.TruffleLanguage.Provider", + "com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider", "com.oracle.svm.polyglot", "truffle:TRUFFLE_API", "com.oracle.svm.truffle.nfi", @@ -1095,9 +1098,9 @@ class Maven new SimpleEntry<>("compiler", Path.of("compiler", "mxbuild", "dists", "jdk11", "graal")), new SimpleEntry<>("objectfile", Path.of("substratevm", "mxbuild", "dists", "jdk11", "objectfile")), new SimpleEntry<>("svm-driver", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-driver")), - new SimpleEntry<>("jvmti-agent-base", Path.of("substratevm", "mxbuild", "dists", "jdk1.8", "jvmti-agent-base")), + new SimpleEntry<>("jvmti-agent-base", Path.of("substratevm", "mxbuild", "dists", "jdk11", "jvmti-agent-base")), new SimpleEntry<>("svm-agent", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-agent")), - new SimpleEntry<>("svm-diagnostics-agent", Path.of("substratevm", "mxbuild", "dists", "jdk1.8", "svm-diagnostics-agent")) + new SimpleEntry<>("svm-diagnostics-agent", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-diagnostics-agent")) ); static final Map JDK_PATHS = Map.ofEntries( From 210dcd77871a088f86e87df5e16278b6dc840313 Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Wed, 30 Jun 2021 14:29:59 +0300 Subject: [PATCH 2/2] Add missing dependency svm-configure As per https://github.com/oracle/graal/commit/3a2e72a083994739e341d3f155c7b102546b22ce --- build.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build.java b/build.java index 365a3030..78a760ca 100644 --- a/build.java +++ b/build.java @@ -1059,6 +1059,7 @@ class Maven , "jvmti-agent-base" , "svm-agent" , "svm-diagnostics-agent" + , "svm-configure" ); static final String INSTALL_FILE_VERSION = "2.4"; @@ -1086,7 +1087,8 @@ class Maven new SimpleEntry<>("svm-driver", "org.graalvm.nativeimage"), new SimpleEntry<>("jvmti-agent-base", "org.graalvm.nativeimage"), new SimpleEntry<>("svm-agent", "org.graalvm.nativeimage"), - new SimpleEntry<>("svm-diagnostics-agent", "org.graalvm.nativeimage") + new SimpleEntry<>("svm-diagnostics-agent", "org.graalvm.nativeimage"), + new SimpleEntry<>("svm-configure", "org.graalvm.nativeimage") ); static final Map DISTS_PATHS = Map.ofEntries( @@ -1100,7 +1102,8 @@ class Maven new SimpleEntry<>("svm-driver", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-driver")), new SimpleEntry<>("jvmti-agent-base", Path.of("substratevm", "mxbuild", "dists", "jdk11", "jvmti-agent-base")), new SimpleEntry<>("svm-agent", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-agent")), - new SimpleEntry<>("svm-diagnostics-agent", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-diagnostics-agent")) + new SimpleEntry<>("svm-diagnostics-agent", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-diagnostics-agent")), + new SimpleEntry<>("svm-configure", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-configure")) ); static final Map JDK_PATHS = Map.ofEntries( @@ -1114,7 +1117,8 @@ class Maven new SimpleEntry<>("svm-driver", Path.of("lib", "graalvm", "svm-driver")), new SimpleEntry<>("jvmti-agent-base", Path.of("lib", "graalvm", "jvmti-agent-base")), new SimpleEntry<>("svm-agent", Path.of("lib", "graalvm", "svm-agent")), - new SimpleEntry<>("svm-diagnostics-agent", Path.of("lib", "graalvm", "svm-diagnostics-agent")) + new SimpleEntry<>("svm-diagnostics-agent", Path.of("lib", "graalvm", "svm-diagnostics-agent")), + new SimpleEntry<>("svm-configure", Path.of("lib", "graalvm", "svm-configure")) ); final Path mvn;