Begin to move javafx ant tasks into Gradle

netdance · Aug 25, 2012 · ea9a2e2 · ea9a2e2
1 parent a8df4b3
commit ea9a2e2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,6 @@
 apply plugin: 'groovy'
 
-//ant.importBuild 'build.xml'
-
-
+defaultTasks 'clean', 'run'
 
 buildscript {
 
@@ -48,8 +46,6 @@ buildscript {
     ant.properties['app.vendor'] = appVendor
     ant.properties['app.version'] = appVersion
 
-    //apply from: 'gradle.properties', to: ant.properties
-
 }
 
 repositories {
@@ -69,9 +65,6 @@ sourceSets {
     }
 }
 
-ant.properties['build.classes.dir'] = sourceSets.main.output.asPath
-
-
 task wrap(type: Wrapper, description: "create a gradlew") {
     gradleVersion = '1.1'
 }
@@ -106,13 +99,22 @@ task bundleFX(dependsOn: '_dist-native') {
    /* <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
     uri="javafx:com.sun.javafx.tools.ant"
     classpath=".:path/to/sdk/lib/ant-javafx.jar"/>    */
-    //ant.taskdef(resource: "com/sun/javafx/tools/ant/antlib.xml",
-    //            uri: "javafx:com.sun.javafx.tools.ant",
-    //            classpath: ".:${project.ext.javafxAntJar}" )
-
+    ant.taskdef(resource: "com/sun/javafx/tools/ant/antlib.xml",
+                uri: "javafx:com.sun.javafx.tools.ant",
+                classpath: ".:${project.ext.javafxAntJar}" )
+    // javafx:com.sun.javafx.tools.ant:resources
     ant.importBuild 'fx-extras.xml'
 
-}
+    def javafxAnt = groovy.xml.NamespaceBuilder.newInstance(ant, 'javafx:com.sun.javafx.tools.ant')
 
+    def libRes = javafxAnt.resources(id: 'libRes')   {
+        javafxAnt.fileset(dir: 'dist', includes: 'libs/*.jar', type: 'jar', requiredFor: 'startup')
+    }
+
+    def app = javafxAnt.application(id: "NapiliApp", name: "Napili Turtle Graphics", mainClass: appMainClass)
+
+
+
+}
 
 task dist(dependsOn: 'bundleFX') {}
diff --git a/fx-extras.xml b/fx-extras.xml
@@ -27,18 +27,19 @@
 
     <target name="_dist-native" depends="classes, libcopy"
             description="Builds native distributions via JavaFX">
-        <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
+        <!-- <taskdef resource="com/sun/javafx/tools/ant/antlib.xml"
                  uri="javafx:com.sun.javafx.tools.ant"
-                 classpath="${javafxAntJar}"/>
-
+                 classpath="${javafxAntJar}"/>  -->
+        <!--
         <fx:application id="NapiliApp"
                         name="Napili Turtle Graphics"
                         mainClass="${app.main.class}" />
-
+         -->
+        <!--
         <fx:resources id="libRes">
             <fx:fileset dir="dist" includes="libs/*.jar" type="jar" requiredFor="startup"/>
         </fx:resources>
-
+        -->
 
         <fx:jar destfile="dist/Napili.jar">
             <!-- Define what to launch -->

diff --git a/gradle.properties b/gradle.properties
@@ -5,4 +5,4 @@ appHeight = 600
 appTitle = Napili
 appMainClass = org.netdance.napili.Napili
 appVendor = Jim Driscoll
-appVersion = .1
+appVersion = 0.1