changeset 7406:a99bffdb9f5d

RT-37630: Hook up SceneBuilder for building Summary: SceneBuilder is now compiled when "gradle apps" is called Reviewed-by: ddhill, kcr
author yjoan
date Thu, 03 Jul 2014 09:05:30 +0200
parents ddf059995fc0
children 1efcff018597
files apps/build.xml apps/scenebuilder/SceneBuilderApp/nbproject/project.properties apps/scenebuilder/SceneBuilderKit/nbproject/project.properties apps/scenebuilder/build.xml build.gradle
diffstat 5 files changed, 34 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/apps/build.xml	Wed Jul 02 16:21:24 2014 -0700
+++ b/apps/build.xml	Thu Jul 03 09:05:30 2014 +0200
@@ -21,11 +21,19 @@
     </target>
 
     <target name="scenebuilderSampleAppsJar">
-        <ant dir="scenebuilder" target="jar" inheritAll="true"/>
+        <ant dir="scenebuilder" target="jar-sb-samples" inheritAll="true"/>
     </target>
 
     <target name="scenebuilderSampleAppsClean">
-        <ant dir="scenebuilder" target="clean" inheritAll="true"/>
+        <ant dir="scenebuilder" target="clean-sb-samples" inheritAll="true"/>
+    </target>
+
+    <target name="scenebuilderAppJar">
+        <ant dir="scenebuilder" target="jar-sb" inheritAll="true"/>
+    </target>
+
+    <target name="scenebuilderAppClean">
+        <ant dir="scenebuilder" target="clean-sb" inheritAll="true"/>
     </target>
 
 </project>
--- a/apps/scenebuilder/SceneBuilderApp/nbproject/project.properties	Wed Jul 02 16:21:24 2014 -0700
+++ b/apps/scenebuilder/SceneBuilderApp/nbproject/project.properties	Thu Jul 03 09:05:30 2014 +0200
@@ -31,12 +31,12 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-internal.file.reference.jfxrt.jar=../../../../artifacts/sdk/rt/lib/ext/jfxrt.jar
+jfxbuild.jfxrt.jar=
 file.reference.SceneBuilderApp-src=src
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${internal.file.reference.jfxrt.jar}:\
+    ${jfxbuild.jfxrt.jar}:\
     ${reference.SceneBuilderKit.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
--- a/apps/scenebuilder/SceneBuilderKit/nbproject/project.properties	Wed Jul 02 16:21:24 2014 -0700
+++ b/apps/scenebuilder/SceneBuilderKit/nbproject/project.properties	Thu Jul 03 09:05:30 2014 +0200
@@ -29,12 +29,12 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-internal.file.reference.jfxrt.jar=../../../../artifacts/sdk/rt/lib/ext/jfxrt.jar
+jfxbuild.jfxrt.jar=
 file.reference.SceneBuilderKit-src=src
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${internal.file.reference.jfxrt.jar}
+    ${jfxbuild.jfxrt.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
--- a/apps/scenebuilder/build.xml	Wed Jul 02 16:21:24 2014 -0700
+++ b/apps/scenebuilder/build.xml	Thu Jul 03 09:05:30 2014 +0200
@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="jar" basedir=".">
 
-    <target name="jar">
+    <target name="jar" depends="jar-sb, jar-sb-samples">
+    </target>
+
+    <target name="clean" depends="clean-sb, clean-sb-samples">
+    </target>
+
+    <target name="jar-sb-samples">
         <ant dir="samples" target="jar" inheritAll="true"/>
     </target>
 
-    <target name="clean">
+    <target name="clean-sb-samples">
         <ant dir="samples" target="clean" inheritAll="true"/>
     </target>
 
+    <target name="jar-sb">
+        <ant dir="SceneBuilderKit" target="jar" inheritAll="true"/>
+        <ant dir="SceneBuilderApp" target="jar" inheritAll="true"/>
+    </target>
+
+    <target name="clean-sb">
+        <ant dir="SceneBuilderApp" target="clean" inheritAll="true"/>
+        <ant dir="SceneBuilderKit" target="clean" inheritAll="true"/>
+    </target>
+
 </project>
-
-
--- a/build.gradle	Wed Jul 02 16:21:24 2014 -0700
+++ b/build.gradle	Thu Jul 03 09:05:30 2014 +0200
@@ -3023,6 +3023,7 @@
               ant.properties['platforms.JDK_1.8.home'] = "${rootProject.ext.JDK_HOME}"
               ant.project.executeTarget("sampleAppsJar")
               ant.project.executeTarget("scenebuilderSampleAppsJar")
+              ant.project.executeTarget("scenebuilderAppJar")
             }
         }
         rootProject.appsjar.dependsOn(appsJar)
@@ -3033,6 +3034,7 @@
               ant.properties['platforms.JDK_1.8.home'] = "${rootProject.ext.JDK_HOME}"
               ant.project.executeTarget("sampleAppsClean")
               ant.project.executeTarget("scenebuilderSampleAppsClean")
+              ant.project.executeTarget("scenebuilderAppClean")
             }
         }
         rootProject.clean.dependsOn(appsClean)