changeset 10330:9bdcf1b4cc72

8138652: [macosx] New WebView Native Code uses private Apple APIs Reviewed-by: kcr, arajkumar, mbilla
author ghb
date Fri, 10 Feb 2017 09:12:35 +0530
parents eef2a50f5bdd
children dee28a9ba226
files build.gradle modules/javafx.web/src/main/native/Source/JavaScriptCore/PlatformJava.cmake modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformMac.cmake modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake
diffstat 4 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Thu Feb 09 13:44:00 2017 -0800
+++ b/build.gradle	Fri Feb 10 09:12:35 2017 +0530
@@ -3002,7 +3002,7 @@
                           IS_64 ? "${t.name}-amd64" : "${t.name}-i586"
         dependencies {
             webkit group: "com.sun.webkit", name: "webview-deps",
-                   version: "1.3.1", classifier: "$classifier", ext: "zip"
+                   version: "1.3.2", classifier: "$classifier", ext: "zip"
         }
 
         def webkitOutputDir = cygpath("$buildDir/${t.name}")
--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/PlatformJava.cmake	Thu Feb 09 13:44:00 2017 -0800
+++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/PlatformJava.cmake	Fri Feb 10 09:12:35 2017 +0530
@@ -27,7 +27,6 @@
     find_library(COREFOUNDATION_LIBRARY CoreFoundation)
     list(APPEND JavaScriptCore_LIBRARIES
         ${COREFOUNDATION_LIBRARY}
-        libicucore.dylib
     )
 endif()
 
--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformMac.cmake	Thu Feb 09 13:44:00 2017 -0800
+++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/PlatformMac.cmake	Fri Feb 10 09:12:35 2017 +0530
@@ -7,7 +7,6 @@
     ${COREFOUNDATION_LIBRARY}
     ${COCOA_LIBRARY}
     ${READLINE_LIBRARY}
-    libicucore.dylib
 )
 
 list(APPEND WTF_SOURCES
--- a/modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake	Thu Feb 09 13:44:00 2017 -0800
+++ b/modules/javafx.web/src/main/native/Source/cmake/OptionsJava.cmake	Fri Feb 10 09:12:35 2017 +0530
@@ -55,7 +55,15 @@
     # set(USE_CF 1)
     add_definitions(-DUSE_CF=1)
     add_definitions(-DJSC_OBJC_API_ENABLED=0)
-    
+
+    #### ICU ####
+    set(ICU_FOUND TRUE)
+    set(ICU_I18N_FOUND TRUE)
+    set(ICU_INCLUDE_DIRS ${IMPORT_INCLUDE_DIR})
+    set(ICU_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libicuuc.a ${IMPORT_LIBRARIES_DIR}/libicudata.a)
+    set(ICU_I18N_LIBRARIES ${IMPORT_LIBRARIES_DIR}/libicui18n.a)
+    #### ICU-END ####
+
     #### Sqlite3 ####
     set(SQLITE_FOUND TRUE)
     set(SQLITE_INCLUDE_DIR ${IMPORT_INCLUDE_DIR})