hg: openjfx/8/graphics/rt: Gradle build:

[Ali Ebrahimi]

Hi,
What about this patch. this just modifies build.gradle & win.gradle files.
if you want i will provide patch for other targets.

diff -r 843dcede5a8b build.gradle
--- a/build.gradle    Fri May 03 13:55:11 2013 -0700
+++ b/build.gradle    Sat May 04 03:55:24 2013 +0430
@@ -509,7 +509,7 @@
                 description = "Creates native dynamic library for $name
for ${t.name}${capitalVariant != '' ? ' for variant ' + capitalVariant :
''}"
                 objectDir = nativeDir
                 linkParams.addAll(variantProperties.linkFlags)
-                lib = file("$libRootDir/${t.name}/${variant == '' ?
library(name) : library(name + '-' + variant)}")
+                lib = file("$libRootDir/${t.name}/${variant == '' ?
library(variantProperties.lib) : library(variantProperties.lib + '-' +
variant)}")
                 linker = variantProperties.linker
             }
             nativeTask.dependsOn(linkTask)
@@ -725,7 +725,7 @@
         // TODO need to hook this up to be executed only if
PassThroughVS.h is missing or PassThroughVS.hlsl is changed
         task generateD3DHeaders(group: "Build") {
             enabled = IS_WINDOWS
-            dependsOn javahWinPrismD3d
+            dependsOn javahWinPrismD3D
             description = "Generate headers by compiling hlsl files"
             doLast {
                 mkdir file("$buildDir/headers/PrismD3D/hlsl")
@@ -798,7 +798,7 @@
             }
         }

-        ccWinPrismD3d.dependsOn generateD3DHeaders
+        ccWinPrismD3D.dependsOn generateD3DHeaders
     }

     // The Decora and Prism JSL files have to be generated in a very
specific set of steps.
@@ -877,7 +877,7 @@
             description = "Creates native dynamic library for Decora SSE"
             objectDir = file("$nativeRootDir/$target")
             linkParams.addAll(properties.decora.linkFlags)
-            lib = file("$libRootDir/$t.name/${library('decora-sse')}")
+            lib = file("$libRootDir/$
t.name/${library(properties.decora.lib)}")
             linker = properties.decora.linker
         }

@@ -1361,16 +1361,17 @@
             // TODO instead of using copy everywhere, I probably want to
use "sync" instead?
             // Copy all of the .dll / .so / .dylib native libraries into
build/sdk/rt/lib/
             copy {
-                from("modules/graphics/build/libs/jsl-decora/${t.name
}/${library('decora-sse')}",
-                     "modules/graphics/build/libs/prism/${t.name
}/${library('prism-common')}",
-                     "modules/graphics/build/libs/prismSW/${t.name
}/${library('prism-sw')}",
-                 "modules/graphics/build/libs/iio/${t.name
}/${library('javafx-iio')}",
-                 "modules/graphics/build/libs/prismES2/${t.name
}/${library('prism-es2')}",
-                     "modules/graphics/build/libs/glass/${t.name
}/${library('glass')}");
+                from("modules/graphics/build/libs/jsl-decora/${t.name
}/${library(targetProperties.decora.lib)}",
+                     "modules/graphics/build/libs/prism/${t.name
}/${library(targetProperties.prism.lib)}",
+                     "modules/graphics/build/libs/prismSW/${t.name
}/${library(targetProperties.prismSW.lib)}",
+                 "modules/graphics/build/libs/iio/${t.name
}/${library(targetProperties.iio.lib)}",
+                 "modules/graphics/build/libs/prismES2/${t.name
}/${library(targetProperties.prismES2.lib)}",
+                     "modules/graphics/build/libs/glass/${t.name
}/${library(targetProperties.glass.lib)}");
                 if (IS_WINDOWS) {
-                    from ("modules/graphics/build/libs/prismD3D/${t.name
}/${library('prism-d3d')}");
+                    from ("modules/graphics/build/libs/prismD3D/${t.name
}/${library(targetProperties.prismD3D.lib)}");
                     rename("lib(.*).dll", "\$1.dll");
                 }
+
                 def libDest = targetProperties.libDest
                 into ("build/${t.name}-sdk/rt/$libDest")
             }
diff -r 843dcede5a8b gradleBuildSrc/win.gradle
--- a/gradleBuildSrc/win.gradle    Fri May 03 13:55:11 2013 -0700
+++ b/gradleBuildSrc/win.gradle    Sat May 04 03:55:24 2013 +0430
@@ -145,12 +145,14 @@
         "winmm.lib", "imm32.lib", "shell32.lib", "Uiautomationcore.lib",
"dwmapi.lib",
         "/DELAYLOAD:user32.dll", "/DELAYLOAD:urlmon.dll",
"/DELAYLOAD:winmm.dll", "/DELAYLOAD:shell32.dll",
         "/DELAYLOAD:Uiautomationcore.dll",
"/DELAYLOAD:dwmapi.dll"].flatten()
+WIN.glass.lib="glass"

 WIN.decora = [:]
 WIN.decora.compiler = compiler
 WIN.decora.ccFlags = [ccFlags].flatten()
 WIN.decora.linker = linker
 WIN.decora.linkFlags = [linkFlags].flatten()
+WIN.decora.lib="decora-sse"

 WIN.prism = [:]
 WIN.prism.javahInclude = ["com/sun/prism/impl/**/*",
"com/sun/prism/PresentableState*"]
@@ -159,6 +161,7 @@
 WIN.prism.ccFlags = [ccFlags].flatten()
 WIN.prism.linker = linker
 WIN.prism.linkFlags = [linkFlags].flatten()
+WIN.prism.lib="prism-common"

 WIN.prismSW = [:]
 WIN.prismSW.javahInclude = ["com/sun/pisces/**/*"]
@@ -167,6 +170,7 @@
 WIN.prismSW.ccFlags = [ccFlags].flatten()
 WIN.prismSW.linker = linker
 WIN.prismSW.linkFlags = [linkFlags].flatten()
+WIN.prismSW.lib="prism-sw"

 WIN.prismD3D = [:]
 WIN.prismD3D.javahInclude = ["com/sun/prism/d3d/**/*"]
@@ -177,6 +181,7 @@
 WIN.prismD3D.ccFlags = [ccFlags, "/Ibuild/headers/PrismD3D"].flatten()
 WIN.prismD3D.linker = linker
 WIN.prismD3D.linkFlags = [linkFlags, "user32.lib"].flatten()
+WIN.prismD3D.lib="prism-d3d"

 WIN.launcher = [:]
 WIN.launcher.compiler = compiler


Ali Ebrahimi
On Sat, May 4, 2013 at 1:33 AM, <hang.vo at oracle.com> wrote:

> Changeset: 843dcede5a8b
> Author:    Richard Bair <richard.bair at oracle.com>
> Date:      2013-05-03 13:55 -0700
> URL:
> http://hg.openjdk.java.net/openjfx/8/graphics/rt/rev/843dcede5a8b
>
> Gradle build:
>     - Fixed COMPILE_FOO flags (submitted by Ali Ebrahimi)
>     - Cosmetic rearrange of properties in *.gradle files
>
> ! build.gradle
> ! gradle.properties
> ! gradleBuildSrc/armv6hf.gradle
> ! gradleBuildSrc/armv6sf.gradle
> ! gradleBuildSrc/linux.gradle
> ! gradleBuildSrc/mac.gradle
>
>