|
78 | 78 | <include name="lib/cmm/PYCC.pf" /> |
79 | 79 | </fileset> |
80 | 80 |
|
81 | | - <!-- There might be others, based on what was in the Java 6 docs, |
82 | | - but that info isn't part of the Java 7 instructions. |
83 | | - http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html --> |
84 | | - |
85 | 81 | <!-- Unused JavaFX files that can be removed from the JRE on Windows |
86 | 82 | and Linux. On Mac OS X, this is removed by the appbundler task. |
87 | 83 | www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html --> |
88 | 84 |
|
| 85 | + <!-- There might be others, based on what was in the Java 6 docs, |
| 86 | + but that info isn't part of the Java 7 instructions. |
| 87 | + http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html --> |
| 88 | + |
89 | 89 | <fileset dir="${platform}/work/java" id="javafx-basics"> |
90 | 90 | <include name="THIRDPARTYLICENSEREADME-JAVAFX.txt" /> |
91 | 91 | <include name="lib/javafx.properties" /> |
|
801 | 801 | </condition> |
802 | 802 | <delete dir="${target.path}/modes/java/libraries/video/library/windows${video.delete}" /> |
803 | 803 |
|
804 | | - |
805 | | - <!-- TODO It would be better to not copy these, but use them in place. |
806 | | - I believe it's handled this way b/c launch4j was finicky about paths. |
807 | | - (i.e. it needed the lib/pde.jar to be present during build) --> |
808 | | -<!-- |
809 | | - <copy todir="windows/work"> |
810 | | - <fileset dir="windows" |
811 | | - includes="about.bmp, application.ico, config.xml, config-cmd.xml"/> |
812 | | - </copy> |
813 | | ---> |
814 | 804 | <taskdef name="launch4j" |
815 | 805 | classname="net.sf.launch4j.ant.Launch4jTask" |
816 | 806 | classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" /> |
817 | 807 |
|
818 | 808 | <!-- not all launch4j options are available when embedded inside this |
819 | 809 | file (i.e. the icon param doesn't work), so use a config file --> |
820 | | - |
821 | | -<!-- |
822 | | - <launch4j configFile="windows/work/config.xml" /> |
823 | | - <launch4j configFile="windows/work/config-cmd.xml" /> |
824 | | ---> |
825 | | - |
826 | 810 | <launch4j configFile="windows/config.xml" /> |
827 | 811 | <launch4j configFile="windows/config-cmd.xml" /> |
828 | 812 |
|
829 | | -<!-- |
830 | | - <delete dir="windows/work" |
831 | | - includes="about.bmp, application.ico, config.xml, config-cmd.xml" /> |
832 | | ---> |
833 | | - |
834 | | -<!-- |
835 | | - <launch4j> |
836 | | - <config headerType="gui" |
837 | | - outfile="windows/work/processing-java.exe" |
838 | | - dontWrapJar="false" |
839 | | - jarPath="../app/pde.jar"> |
840 | | - <classPath mainClass="processing.mode.java.Commander"> |
841 | | - <cp>lib/pde.jar</cp> |
842 | | - <cp>lib/antlr.jar</cp> |
843 | | - <cp>lib/jdt-core.jar</cp> |
844 | | - <cp>lib/jna.jar</cp> |
845 | | - <cp>lib/ant.jar</cp> |
846 | | - <cp>lib/ant-launcher.jar</cp> |
847 | | - <cp>core/library/core.jar</cp> |
848 | | - <cp>%JAVA_HOME%/lib/tools.jar</cp> |
849 | | - </classPath> |
850 | | - <jre minVersion="1.6.0" jdkPreference="jdkOnly"> |
851 | | - </jre> |
852 | | - </config> |
853 | | - </launch4j> |
854 | | ---> |
855 | | - |
856 | 813 | <!-- cygwin requires html, dll, and exe to have the +x flag --> |
857 | 814 | <chmod perm="ugo+x"> |
858 | 815 | <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" /> |
859 | 816 | </chmod> |
860 | 817 |
|
861 | 818 | <!-- starting with 2.0a7, require the local JRE + tools.jar --> |
862 | | - <!-- |
863 | | - <property name="jre.file" |
864 | | - value="jre-tools-6u37-windows${sun.arch.data.model}.zip" /> |
865 | | - --> |
866 | 819 | <get src="http://processing.googlecode.com/files/${jre.file}" |
867 | 820 | dest="windows/jre.tgz" |
868 | 821 | usetimestamp="true" /> |
|
0 commit comments