equal
deleted
inserted
replaced
25 package jdk.jpackage.test; |
25 package jdk.jpackage.test; |
26 |
26 |
27 |
27 |
28 import java.nio.file.Path; |
28 import java.nio.file.Path; |
29 import java.util.spi.ToolProvider; |
29 import java.util.spi.ToolProvider; |
30 import jdk.incubator.jpackage.ToolProviderFactory; |
|
31 |
30 |
32 public enum JavaTool { |
31 public enum JavaTool { |
33 JAVA("java"), JAVAC("javac"), JPACKAGE("jpackage"), JAR("jar"), JLINK("jlink"); |
32 JAVA("java"), JAVAC("javac"), JPACKAGE("jpackage"), JAR("jar"), JLINK("jlink"); |
34 |
33 |
35 JavaTool(String name) { |
34 JavaTool(String name) { |
45 Path getPath() { |
44 Path getPath() { |
46 return path; |
45 return path; |
47 } |
46 } |
48 |
47 |
49 public ToolProvider asToolProvider() { |
48 public ToolProvider asToolProvider() { |
50 if (this == JPACKAGE) { |
49 return ToolProvider.findFirst(name).orElse(null); |
51 return ToolProviderFactory.findFirst("jpackage").orElseThrow( |
|
52 () -> new RuntimeException("jpackage tool not found")); |
|
53 } else { |
|
54 return ToolProvider.findFirst(name).orElse(null); |
|
55 } |
|
56 } |
50 } |
57 |
51 |
58 Path relativePathInJavaHome() { |
52 Path relativePathInJavaHome() { |
59 Path path = Path.of("bin", name); |
53 Path path = Path.of("bin", name); |
60 if (TKit.isWindows()) { |
54 if (TKit.isWindows()) { |