changeset 7364:b60bc59b09d1

RT-37254: Hook up SceneBuilder samples for building and later for supporting insanity testing Summary: SceneBuilder samples are now compiled when "gradle apps" is called Reviewed-by: ddhill, kcr Contributed-by: ddhill
author yjoan
date Fri, 20 Jun 2014 11:00:04 +0200
parents 779a56e5e4c4
children 84182535a4be
files apps/build.xml apps/scenebuilder/build.xml apps/scenebuilder/samples/AirportApp/nbproject/project.properties apps/scenebuilder/samples/HelloI18N/nbproject/project.properties apps/scenebuilder/samples/HelloSwingNode/nbproject/project.properties apps/scenebuilder/samples/IssueTrackingBiDi/nbproject/project.properties apps/scenebuilder/samples/IssueTrackingLite/nbproject/project.properties apps/scenebuilder/samples/Login/nbproject/project.properties apps/scenebuilder/samples/UnlockCustom/nbproject/project.properties apps/scenebuilder/samples/build.xml build.gradle
diffstat 11 files changed, 74 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/apps/build.xml	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/build.xml	Fri Jun 20 11:00:04 2014 +0200
@@ -20,6 +20,14 @@
         <ant dir="toys" target="clean" inheritAll="true"/>
     </target>
 
+    <target name="scenebuilderSampleAppsJar">
+        <ant dir="scenebuilder" target="jar" inheritAll="true"/>
+    </target>
+
+    <target name="scenebuilderSampleAppsClean">
+        <ant dir="scenebuilder" target="clean" inheritAll="true"/>
+    </target>
+
 </project>
 
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apps/scenebuilder/build.xml	Fri Jun 20 11:00:04 2014 +0200
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="jar" basedir=".">
+
+    <target name="jar">
+        <ant dir="samples" target="jar" inheritAll="true"/>
+    </target>
+
+    <target name="clean">
+        <ant dir="samples" target="clean" inheritAll="true"/>
+    </target>
+
+</project>
+
+
--- a/apps/scenebuilder/samples/AirportApp/nbproject/project.properties	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/scenebuilder/samples/AirportApp/nbproject/project.properties	Fri Jun 20 11:00:04 2014 +0200
@@ -33,7 +33,9 @@
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
 jar.compress=false
+jfxbuild.jfxrt.jar=
 javac.classpath=\
+    ${jfxbuild.jfxrt.jar}:\
     ${javafx.classpath.extension}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -102,7 +104,7 @@
 # Main class for Java launcher
 main.class=com.javafx.main.Main
 # For improved security specify narrower Codebase manifest attribute to prevent RIAs from being repurposed
-manifest.custom.codebase=*
+manifest.custom.codebase=no.codebase
 # Specify Permissions manifest attribute to override default (choices: sandbox, all-permissions)
 manifest.custom.permissions=
 manifest.file=manifest.mf
--- a/apps/scenebuilder/samples/HelloI18N/nbproject/project.properties	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/scenebuilder/samples/HelloI18N/nbproject/project.properties	Fri Jun 20 11:00:04 2014 +0200
@@ -33,7 +33,9 @@
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
 jar.compress=false
+jfxbuild.jfxrt.jar=
 javac.classpath=\
+    ${jfxbuild.jfxrt.jar}:\
     ${javafx.classpath.extension}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -102,7 +104,7 @@
 # Main class for Java launcher
 main.class=helloi18n.Main
 # For improved security specify narrower Codebase manifest attribute to prevent RIAs from being repurposed
-manifest.custom.codebase=*
+manifest.custom.codebase=no.codebase
 # Specify Permissions manifest attribute to override default (choices: sandbox, all-permissions)
 manifest.custom.permissions=
 manifest.file=manifest.mf
--- a/apps/scenebuilder/samples/HelloSwingNode/nbproject/project.properties	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/scenebuilder/samples/HelloSwingNode/nbproject/project.properties	Fri Jun 20 11:00:04 2014 +0200
@@ -33,7 +33,9 @@
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
 jar.compress=false
+jfxbuild.jfxrt.jar=
 javac.classpath=\
+    ${jfxbuild.jfxrt.jar}:\
     ${javafx.classpath.extension}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -102,7 +104,7 @@
 # Main class for Java launcher
 main.class=helloswingnode.HelloSwingNode
 # For improved security specify narrower Codebase manifest attribute to prevent RIAs from being repurposed
-manifest.custom.codebase=*
+manifest.custom.codebase=no.codebase
 # Specify Permissions manifest attribute to override default (choices: sandbox, all-permissions)
 manifest.custom.permissions=
 manifest.file=manifest.mf
--- a/apps/scenebuilder/samples/IssueTrackingBiDi/nbproject/project.properties	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/scenebuilder/samples/IssueTrackingBiDi/nbproject/project.properties	Fri Jun 20 11:00:04 2014 +0200
@@ -34,7 +34,9 @@
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
 jar.compress=false
+jfxbuild.jfxrt.jar=
 javac.classpath=\
+    ${jfxbuild.jfxrt.jar}:\
     ${javafx.classpath.extension}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -103,7 +105,7 @@
 # Main class for Java launcher
 main.class=issuetrackingbidi.Main
 # For improved security specify narrower Codebase manifest attribute to prevent RIAs from being repurposed
