changeset 10748:8abbfbe9fe9b

8191176: JavaFX Self-Contained Application fails with error "Failed to find library: jvm.dll" Reviewed-by: kcr
author vdrozdov
date Wed, 13 Dec 2017 16:46:23 -0800
parents 0deea70e9e23
children 570f0433e960
files modules/jdk.packager/src/main/java/jdk/packager/internal/legacy/builders/windows/WindowsAppImageBuilder.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/modules/jdk.packager/src/main/java/jdk/packager/internal/legacy/builders/windows/WindowsAppImageBuilder.java	Thu Dec 14 01:07:48 2017 +0530
+++ b/modules/jdk.packager/src/main/java/jdk/packager/internal/legacy/builders/windows/WindowsAppImageBuilder.java	Wed Dec 13 16:46:23 2017 -0800
@@ -285,7 +285,7 @@
         AtomicReference<IOException> ioe = new AtomicReference<>();
         final String finalVsVer = vsVer;
         try (Stream<Path> files = Files.list(runtimeDir.resolve("bin"))) {
-            files.filter(p -> Pattern.matches("(vcruntime|msvcp)\\d\\d\\d.dll", p.toFile().getName().toLowerCase()))
+            files.filter(p -> Pattern.matches("^(vcruntime|msvcp|msvcr|ucrtbase|api-ms-win-).*\\.dll$", p.toFile().getName().toLowerCase()))
                  .filter(p -> !p.toString().toLowerCase().endsWith(finalVsVer + ".dll"))
                  .forEach(p -> {
                     try {