changeset 265:11dc6a01620e

Applying a few further build fixes that I didn't include in the last repo push.
author jgiles
date Mon, 16 Jan 2012 13:37:25 +1300
parents 76c936e4f685
children 3723daa03e05
files build-defs.xml build.xml javafx-ui-controls/nbproject/project.xml
diffstat 3 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/build-defs.xml	Mon Jan 16 13:08:38 2012 +1300
+++ b/build-defs.xml	Mon Jan 16 13:37:25 2012 +1300
@@ -11,15 +11,9 @@
     
     <!-- 
         Bring in environment properties (if not already done).
-        If the environment variable JFXRT_HOME is not set, we set it here to 
-        point to a sane default location. We also create a slightly nicer to
-        understand JFXRT_HOME property to use elsewhere.
     -->
-    <!--
     <property environment="env"/>
-    <property name="env.JFXRT_HOME" value="${runtime.dist.root.dir}/../artifacts/sdk/rt/lib" />
     <property name="JFXRT_HOME" value="${env.JFXRT_HOME}" />
-    -->
     
     <!--
         Note that .properties files are loaded relative to the basedir of
@@ -186,7 +180,7 @@
             </jar>
 
             <!-- copy the jar file to the shared lib directory -->
-            <copy file="${dist.dir}/@{name}.jar" todir="${runtime.deps.dir}"/>
+            <copy file="${dist.dir}/@{name}.jar" todir="../build"/> <!--${runtime.deps.dir}-->
         </sequential>
     </macrodef>
 
--- a/build.xml	Mon Jan 16 13:08:38 2012 +1300
+++ b/build.xml	Mon Jan 16 13:37:25 2012 +1300
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
@@ -24,7 +25,6 @@
  * questions.
  */
 --> 
-<?xml version="1.0" encoding="UTF-8"?>
 <project name="JavaFX Runtime" default="dist" basedir=".">
     <description>Builds, tests, and runs the project JavaFX Runtime</description>
 
--- a/javafx-ui-controls/nbproject/project.xml	Mon Jan 16 13:08:38 2012 +1300
+++ b/javafx-ui-controls/nbproject/project.xml	Mon Jan 16 13:37:25 2012 +1300
@@ -139,7 +139,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
             <compilation-unit>
                 <package-root>${src.dir}</package-root>
-                <classpath mode="compile">${JFXRT_HOME}/jfxrt.jar</classpath>
+                <classpath mode="compile">${javac.classpath}</classpath>
                 <built-to>dist/javafx-ui-controls.jar</built-to>
                 <source-level>1.6</source-level>
             </compilation-unit>