-manifest.custom.codebase=*
+manifest.custom.codebase=no.codebase
 # Specify Permissions manifest attribute to override default (choices: sandbox, all-permissions)
 manifest.custom.permissions=
 manifest.file=manifest.mf
--- a/apps/scenebuilder/samples/IssueTrackingLite/nbproject/project.properties	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/scenebuilder/samples/IssueTrackingLite/nbproject/project.properties	Fri Jun 20 11:00:04 2014 +0200
@@ -33,7 +33,9 @@
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
 jar.compress=false
+jfxbuild.jfxrt.jar=
 javac.classpath=\
+    ${jfxbuild.jfxrt.jar}:\
     ${javafx.classpath.extension}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -102,7 +104,7 @@
 # Main class for Java launcher
 main.class=issuetrackinglite.Main
 # For improved security specify narrower Codebase manifest attribute to prevent RIAs from being repurposed
-manifest.custom.codebase=*
+manifest.custom.codebase=no.codebase
 # Specify Permissions manifest attribute to override default (choices: sandbox, all-permissions)
 manifest.custom.permissions=
 manifest.file=manifest.mf
--- a/apps/scenebuilder/samples/Login/nbproject/project.properties	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/scenebuilder/samples/Login/nbproject/project.properties	Fri Jun 20 11:00:04 2014 +0200
@@ -33,7 +33,9 @@
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
 jar.compress=false
+jfxbuild.jfxrt.jar=
 javac.classpath=\
+    ${jfxbuild.jfxrt.jar}:\
     ${javafx.classpath.extension}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -102,7 +104,7 @@
 # Main class for Java launcher
 main.class=login.Main
 # For improved security specify narrower Codebase manifest attribute to prevent RIAs from being repurposed
-manifest.custom.codebase=*
+manifest.custom.codebase=no.codebase
 # Specify Permissions manifest attribute to override default (choices: sandbox, all-permissions)
 manifest.custom.permissions=
 manifest.file=manifest.mf
--- a/apps/scenebuilder/samples/UnlockCustom/nbproject/project.properties	Fri Jun 20 10:01:35 2014 +1200
+++ b/apps/scenebuilder/samples/UnlockCustom/nbproject/project.properties	Fri Jun 20 11:00:04 2014 +0200
@@ -33,7 +33,9 @@
 # Non-JavaFX jar file creation is deactivated in JavaFX 2.0+ projects
 jar.archive.disabled=true
 jar.compress=false
+jfxbuild.jfxrt.jar=
 javac.classpath=\
+    ${jfxbuild.jfxrt.jar}:\
     ${javafx.classpath.extension}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -102,7 +104,7 @@
 # Main class for Java launcher
 main.class=unlock.Unlock
 # For improved security specify narrower Codebase manifest attribute to prevent RIAs from being repurposed
-manifest.custom.codebase=*
+manifest.custom.codebase=no.codebase
 # Specify Permissions manifest attribute to override default (choices: sandbox, all-permissions)
 manifest.custom.permissions=
 manifest.file=manifest.mf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apps/scenebuilder/samples/build.xml	Fri Jun 20 11:00:04 2014 +0200
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="jar" basedir=".">
+
+    <target name="swingJar" unless="JFX_CORE_ONLY">
+        <ant dir="HelloSwingNode" target="jar" inheritAll="true"/>
+    </target>
+
+    <target name="jar" depends="swingJar">
+        <ant dir="AirportApp" target="jar" inheritAll="true"/>
+        <ant dir="HelloI18N" target="jar" inheritAll="true"/>
+        <ant dir="IssueTrackingBiDi" target="jar" inheritAll="true"/>
+        <ant dir="IssueTrackingLite" target="jar" inheritAll="true"/>
+        <ant dir="Login" target="jar" inheritAll="true"/>
+        <ant dir="UnlockCustom" target="jar" inheritAll="true"/>
+    </target>
+
+    <target name="clean">
+        <ant dir="AirportApp" target="clean" inheritAll="true"/>
+        <ant dir="HelloI18N" target="clean" inheritAll="true"/>
+        <ant dir="HelloSwingNode" target="clean" inheritAll="true"/>
+        <ant dir="IssueTrackingBiDi" target="clean" inheritAll="true"/>
+        <ant dir="IssueTrackingLite" target="clean" inheritAll="true"/>
+        <ant dir="Login" target="clean" inheritAll="true"/>
+        <ant dir="UnlockCustom" target="clean" inheritAll="true"/>
+    </target>
+
+</project>
+
+
--- a/build.gradle	Fri Jun 20 10:01:35 2014 +1200
+++ b/build.gradle	Fri Jun 20 11:00:04 2014 +0200
@@ -3013,6 +3013,7 @@
               ant.properties['jfxbuild.jfxrt.jar'] = jfxrtJar
               ant.properties['platforms.JDK_1.8.home'] = "${rootProject.ext.JDK_HOME}"
               ant.project.executeTarget("sampleAppsJar")
+              ant.project.executeTarget("scenebuilderSampleAppsJar")
             }
         }
         rootProject.appsjar.dependsOn(appsJar)
@@ -3022,6 +3023,7 @@
               ant.properties['targetBld'] = "$t.name"
               ant.properties['platforms.JDK_1.8.home'] = "${rootProject.ext.JDK_HOME}"
               ant.project.executeTarget("sampleAppsClean")
+              ant.project.executeTarget("scenebuilderSampleAppsClean")
             }
         }
         rootProject.clean.dependsOn(appsClean)