--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java Wed Feb 20 14:01:37 2019 -0500
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinAppBundler.java Mon Feb 25 08:21:37 2019 -0500
@@ -102,23 +102,9 @@
I18N.getString("error.no-windows-resources.advice"));
}
- // validate runtime bit-architectire
- testRuntimeBitArchitecture(p);
-
return true;
}
- private static void testRuntimeBitArchitecture(
- Map<String, ? super Object> params) throws ConfigException {
-
- if ((BIT_ARCH_64.fetchFrom(params) !=
- BIT_ARCH_64_RUNTIME.fetchFrom(params))) {
- throw new ConfigException(
- I18N.getString("error.bit-architecture-mismatch"),
- I18N.getString("error.bit-architecture-mismatch.advice"));
- }
- }
-
private static boolean usePredefineAppName(Map<String, ? super Object> p) {
return (PREDEFINED_APP_IMAGE.fetchFrom(p) != null);
}
@@ -231,36 +217,6 @@
}
}
- private static final String RUNTIME_AUTO_DETECT = ".runtime.autodetect";
-
- public static void extractFlagsFromRuntime(
- Map<String, ? super Object> params) {
- if (params.containsKey(".runtime.autodetect")) return;
-
- params.put(RUNTIME_AUTO_DETECT, "attempted");
-
- String commandline;
- File runtimePath = JLinkBundlerHelper.getJDKHome(params).toFile();
- File launcherPath = new File(runtimePath, "bin\\java.exe");
-
- ProcessBuilder pb =
- new ProcessBuilder(launcherPath.getAbsolutePath(), "-version");
- try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
- try (PrintStream pout = new PrintStream(baos)) {
- IOUtils.exec(pb, Log.isDebug(), true, pout);
- }
-
- commandline = baos.toString();
- } catch (IOException e) {
- e.printStackTrace();
- params.put(RUNTIME_AUTO_DETECT, "failed");
- return;
- }
-
- AbstractImageBundler.extractFlagsFromVersion(params, commandline);
- params.put(RUNTIME_AUTO_DETECT, "succeeded");
- }
-
@Override
public String getName() {
return I18N.getString("app.bundler.name");