Changeset 748 for trunk/build.xml

Timestamp:

01/24/14 11:32:31 (10 years ago)

Author:

ngw8

Message:

Changed JFX files to no longer use reflection (as some new features were impossible via reflection) and just import javafx instead. This will probably cause Eclipse to complain if you're using a Java version <= 7, but building/running Expeditee will still work (using Eclipse or Ant).
Have also added an Ant target that builds without ant JFX stuff. See the comments near the top of JfxBrowser.java or WebParser.java for details

File:

• trunk/build.xml (modified) (4 diffs)

trunk/build.xml

@@ -49 +49 @@
                 </fileset>
         </path>
-
+        
+        <path id="classpath.jfx">
+                <!-- Check this points to an existing file, if you can't find the jar just compile with build-nojfx -->
+                <pathelement location="${java.home}/lib/jfxrt.jar"/>
+        </path>
 
         <target name="clean">
@@ -64 +68 @@
                         <fileset dir="src">
                                 <exclude name="**/*.java"/>
-                                <exclude name="org/expeditee/items/widgets/WebBrowser.java"/>
                         </fileset>
                 </copy>
@@ -73 +76 @@
                 </copy>
         </target>
-
+        
         <target depends="init" name="build">
                 <javac source="${javac.source}" target="${javac.target}" debug="false" 
                        destdir="${build.dir.exp}" includeantruntime="false">                       
+                        
                         <src path="src"/>
                         <src path="tests"/>
+                        
                         <exclude name="org/expeditee/items/widgets/WebBrowser.java"/>
+                
+                        <classpath>
+                                <path refid="classpath.exp"/>
+                                
+                                <!-- jfxrt.jar path -->
+                                <path refid="classpath.jfx"/>
+                        </classpath>
+                </javac>
+        </target>
+
+        <target depends="init" name="build-nojfx">
+                <javac source="${javac.source}" target="${javac.target}" debug="false" 
+                       destdir="${build.dir.exp}" includeantruntime="false">                       
+                        
+                        <src path="tests"/>
+                        <src path="src"/>
+                        <exclude name="org/expeditee/items/widgets/WebBrowser.java"/>
+                        
+                        <!-- Files that rely on JavaFX. Use build to build with them included -->
+                        <exclude name="org/expeditee/items/widgets/JfxBrowser.java"/>
+                        <exclude name="org/expeditee/io/WebParser.java"/>
+                        <exclude name="org/expeditee/actions/JfxBrowserActions.java"/>  
+                        
                         <classpath refid="classpath.exp"/>
                 </javac>
         </target>
+        
+
+        
         <target depends="build" name="jar">
                 <jar destfile="${dist.dir.exp}/${dist.filename.exp}" manifest="${manifest.path.exp}">
@@ -117 +148 @@
         <target name="run">
                 <java classname="org.expeditee.gui.Browser" failonerror="true" fork="yes">
-                        <classpath refid="classpath.exp"/>
                         <classpath>
+                                <path refid="classpath.exp"/>
+                                
+                                <!-- jfxrt.jar path -->
+                                <path refid="classpath.jfx"/>
+
                                 <pathelement location="${build.dir.exp}"/>
                         </classpath>