changeset 5915:cc52e2bbd227

RT-31668: [SAMPLES] correcting reference to jfxrt.jar in shipping samples for NB Reviewed-by: kcr
author ddhill
date Fri, 06 Dec 2013 10:50:09 -0500
parents f87309876fe2
children cf97e24de0c3
files apps/build.xml apps/experiments/3DViewer/nbproject/project.properties apps/experiments/Modena/nbproject/project.properties apps/samples/Ensemble8/nbproject/project.properties apps/toys/Hello/nbproject/project.properties build.gradle
diffstat 6 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/apps/build.xml	Thu Dec 05 22:47:03 2013 -0800
+++ b/apps/build.xml	Fri Dec 06 10:50:09 2013 -0500
@@ -7,11 +7,6 @@
     -->
 
     <target name="sampleAppsJar">
-        <condition property="jfxrt.jar.exists">
-            <available file="${file.reference.jfxrt.jar}" type="file"/>
-        </condition>
-        <fail unless="jfxrt.jar.exists"/>
-
         <ant dir="samples" target="jar" inheritAll="true"/>
         <ant dir="experiments" target="jar" inheritAll="true"/>
         <ant dir="performance" target="jar" inheritAll="true"/>
--- a/apps/experiments/3DViewer/nbproject/project.properties	Thu Dec 05 22:47:03 2013 -0800
+++ b/apps/experiments/3DViewer/nbproject/project.properties	Fri Dec 06 10:50:09 2013 -0500
@@ -27,11 +27,11 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jfxrt.jar=../../../../artifacts/sdk/rt/lib/ext/jfxrt.jar
+jfxbuild.jfxrt.jar=
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.jfxrt.jar}
+    ${jfxbuild.jfxrt.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
--- a/apps/experiments/Modena/nbproject/project.properties	Thu Dec 05 22:47:03 2013 -0800
+++ b/apps/experiments/Modena/nbproject/project.properties	Fri Dec 06 10:50:09 2013 -0500
@@ -27,11 +27,11 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jfxrt.jar=../../../../artifacts/sdk/rt/lib/ext/jfxrt.jar
+jfxbuild.jfxrt.jar=
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.jfxrt.jar}
+    ${jfxbuild.jfxrt.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
--- a/apps/samples/Ensemble8/nbproject/project.properties	Thu Dec 05 22:47:03 2013 -0800
+++ b/apps/samples/Ensemble8/nbproject/project.properties	Fri Dec 06 10:50:09 2013 -0500
@@ -27,7 +27,7 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jfxrt.jar=../../../../artifacts/sdk/rt/lib/ext/jfxrt.jar
+jfxbuild.jfxrt.jar=
 file.reference.lucene-core-3.2.0.jar=lib/lucene-core-3.2.0.jar
 file.reference.lucene-grouping-3.2.0.jar=lib/lucene-grouping-3.2.0.jar
 includes=**
@@ -35,7 +35,7 @@
 jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${file.reference.jfxrt.jar}:\
+    ${jfxbuild.jfxrt.jar}:\
     ${file.reference.lucene-core-3.2.0.jar}:\
     ${file.reference.lucene-grouping-3.2.0.jar}
 # Space-separated list of extra javac options
--- a/apps/toys/Hello/nbproject/project.properties	Thu Dec 05 22:47:03 2013 -0800
+++ b/apps/toys/Hello/nbproject/project.properties	Fri Dec 06 10:50:09 2013 -0500
@@ -27,13 +27,13 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jfxrt.jar=../../../artifacts/sdk/rt/lib/ext/jfxrt.jar
+jfxbuild.jfxrt.jar=
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${file.reference.jfxrt.jar}
+    ${jfxbuild.jfxrt.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-XDignore.symbol.file
 javac.deprecation=false
--- a/build.gradle	Thu Dec 05 22:47:03 2013 -0800
+++ b/build.gradle	Fri Dec 06 10:50:09 2013 -0500
@@ -2726,7 +2726,7 @@
               if (!rootProject.ext[t.upper].compileSwing) {
                 ant.properties['JFX_CORE_ONLY'] = 'true'
               }
-              ant.properties['file.reference.jfxrt.jar'] = jfxrtJar
+              ant.properties['jfxbuild.jfxrt.jar'] = jfxrtJar
               ant.properties['platforms.JDK_1.8.home'] = "${rootProject.ext.JDK_HOME}"
               ant.project.executeTarget("sampleAppsJar")
             }