changeset 5715:9e5674b4ccc0

RT-27107. RT-27017, RT-26998, RT-27015: Sync ICU changes Reviewed-by: felipe, yao
author prr
date Thu, 14 Nov 2013 10:37:19 -0800
parents d4949369d2ae
children 334772e6da36
files buildSrc/android.gradle buildSrc/armv6hf.gradle buildSrc/armv6sf.gradle buildSrc/ios.gradle buildSrc/linux.gradle buildSrc/mac.gradle buildSrc/win.gradle buildSrc/x86egl.gradle
diffstat 8 files changed, 16 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/buildSrc/android.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/android.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -562,10 +562,9 @@
     ANDROID.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
     ANDROID.fontT2K.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
     ANDROID.fontT2K.compiler = compiler
-    ANDROID.fontT2K.ccFlags = [ccFlags, "-fno-exceptions", "-fno-rtti", ccWarnFlags,
+    ANDROID.fontT2K.ccFlags = [ccFlags, "-DLE_STANDALONE", "-fno-exceptions", "-fno-rtti", ccWarnFlags,
         ccArchFlags, ccOptFlags, ccDebugFlags, ccDefaultIncludeFlags].flatten()
     ANDROID.fontT2K.linker = linker
     ANDROID.fontT2K.linkFlags = [linkFlags, "-lstdc++"].flatten()
--- a/buildSrc/armv6hf.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/armv6hf.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -442,10 +442,9 @@
 ARMV6HF.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
 ARMV6HF.fontT2K.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
 ARMV6HF.fontT2K.compiler = compiler
-ARMV6HF.fontT2K.ccFlags = fontCFlags
+ARMV6HF.fontT2K.ccFlags = [fontCFlags, "-DLE_STANDALONE"].flatten()
 ARMV6HF.fontT2K.linker = linker
 ARMV6HF.fontT2K.linkFlags = fontLFlags
 ARMV6HF.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/armv6sf.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/armv6sf.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -461,10 +461,9 @@
 ARMV6SF.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
 ARMV6SF.fontT2K.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
 ARMV6SF.fontT2K.compiler = compiler
-ARMV6SF.fontT2K.ccFlags = fontCFlags
+ARMV6SF.fontT2K.ccFlags = [fontCFlags, "-DLE_STANDALONE"].flatten()
 ARMV6SF.fontT2K.linker = linker
 ARMV6SF.fontT2K.linkFlags = fontLFlags
 ARMV6SF.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/ios.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/ios.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -304,10 +304,9 @@
 IOS.fontT2K.arm = [:]
 IOS.fontT2K.arm.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
 IOS.fontT2K.arm.compiler = compiler
-IOS.fontT2K.arm.ccFlags = ["-DJFXFONT_PLUS", ccFlags, "-arch", archArm, "-isysroot", sdkPath(iPhoneOS)].flatten()
+IOS.fontT2K.arm.ccFlags = ["-DJFXFONT_PLUS", "-DLE_STANDALONE", ccFlags, "-arch", archArm, "-isysroot", sdkPath(iPhoneOS)].flatten()
 IOS.fontT2K.arm.linker = linker
 IOS.fontT2K.arm.linkFlags = ["-arch_only", archArm, "-syslibroot", sdkPath(iPhoneOS), linkFlags].flatten()
 IOS.fontT2K.arm.lib = "javafx_font_t2k_${archArm}"
--- a/buildSrc/linux.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/linux.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -241,10 +241,9 @@
 LINUX.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
 LINUX.fontT2K.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
 LINUX.fontT2K.compiler = compiler
-LINUX.fontT2K.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten()
+LINUX.fontT2K.ccFlags = ["-DJFXFONT_PLUS", "-DLE_STANDALONE", ccFlags].flatten()
 LINUX.fontT2K.linker = linker
 LINUX.fontT2K.linkFlags = [linkFlags].flatten()
 LINUX.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/mac.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/mac.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -198,10 +198,9 @@
 MAC.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
 MAC.fontT2K.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
 MAC.fontT2K.compiler = compiler
-MAC.fontT2K.ccFlags = ["-DJFXFONT_PLUS", ccFlags].flatten()
+MAC.fontT2K.ccFlags = ["-DJFXFONT_PLUS", "-DLE_STANDALONE", ccFlags].flatten()
 MAC.fontT2K.linker = linker
 MAC.fontT2K.linkFlags = [linkFlags].flatten()
 MAC.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/win.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/win.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -258,10 +258,9 @@
 WIN.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
 WIN.fontT2K.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
 WIN.fontT2K.compiler = compiler
-WIN.fontT2K.ccFlags = ["/DJFXFONT_PLUS", ccFlags].flatten()
+WIN.fontT2K.ccFlags = ["/DJFXFONT_PLUS", "/DLE_STANDALONE", ccFlags].flatten()
 WIN.fontT2K.linker = linker
 WIN.fontT2K.linkFlags = [linkFlags, "advapi32.lib", "gdi32.lib", "user32.lib"].flatten()
 WIN.fontT2K.lib = "javafx_font_t2k"
--- a/buildSrc/x86egl.gradle	Thu Nov 14 10:18:23 2013 -0800
+++ b/buildSrc/x86egl.gradle	Thu Nov 14 10:37:19 2013 -0800
@@ -381,10 +381,9 @@
 X86EGL.fontT2K.javahInclude = ["com/sun/javafx/font/t2k/**/*"]
 X86EGL.fontT2K.nativeSource = [
         file("$closedDir/javafx-font-t2k-native/src"),
-        file("$closedDir/javafx-font-t2k-native/src/layout"),
-        file("$closedDir/javafx-font-t2k-native/src/layoutfx")]
+        file("$closedDir/javafx-font-t2k-native/src/layout")]
 X86EGL.fontT2K.compiler = compiler
-X86EGL.fontT2K.ccFlags = fontCFlags
+X86EGL.fontT2K.ccFlags = [fontCflags, "-DLE_STANDALONE"].flatten()
 X86EGL.fontT2K.linker = linker
 X86EGL.fontT2K.linkFlags = fontLFlags
 X86EGL.fontT2K.lib = "javafx_font_t2k"