changeset 5863:2e2244003c8d

Fixed web part of RT-27943 Update JavaFX DLL Files to include appropriate meta data (fix by PeterZ)
author lepopov
date Mon, 02 Dec 2013 19:42:37 +0400
parents 9de431c29e4d
children 0c2128f43b08
files build.gradle buildSrc/win.gradle modules/web/src/main/native/Source/WebCore/TargetJava.pri
diffstat 3 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Mon Dec 02 15:38:24 2013 +0400
+++ b/build.gradle	Mon Dec 02 19:42:37 2013 +0400
@@ -2178,6 +2178,19 @@
             }
         }
     
+        if (IS_WINDOWS && t.name == "win") {
+            def webkitProperties = project.rootProject.ext[t.upper].webkit
+            def rcTask = project.task("rc${t.capital}", type: CompileResourceTask) {
+                compiler = webkitProperties.rcCompiler
+                source(webkitProperties.rcSource)
+                if (webkitProperties.rcFlags) {
+                    rcParams.addAll(webkitProperties.rcFlags)
+                }
+                output(file("$webkitOutputDir/$webkitConfig/WebCore/obj"))
+            }
+            compileNativeTask.dependsOn rcTask
+        }
+        
         def compileGeneratedTask = task("compileGenerated${t.capital}", type: JavaCompile, dependsOn: compileNativeTask) {
             def gensrcDir = "$webkitOutputDir/$webkitConfig/WebCore/generated/java"
             doFirst {
--- a/buildSrc/win.gradle	Mon Dec 02 15:38:24 2013 +0400
+++ b/buildSrc/win.gradle	Mon Dec 02 19:42:37 2013 +0400
@@ -320,3 +320,8 @@
 WIN.media.gstreamerRcFlags = ["/d", "JFX_FNAME=gstreamer-lite.dll", "/d", "JFX_INTERNAL_NAME=gstreamer", rcFlags].flatten()
 WIN.media.fxpluginsRcFlags = ["/d", "JFX_FNAME=fxplugins.dll", "/d", "JFX_INTERNAL_NAME=fxplugins", rcFlags].flatten()
 WIN.media.jfxmediaRcFlags = ["/d", "JFX_FNAME=jfxmedia.dll", "/d", "JFX_INTERNAL_NAME=jfxmedia", rcFlags].flatten()
+
+WIN.webkit = [:]
+WIN.webkit.rcCompiler = rcCompiler
+WIN.webkit.rcSource = defaultRcSource
+WIN.webkit.rcFlags = ["/d", "JFX_FNAME=jfxwebkit.dll", "/d", "JFX_INTERNAL_NAME=webkit", rcFlags].flatten();
--- a/modules/web/src/main/native/Source/WebCore/TargetJava.pri	Mon Dec 02 15:38:24 2013 +0400
+++ b/modules/web/src/main/native/Source/WebCore/TargetJava.pri	Mon Dec 02 19:42:37 2013 +0400
@@ -143,6 +143,8 @@
 
 win32-* {
     QMAKE_CXXFLAGS += -DLIBXML_STATIC
+    # Adds version information created by Gradle build, see RT-27943
+    OBJECTS += $$OBJECTS_DIR/*.res
     LIBS += -llibxml2_a -lole32 -ladvapi32 -luser32
     contains(DEFINES, ENABLE_XSLT=1) {
         QMAKE_CXXFLAGS += -DLIBXSLT_STATIC