build.gradle

@@ -2484,9 +2484,7 @@ project(":web") {
             exec {
                 commandLine("$JAVAH", "-J-Djava.ext.dirs=", "-d", "$dest",
                             "-classpath", "${classpath.asPath}");
-                args("java.lang.Character",
-                     "java.net.IDN",
-                     "com.sun.webkit.ContextMenu",
+                args("com.sun.webkit.ContextMenu",
                      "com.sun.webkit.ContextMenuItem",
                      "com.sun.webkit.CursorManager",
                      "com.sun.webkit.PageCache",
@@ -2512,6 +2510,7 @@ project(":web") {
                      "com.sun.webkit.WCFrameView",
                      "com.sun.webkit.WCPasteboard",
                      "com.sun.webkit.WCPluginWidget",
+                     "com.sun.webkit.dom.CharacterDataImpl",
                      "com.sun.webkit.dom.JSObject",
                      "com.sun.webkit.network.SocketStreamHandle",
                      "com.sun.webkit.network.URLLoader",
@@ -2531,12 +2530,15 @@ project(":web") {
         def webkitOutputDir = cygpath("$buildDir/${t.name}")
         def webkitConfig = IS_DEBUG_NATIVE ? "Debug" : "Release"
 
+        File nativeBuildDir = new File("${webkitOutputDir}")
+        nativeBuildDir.mkdirs()
+
         def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
             println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
 
             exec {
-                workingDir("$projectDir/src/main/native")
-                commandLine("perl", "Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
+                workingDir("$webkitOutputDir")
+                commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
                 environment(["WEBKIT_OUTPUTDIR" : webkitOutputDir])
             }
 
@@ -2557,11 +2559,13 @@ project(":web") {
                      */
                     // args("--icu-unicode")
                 } else if (t.name == "mac") {
-                    // JFX WebKit needs atleast 10.9 OSX
-                    cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
+                    cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
                 } else if (t.name == "linux") {
-                    if (!IS_64) {
-                        cmakeArgs = "-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
+                    cmakeArgs = "-DCMAKE_SYSTEM_NAME=Linux"
+                    if (IS_64) {
+                        cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=x86_64"
+                    } else {
+                        cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=i586 -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
                     }
                 } else if (t.name.startsWith("arm")) {
                     fail("ARM target is not supported as of now.")
@@ -2577,6 +2581,7 @@ project(":web") {
                 environment([
                     "JAVA_HOME"       : JDK_HOME,
                     "WEBKIT_OUTPUTDIR" : webkitOutputDir,
+                    "PYTHONDONTWRITEBYTECODE" : "1",
                 ])
 
                 def targetCpuBitDepthSwitch = ""
@@ -2586,7 +2591,7 @@ project(":web") {
                     targetCpuBitDepthSwitch = "--32-bit"
                 }
 
-                commandLine("perl", "Tools/Scripts/build-webkit",
+                commandLine("perl", "$projectDir/src/main/native/Tools/Scripts/build-webkit",
                     "--java", "--icu-unicode", targetCpuBitDepthSwitch,
                     "--cmakeargs=${cmakeArgs}")
             }

build.properties

@@ -40,10 +40,10 @@ jfx.release.milestone=ea
 jfx.release.suffix=-ea
 
 # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
-jfx.release.name=8u161
+jfx.release.name=8u171
 jfx.release.major.version=8
 jfx.release.minor.version=0
-jfx.release.micro.version=161
+jfx.release.micro.version=171
 
 ##############################################################################
 #

buildSrc/mac.gradle

 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,12 +46,12 @@ MAC.libDest = "lib"
  * In extreme cases you can provide your own properties in your home dir to
  * override these settings or pass them on the command line.
  */
-def prefSdkVersion = "10.9"
+def prefSdkVersion = "10.11"
 def defaultSdkPath = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${prefSdkVersion}.sdk";
 
 // Set the minimum API version that we require (developers do not need to override this)
 // Note that this is not necessarily the same as the preferred SDK version
-defineProperty("MACOSX_MIN_VERSION", "10.7");
+defineProperty("MACOSX_MIN_VERSION", "10.10");
 
 // Create $buildDir/mac_tools.properties file and load props from it
 setupTools("mac_tools",
@@ -99,9 +99,11 @@ if (!file(MACOSX_SDK_PATH).isDirectory()) {
     throw new GradleException("FAIL: Cannot find $MACOSX_SDK_PATH")
 }
 
+// NOTE: There is no space between -iframework and the specified path
 def commonParams = [
         "-mmacosx-version-min=$MACOSX_MIN_VERSION",
         "-isysroot", "$MACOSX_SDK_PATH",
+        "-iframework$MACOSX_SDK_PATH/System/Library/Frameworks",
         "-arch", "x86_64"]
 
 def ccBaseFlags = [
@@ -126,8 +128,8 @@ def linkFlags = [
         "-dynamiclib", "-lobjc"].flatten();
 
 
-def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "gcc";
-def linker = IS_COMPILE_PARFAIT ? "parfait-g++" : "g++";
+def compiler = IS_COMPILE_PARFAIT ? "parfait-clang" : "clang";
+def linker = IS_COMPILE_PARFAIT ? "parfait-clang++" : "clang++";
 
 MAC.glass = [:]
 MAC.glass.javahInclude = [
@@ -182,10 +184,7 @@ MAC.launcherlibrary.ccFlags = [
         "-c",
         ccBaseFlags,
         IS_DEBUG_NATIVE ? ["-DDEBUG", "-O0"] : ["-O3", "-DNDEBUG"]].flatten()
-// 10.7 doesn't have libstdc++ as an option for stdlib, so filter it out
-if (!(MACOSX_MIN_VERSION in ['10.7', '10.8'])) {
     MAC.launcherlibrary.ccFlags += "-stdlib=libstdc++"
-}
 MAC.launcherlibrary.linker = linker
 MAC.launcherlibrary.linkFlags = ["-ldl", "-dynamiclib",
         "-framework", "Cocoa",
@@ -239,6 +238,8 @@ MAC.fontT2K.linkFlags = [linkFlags].flatten()
 MAC.fontT2K.lib = "javafx_font_t2k"
 
 MAC.media = [:]
-MAC.media.compiler = compiler
-MAC.media.linker = linker
+MAC.media.compiler = "${compiler} ${ccBaseFlags.join(" ")}"
+//MAC.media.ccFlags = ccBaseFlags
+MAC.media.linker = "${linker} ${commonParams.join(" ")}"
+//MAC.media.linkFlags = commonParams
 MAC.media.lib = "libtool"

debian/changelog

+openjfx (8u171-b11-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Emmanuel Bourg ]
+  * New upstream release:
+    - Refreshed the patches
+  * Standards-Version updated to 4.1.4
+  * Use salsa.debian.org Vcs-* URLs
+
+  [ Peter Michael Green ]
+  * Disable JIT on sub-armv7 (armel/raspbian), it fails to build
+    there with assembler errors (Closes: #895469)
+  * Fix some uint16/char16 issues in javascriptcore
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 11 Jun 2018 22:05:32 +0200
+
 openjfx (8u161-b12-1) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -41,9 +41,9 @@ Build-Depends: antlr3,
                ruby,
                x11proto-core-dev,
                x11proto-xf86vidmode-dev
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/openjfx.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/openjfx.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/openjfx.git
+Vcs-Browser: https://salsa.debian.org/java-team/openjfx
 Homepage: http://openjdk.java.net/projects/openjfx/
 
 Package: openjfx

debian/patches/07-disable-assembler-on-unsupported-archs.patch

@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: no
 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -360,6 +360,12 @@
+@@ -365,6 +365,12 @@
  #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
  #endif
  

debian/patches/10-javadoc-locale.patch

@@ -11,7 +11,7 @@ Forwarded: no
          options.addBooleanOption("XDignore.symbol.file").setValue(true);
          options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
          options.addBooleanOption("javafx").setValue(true);
-@@ -2731,6 +2732,7 @@
+@@ -2736,6 +2737,7 @@
      options.windowTitle("${javadocTitle}")
      options.header("${javadocHeader}")
      options.bottom("${javadocBottom}")

debian/patches/19-disable-webkit-sampling-profiler.patch

@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
 --- a/modules/web/src/main/native/Source/cmake/WebKitFeatures.cmake
 +++ b/modules/web/src/main/native/Source/cmake/WebKitFeatures.cmake
-@@ -163,7 +163,7 @@
+@@ -161,7 +161,7 @@
      WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" PRIVATE OFF)
      WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_USAGE "Toggle resource usage support" PRIVATE OFF)
      WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
 -    WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE ON)
 +    WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE OFF)
      WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" PRIVATE OFF)
+     WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_WORKER "Toggle ServiceWorker support" PRIVATE OFF)
      WEBKIT_OPTION_DEFINE(ENABLE_SMOOTH_SCROLLING "Toggle smooth scrolling" PRIVATE OFF)
-     WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" PRIVATE OFF)

debian/patches/21-gcc7-compatibility.patch

 Description: Fixes the compilation errors with GCC 7
 Origin: backport, http://trac.webkit.org/changeset/217601/webkit
                   http://trac.webkit.org/changeset/218488/webkit
---- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-+++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-@@ -38,7 +38,9 @@
- define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name")
- 
- if (COMPILER_IS_GCC_OR_CLANG)
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
- endif ()
---- a/modules/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-+++ b/modules/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-@@ -28,6 +28,7 @@
- 
- #include "InspectorFrontendRouter.h"
- #include "InspectorProtocolTypes.h"
-+#include <functional>
- #include <wtf/DeprecatedOptional.h>
- #include <wtf/Optional.h>
- #include <wtf/RefCounted.h>
 --- a/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
 +++ b/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
-@@ -22,6 +22,7 @@
+@@ -21,6 +21,7 @@
+ #pragma once
  
- #include "ExceptionOr.h"
  #include "URLHash.h"
 +#include <functional>
+ #include <wtf/Function.h>
  #include <wtf/HashMap.h>
- #include <wtf/ListHashSet.h>
  #include <wtf/RefCounted.h>
 --- a/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
 +++ b/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
@@ -40,8 +18,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
  #include "CachePolicy.h"
  #include "URL.h"
 +#include <functional>
+ #include <wtf/Function.h>
  #include <wtf/HashMap.h>
- #include <wtf/ListHashSet.h>
  #include <wtf/RefCounted.h>
 --- a/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
 +++ b/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
@@ -60,9 +38,9 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
  
  #include "ResourceLoader.h"
 +#include <functional>
+ #include <wtf/Function.h>
  #include <wtf/Forward.h>
  
- namespace WebCore {
 --- a/modules/web/src/main/native/Source/WebCore/loader/ResourceLoader.h
 +++ b/modules/web/src/main/native/Source/WebCore/loader/ResourceLoader.h
 @@ -34,6 +34,7 @@

debian/patches/23-webcore-linker-flags.patch

@@ -4,7 +4,7 @@ Forwarded: no
 Bug-Debian: https://bugs.debian.org/857464
 --- a/modules/web/src/main/native/Source/WebCore/CMakeLists.txt
 +++ b/modules/web/src/main/native/Source/WebCore/CMakeLists.txt
-@@ -3837,7 +3837,7 @@
+@@ -4019,7 +4019,7 @@
          set_target_properties(WebCore PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
          add_custom_target(WebCore_map DEPENDS "${WEBCORE_DIR}/mapfile-macosx")
      elseif (UNIX)

debian/patches/25-webkit-debug-level.patch

@@ -2,14 +2,13 @@ Description: Use the -g1 debugging level instead of -g when compiling WebKit
  to reduce the memory used and avoid build failures caused by lack of RAM.
 Author: Emmanuel Bourg <ebourg@apache.org>
 Forwarded: not-needed
---- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-+++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-@@ -43,6 +43,8 @@
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
-+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g1")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g1")
- endif ()
+--- a/modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
++++ b/modules/web/src/main/native/Source/cmake/WebKitCompilerFlags.cmake
+@@ -89,6 +89,7 @@
  
- if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
+ if (COMPILER_IS_GCC_OR_CLANG)
+     WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-strict-aliasing)
++    WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-g1)
+ 
+     # clang-cl.exe impersonates cl.exe so some clang arguments like -fno-rtti are
+     # represented using cl.exe's options and should not be passed as flags, so

debian/patches/26-disable-webkit-jit-for-armv4.patch

-Description: Disables the WebKit JIT on armel (fails to build)
+Description: Disables the WebKit JIT on armel and raspbian
+ (fails to build with armv7-only assembler)
 Author: Emmanuel Bourg <ebourg@apache.org>
+Author: Peter Michael Green <plugwash@debian.org>
 Forwarded: no
 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -738,6 +738,11 @@
+@@ -771,6 +771,11 @@
  #define ENABLE_JIT 1
  #endif
  
-+#if CPU(ARM) && WTF_ARM_ARCH_VERSION < 5
++#if CPU(ARM) && WTF_ARM_ARCH_VERSION < 7
 +#undef ENABLE_JIT
 +#define ENABLE_JIT 0
 +#endif

debian/patches/27-javascript-uint16-vs-char16.patch

+Description:  Fix some uint16/char16 issues in javascriptcore.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+Last-Update: 2018-05-29
+
+--- a/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
++++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
+@@ -18,7 +18,7 @@
+ #if PLATFORM(JAVA) && OS(WINDOWS)
+ typedef wchar_t UChar;
+ #else
+-typedef uint16_t UChar;
++typedef char16_t UChar;
+ #endif
+ 
+ // #ifdef UChar32

debian/patches/fix-arm32-build.patch

@@ -90,13 +90,12 @@
  LINUX.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
 --- a/build.gradle
 +++ b/build.gradle
-@@ -2563,9 +2563,6 @@
-                     // JFX WebKit needs atleast 10.9 OSX
-                     cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
-                 } else if (t.name == "linux") {
--                    if (!IS_64) {
--                        cmakeArgs = "-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
--                    }
+@@ -2568,7 +2568,7 @@
+                     if (IS_64) {
+                         cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=x86_64"
+                     } else {
+-                        cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=i586 -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
++                        cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=i586"
+                     }
                  } else if (t.name.startsWith("arm")) {
                      fail("ARM target is not supported as of now.")
-                 }

debian/patches/fix-arm64-build.patch

@@ -7,19 +7,20 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
 Forwarded: no
 --- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
 +++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -187,6 +187,9 @@
+@@ -187,7 +187,9 @@
  /* CPU(ARM64) - Apple */
  #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
  #define WTF_CPU_ARM64 1
+-
 +#if defined(__AARCH64BE__)
 +#define WTF_CPU_BIG_ENDIAN 1
 +#endif
+ #if defined(__arm64e__)
+ #define WTF_CPU_ARM64E 1
  #endif
- 
- /* CPU(ARM) - ARM, any version*/
 --- a/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
 +++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
-@@ -1035,7 +1035,7 @@
+@@ -1048,7 +1048,7 @@
  // this = mat * this.
  TransformationMatrix& TransformationMatrix::multiply(const TransformationMatrix& mat)
  {

debian/patches/series

@@ -20,3 +20,4 @@ fix-arm32-build.patch
 24-disable-buildSrc-tests.patch
 25-webkit-debug-level.patch
 26-disable-webkit-jit-for-armv4.patch
+27-javascript-uint16-vs-char16.patch

modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacDmgBundler.java

 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -344,6 +344,7 @@ public class MacDmgBundler extends MacBaseInstallerBundler {
                 "-srcfolder", srcFolder.getAbsolutePath(),
                 "-volname", APP_NAME.fetchFrom(p),
                 "-ov", protoDMG.getAbsolutePath(),
+                "-fs", "HFS+",
                 "-format", "UDRW");
         IOUtils.exec(pb, VERBOSE.fetchFrom(p));
 
@@ -380,10 +381,12 @@ public class MacDmgBundler extends MacBaseInstallerBundler {
         //  Therefore we have to do this after we mount image
         String setFileUtility = findSetFileUtility();
         if (setFileUtility != null) { //can not find utility => keep going without icon
+            try {
                 volumeIconFile.setWritable(true);
                 //The “creator” attribute on a file is a legacy attribute
                 // but it seems Finder expects these bytes to be “icnC” for the volume icon
                 // (http://endrift.com/blog/2010/06/14/dmg-files-volume-icons-cli/)
+                // (might not work on Mac 10.13 with old XCode)
                 pb = new ProcessBuilder(
                         setFileUtility,
                         "-c", "icnC",
@@ -396,6 +399,10 @@ public class MacDmgBundler extends MacBaseInstallerBundler {
                         "-a", "C",
                         mountedRoot.getAbsolutePath());
                 IOUtils.exec(pb, VERBOSE.fetchFrom(p));
+            } catch (IOException ex) {
+                Log.info(ex.getMessage());
+                Log.verbose("Cannot enable custom icon using SetFile utility");
+            }
         } else {
             Log.verbose("Skip enabling custom icon as SetFile utility is not found");
         }

modules/fxpackager/src/main/java/com/oracle/tools/packager/windows/WinAppBundler.java

 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -323,7 +323,7 @@ public class WinAppBundler extends AbstractImageBundler {
         AtomicReference<IOException> ioe = new AtomicReference<>();
         final String finalVsVer = vsVer;
         Files.list(jreDir.toPath().resolve("bin"))
-                .filter(p -> Pattern.matches("(vcruntime|msvcp)\\d\\d\\d.dll", p.toFile().getName().toLowerCase()))
+                .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 {

modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacAppBundlerTest.java

 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -442,6 +442,7 @@ public class MacAppBundlerTest {
     /**
      * Build signed smoke test and mark it as quarantined, skip if no keys present
      */
+    @Ignore("JDK-8193232")
     @Test
     public void quarantinedAppTest() throws IOException, ConfigException, UnsupportedPlatformException {
         AbstractBundler bundler = new MacAppBundler();
@@ -498,6 +499,7 @@ public class MacAppBundlerTest {
      *
      * All other values will be driven off of those two values.
      */
+    @Ignore("JDK-8193232")
     @Test
     public void minimumConfig() throws IOException, ConfigException, UnsupportedPlatformException {
         Bundler bundler = new MacAppBundler();
@@ -725,6 +727,7 @@ public class MacAppBundlerTest {
     /**
      * User a JRE instead of a JDK
      */
+    @Ignore("JDK-8193232")
     @Test
     public void testJRE() throws IOException, ConfigException, UnsupportedPlatformException {
         String jre = runtimeJre == null ? "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/" : runtimeJre;

modules/fxpackager/src/test/java/com/oracle/tools/packager/mac/MacPkgBundlerTest.java

 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -270,6 +270,7 @@ public class MacPkgBundlerTest {
     /**
      * Build smoke test and mark it as quarantined, possibly signed
      */
+    @Ignore("JDK-8193232")
     @Test
     public void quarantinedAppTest() throws IOException, ConfigException, UnsupportedPlatformException {
 
@@ -327,6 +328,7 @@ public class MacPkgBundlerTest {
      *
      * All other values will be driven off of those two values.
      */
+    @Ignore("JDK-8193232")
     @Test
     public void minimumConfig() throws IOException, ConfigException, UnsupportedPlatformException {
         Bundler bundler = new MacPkgBundler();