changeset 11:5849e8c0f122

Define more properties for build output locations. Remove ant-contrib macro.
author skovatch
date Fri, 21 Dec 2012 13:08:35 -0800
parents 718828dc78af
children 30c264fe5819
files build-defs.xml project.properties
diffstat 2 files changed, 35 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/build-defs.xml	Fri Aug 24 16:35:16 2012 -0700
+++ b/build-defs.xml	Fri Dec 21 13:08:35 2012 -0800
@@ -35,11 +35,11 @@
         Sub-repositories should import this file into their build.xml file.
 
         This file will import all other necessary top repository build-*.xml files.
-    
+
     </description>
-   
+
     <!-- This file determines root of the source tree for project -->
-    
+
     <dirname property="jfx.root.dir" file="${ant.file.build-defs}"/>
     <property name="jfx.root.build.src.dir" location="${jfx.root.dir}/build-src"/>
 
@@ -48,15 +48,15 @@
     <property file="${jfx.root.dir}/hg.properties"/>
 
     <!-- Get platform, or, and arch properties and targets -->
-    
+
     <import file="${jfx.root.build.src.dir}/build-os-arch.xml"/>
 
     <!-- Default property values -->
-    
+
     <property file="${jfx.root.dir}/project.properties"/>
 
     <!-- Local overrides -->
-    
+
     <property file="${jfx.root.dir}/project.local.properties"/>
 
     <!-- Get properties defined from the environment -->
@@ -70,13 +70,13 @@
     <!-- Get jars -->
 
     <import file="${jfx.root.build.src.dir}/build-jar-importer.xml"/>
-  
+
     <!-- Get platform properties and targets -->
-    
+
     <import file="${jfx.root.build.src.dir}/build-${os_name}-defs.xml"/>
 
     <!-- Macrodefs for generic things to be shared by everyone -->
-    
+
     <!-- JAVAC -->
     <macrodef name="do-javac">
         <attribute name="srcdir"/>
@@ -108,7 +108,7 @@
             </javac>
         </sequential>
     </macrodef>
-    
+
     <!-- JAVA -->
     <presetdef name="do-java.preset">
         <java fork="true" dir="${run.dir}">
@@ -119,7 +119,7 @@
             </classpath>
         </java>
     </presetdef>
-    
+
     <macrodef name="do-java">
         <attribute name="classname" default="${run.main.class}"/>
         <sequential>
@@ -129,7 +129,7 @@
             <do-java.preset classname="@{classname}"/>
         </sequential>
     </macrodef>
-    
+
     <macrodef name="do-java-debug">
         <attribute name="classname" default="${run.main.class}"/>
         <sequential>
@@ -147,7 +147,7 @@
             </do-java.preset>
         </sequential>
     </macrodef>
-    
+
     <macrodef name="do-java-test">
         <attribute name="classname"/>
         <sequential>
@@ -156,7 +156,7 @@
             <do-java.preset classname="@{classname}" classpath="${test.run.classpath}" dir="${test.run.dir}"/>
         </sequential>
     </macrodef>
-    
+
     <macrodef name="print-property">
         <attribute name="property"/>
         <sequential>
@@ -236,7 +236,7 @@
     </macrodef>
 
     <!-- Unzip macrodef -->
-    
+
     <macrodef name="do-unzip-bundle">
         <attribute name="zip"/>
         <attribute name="dir"/>
@@ -294,24 +294,17 @@
             </classpath>
         </taskdef>
     </target>
-    
+
     <target name="-init-findbugs">
         <property name="findbugs.home" value="${import.findbugs.home}" />
         <path id="findbugs-jar">
             <pathelement path="${findbugs.home}/lib/findbugs-ant.jar" />
         </path>
-        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs-jar" /> 
+        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs-jar" />
         <taskdef name="convertXmlToText"
          classname="edu.umd.cs.findbugs.anttask.ConvertXmlToTextTask"
          classpathref="findbugs-jar"/>
     </target>
 
-    <!-- ant-contrib -->
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
-        <classpath>
-            <pathelement location="${import.ant-contrib.jar}"/>
-        </classpath>
-    </taskdef>
-
 </project>
 
--- a/project.properties	Fri Aug 24 16:35:16 2012 -0700
+++ b/project.properties	Fri Dec 21 13:08:35 2012 -0800
@@ -11,3 +11,21 @@
 
 # Antlr max memory setting
 jfx.antlr.max.memory=512m
+
+# Top-level build directory
+jfx.build.dir=${jfx.root.dir}/build
+
+# Deliverables or artifacts root
+jfx.root.output.dir=${jfx.root.dir}/artifacts
+jfx.artifacts.dir=${jfx.root.output.dir}
+
+# Top-level distribution directory for the deploy files
+jfx.deployed.dir=${jfx.artifacts.dir}/deployed
+
+# Top-level distribution directory for the SDK
+jfx.sdk.dir=${jfx.artifacts.dir}/sdk
+
+# SDK sub directories
+jfx.sdk.docs.dir=${jfx.sdk.dir}/docs
+jfx.sdk.man.dir=${jfx.sdk.dir}/man
+jfx.sdk.bin.dir=${jfx.sdk.dir}/bin