[subversion:13] Fix for issue #107 - build.xml should support using an installed SDK ins

[dkaspar@kenai.com]

Repository: subversion
Revision:   13
Author:     dkaspar
Date:       2009-01-06 14:04:54 UTC

Log Message:
-----------
Fix for issue #107 - build.xml should support using an installed SDK
instead of unpacking a zip file


Modified Paths:
--------------
    trunk/build.xml

Diffs:
-----
Index: trunk/build.xml
===================================================================
--- trunk/build.xml     (revision 12)
+++ trunk/build.xml     (revision 13)
@@ -127,11 +127,6 @@
         <fail message="Set 'eclipseDir' property to your Eclipse SDK"
unless="eclipseDir"/>
         <delete dir="javafx-sdk"/>
 
-        <var name="-sdk.url" value="${javafx.sdk.build.url}"/>
-        <get src="${-sdk.url}" dest="javafx-sdk-${platform}.zip"
usetimestamp="true"/>
-        <unzip src="javafx-sdk-${platform}.zip" dest="."/>
-        <move file="${javafx.sdk.root.dir}" tofile="javafx-sdk"/>
-        
         <echo
file="com.sun.javafx.eclipse.build/build_local.properties"># This file
has been generated by the root-level Ant script
 eclipseDir=${eclipseDir}
 buildHome=${buildHome}
@@ -141,14 +136,8 @@
 arch=${arch}
 </echo>
 
-        <!-- place your code here e.g. copying files from SDK (in
'javafx-sdk' directory) to your plugins -->
-        <copy todir="com.sun.javafx.eclipse.editor.lib">
-            <fileset dir="javafx-sdk/lib/shared">
-                <include name="javafxc.jar"/>
-                <include name="javafxdoc.jar"/>
-            </fileset>
-        </copy>
-        
+        <available property="sdk.lib.dir.found"
file="${env.JAVAFX_HOME}/lib" type="dir"/>
+        <antcall target="-copy-sdk-jars"/>
         <ant dir="com.sun.javafx.eclipse.build"/>
         
         <delete
file="dist/com.sun.javafx.eclipse.feature-${os}-${ws}-${arch}.zip"/>
@@ -161,5 +150,28 @@
             <fileset dir="doc" includes="**/*"/>
         </copy>
     </target>
+
+    <target name="-copy-sdk-jars" depends="-use-sdk-jars-from-install,
-use-sdk-jars-from-zip">
+        <!-- place your code here e.g. copying files from SDK (in
'javafx-sdk' directory) to your plugins -->
+        <copy todir="com.sun.javafx.eclipse.editor.lib">
+            <fileset dir="${javafx-sdk.lib.shared.dir}">
+                <include name="javafxc.jar"/>
+                <include name="javafxdoc.jar"/>
+            </fileset>
+        </copy>
+    </target>
+       
+    <target name="-use-sdk-jars-from-install" if="sdk.lib.dir.found">
+        <property name="javafx-sdk.lib.shared.dir"
value="${env.JAVAFX_HOME}/lib/shared"/>
+    </target>
+               
+    <target name="-use-sdk-jars-from-zip" unless="sdk.lib.dir.found">
+        <var name="-sdk.url" value="${javafx.sdk.build.url}"/>
+        <get src="${-sdk.url}" dest="javafx-sdk-${platform}.zip"
usetimestamp="true"/>
+        <unzip src="javafx-sdk-${platform}.zip" dest="."/>
+        <move file="${javafx.sdk.root.dir}" tofile="javafx-sdk"/>
+        
+        <property name="javafx-sdk.lib.shared.dir"
value="javafx-sdk/lib/shared"/>
+    </target>
     
 </project>