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

Jump to bottom

Remove newly added truffle dependencies & update jvmti-agent-base location #154

Merged
merged 2 commits into from
Jun 30, 2021
Merged

Remove newly added truffle dependencies & update jvmti-agent-base location #154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47eb85f
Remove newly added truffle dependencies & update jvmti-agent-base loc…
zakkak Jun 30, 2021
210dcd7
Add missing dependency svm-configure
zakkak Jun 30, 2021
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
15 changes: 11 additions & 4 deletions build.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,9 @@ static void removeDependencies(Tasks.FileReplace.Effects effects, Function<Path,
final List<String> 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",
Expand Down Expand Up @@ -1056,6 +1059,7 @@ class Maven
, "jvmti-agent-base"
, "svm-agent"
, "svm-diagnostics-agent"
, "svm-configure"
);

static final String INSTALL_FILE_VERSION = "2.4";
Expand Down Expand Up @@ -1083,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<String, Path> DISTS_PATHS = Map.ofEntries(
Expand All @@ -1095,9 +1100,10 @@ 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")),
new SimpleEntry<>("svm-configure", Path.of("substratevm", "mxbuild", "dists", "jdk11", "svm-configure"))
);

static final Map<String, Path> JDK_PATHS = Map.ofEntries(
Expand All @@ -1111,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;
Expand Down