changeset 263:9c8cb471b9a3

Fixing a number of build issues related to incorrect copying of files
author jgiles
date Mon, 16 Jan 2012 12:42:45 +1300
parents a57888137e33
children 76c936e4f685
files javafx-beans-dt/project.properties javafx-concurrent/build.xml javafx-concurrent/project.properties javafx-designtime/project.properties
diffstat 4 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/javafx-beans-dt/project.properties	Sat Jan 14 11:07:24 2012 +1300
+++ b/javafx-beans-dt/project.properties	Mon Jan 16 12:42:45 2012 +1300
@@ -1,10 +1,8 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt/lib
-javac.classpath=\
-    ${JFXRT_HOME}/jfxrt.jar
 disable-lombok=true
 javac.classpath=\
     ${runtime.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
     ${runtime.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
-    ${runtime.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar
-
+    ${runtime.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
+    ${JFXRT_HOME}/jfxrt.jar
\ No newline at end of file
--- a/javafx-concurrent/build.xml	Sat Jan 14 11:07:24 2012 +1300
+++ b/javafx-concurrent/build.xml	Mon Jan 16 12:42:45 2012 +1300
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="javafx-beans-dt" default="jar" basedir=".">
+<project name="javafx-concurrent" default="jar" basedir=".">
   <description>Builds, tests, and runs the project javafx-beans-dt.</description>
 
   <import file="../build-defs.xml"/>
--- a/javafx-concurrent/project.properties	Sat Jan 14 11:07:24 2012 +1300
+++ b/javafx-concurrent/project.properties	Mon Jan 16 12:42:45 2012 +1300
@@ -1,13 +1,12 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt/lib
-javac.classpath=\
-    ${JFXRT_HOME}/jfxrt.jar
 disable-lombok=true
 javac.classpath=\
     ${runtime.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
     ${runtime.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
     ${runtime.dist.root.dir}/javafx-logging/dist/javafx-logging.jar:\
-    ${runtime.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar
+    ${runtime.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
+    ${JFXRT_HOME}/jfxrt.jar
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
--- a/javafx-designtime/project.properties	Sat Jan 14 11:07:24 2012 +1300
+++ b/javafx-designtime/project.properties	Mon Jan 16 12:42:45 2012 +1300
@@ -1,12 +1,11 @@
 JFXRT_HOME=\
     ${runtime.dist.root.dir}/../artifacts/sdk/rt/lib
-javac.classpath=\
-    ${JFXRT_HOME}/jfxrt.jar
 disable-lombok=true
 javac.classpath=\
     ${runtime.dist.root.dir}/javafx-beans/dist/javafx-beans.jar:\
     ../javafx-beans-dt/dist/javafx-beans-dt.jar:\
     ${runtime.dist.root.dir}/javafx-common/dist/javafx-common.jar:\
     ${runtime.dist.root.dir}/../rt/javafx-ui-controls/dist/javafx-ui-controls.jar:\
-    ${runtime.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar
+    ${runtime.dist.root.dir}/javafx-ui-common/dist/javafx-ui-common.jar:\
+    ${JFXRT_HOME}/jfxrt.jar