Skip to content

Fix native-image-maven-plugin for Windows #2596

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

Merged
merged 1 commit into from
Jun 23, 2020
Merged

Fix native-image-maven-plugin for Windows #2596

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/OS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ public String asPackageName() {
return name().toLowerCase();
}

public boolean isCurrent() {
return getCurrent() == this;
}

private static OS findCurrent() {
final String name = System.getProperty("os.name");
if (name.equals("Linux")) {
Expand Down
11 changes: 2 additions & 9 deletions ...m/src/native-image-maven-plugin/src/main/java/com/oracle/substratevm/NativeImageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public void execute() throws MojoExecutionException {
addClasspath(project.getArtifact());
String classpathStr = classpath.stream().map(Path::toString).collect(Collectors.joining(File.pathSeparator));

Path nativeImageExecutable = getMojoJavaHome().resolve("bin").resolve(withExeSuffix("native-image"));
Path nativeImageExecutable = getMojoJavaHome().resolve("bin").resolve("native-image" + (OS.WINDOWS.isCurrent() ? ".cmd" : ""));
if (Files.isExecutable(nativeImageExecutable)) {
String nativeImageExecutableVersion = "Unknown";
Process versionCheckProcess = null;
Expand Down Expand Up @@ -268,13 +268,6 @@ public void execute() throws MojoExecutionException {
}
}

private String withExeSuffix(String basename) {
if (OS.getCurrent() == OS.WINDOWS) {
return basename + ".exe";
}
return basename;
}

private void addClasspath(Artifact artifact) throws MojoExecutionException {
if (!"jar".equals(artifact.getType())) {
getLog().warn("Ignoring non-jar type ImageClasspath Entry " + artifact);
Expand Down Expand Up @@ -421,7 +414,7 @@ public Path getJavaHome() {

@Override
public Path getJavaExecutable() {
return getJavaHome().resolve("bin").resolve(withExeSuffix("java"));
return getJavaHome().resolve("bin").resolve("java" + (OS.WINDOWS.isCurrent() ? ".exe" : ""));
}

private List<Path> getSelectedArtifactPaths(String groupId, String... artifactIds) {
Expand Down