hg: openjfx/8/graphics/rt: Gradle build fixes for arm builds

[Ali Ebrahimi]

Hi again Richard,
I'm sorry, i come back with another patch.

diff -r c5fb07351bcd build.gradle
--- a/build.gradle    Fri May 03 11:57:21 2013 -0700
+++ b/build.gradle    Sat May 04 00:35:09 2013 +0430
@@ -352,9 +352,9 @@
 ext.COMPILE_DESIGN_TIME = false;
 compileTargets { t ->
     if (project.ext[t.upper].compileSwing) COMPILE_SWING = true
-    if (project.ext[t.upper].compileSWT) COMPILE_SWING = true
-    if (project.ext[t.upper].compileFXPackager) COMPILE_SWING = true
-    if (project.ext[t.upper].compileDesignTime) COMPILE_SWING = true
+    if (project.ext[t.upper].compileSWT) COMPILE_SWT = true
+    if (project.ext[t.upper].compileFXPackager) COMPILE_FXPACKAGER = true
+    if (project.ext[t.upper].compileDesignTime) COMPILE_DESIGN_TIME = true
 }

 /******************************************************************************
@@ -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.
@@ -1097,7 +1097,7 @@
             source file("src/main/native/launcher/win")
             compiler = WIN.launcher.compiler
             exe = true
-            linkerOptions.addAll(ICON_LAUNCHER_LINK_FLAGS)
+            linkerOptions.addAll(WIN.iconLauncher.linkFlags)
             doLast {
                 copy {
                     from "$buildDir/native/IconSwap/IconSwap.exe"
@@ -1362,13 +1362,13 @@
             // 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/prism/${t.name
}/${library('prism')}",
+                     "modules/graphics/build/libs/prismSW/${t.name
}/${library('prismSW')}",
+                 "modules/graphics/build/libs/iio/${t.name
}/${library('iio')}",
+                 "modules/graphics/build/libs/prismES2/${t.name
}/${library('prismES2')}",
                      "modules/graphics/build/libs/glass/${t.name
}/${library('glass')}");
                 if (IS_WINDOWS) {
-                    from ("modules/graphics/build/libs/prismD3D/${t.name
}/${library('prism-d3d')}");
+                    from ("modules/graphics/build/libs/prismD3D/${t.name
}/${library('prismD3D')}");
                     rename("lib(.*).dll", "\$1.dll");
                 }
                 def libDest = targetProperties.libDest

Ali Ebrahimi


On Fri, May 3, 2013 at 11:33 PM, <hang.vo at oracle.com> wrote:

> Changeset: c5fb07351bcd
> Author:    rbair
> Date:      2013-05-03 11:57 -0700
> URL:
> http://hg.openjdk.java.net/openjfx/8/graphics/rt/rev/c5fb07351bcd
>
> Gradle build fixes for arm builds
>
> ! build.gradle
> ! gradleBuildSrc/armv6hf.gradle
> ! gradleBuildSrc/armv6sf.gradle
>
>