Expand Up @@ -119,43 +119,7 @@ is divided into following sections: <property name="module.name" value=""/> </target> <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init"> <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/> <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> <condition property="platform.javac" value="${platform.home}/bin/javac"> <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> </condition> <property name="platform.javac" value="${platform.javac.tmp}"/> <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> <condition property="platform.java" value="${platform.home}/bin/java"> <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> </condition> <property name="platform.java" value="${platform.java.tmp}"/> <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> </condition> <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> <condition property="platform.invalid" value="true"> <or> <contains string="${platform.javac}" substring="$${platforms."/> <contains string="${platform.java}" substring="$${platforms."/> <contains string="${platform.javadoc}" substring="$${platforms."/> </or> </condition> <fail unless="platform.home">Must set platform.home</fail> <fail unless="platform.bootcp">Must set platform.bootcp</fail> <fail unless="platform.java">Must set platform.java</fail> <fail unless="platform.javac">Must set platform.javac</fail> <fail if="platform.invalid"> The J2SE Platform is not correctly set up. Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. Either open the project in the IDE and setup the Platform with the same name or add it manually. For example like this: ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file) or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) </fail> <property name="platform.java" value="${java.home}/bin/java"/> <available file="${manifest.file}" property="manifest.available"/> <condition property="splashscreen.available"> <and> Expand Down Expand Up @@ -278,6 +242,20 @@ is divided into following sections: <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}"> <isset property="profile.available"/> </condition> <condition else="false" property="jdkBug6558476"> <and> <matches pattern="1\.[56]" string="${java.specification.version}"/> <not> <os family="unix"/> </not> </and> </condition> <condition else="false" property="javac.fork"> <or> <istrue value="${jdkBug6558476}"/> <istrue value="${javac.external.vm}"/> </or> </condition> <property name="jar.index" value="false"/> <property name="jar.index.metainf" value="${jar.index}"/> <property name="copylibs.rebase" value="true"/> Expand Down Expand Up @@ -365,7 +343,7 @@ is divided into following sections: </path> </resourcecount> </condition> <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <src> <dirset dir="@{gensrcdir}" erroronmissingdir="false"> <include name="*"/> Expand Down Expand Up @@ -416,7 +394,7 @@ is divided into following sections: <property location="${build.dir}/empty" name="empty.dir"/> <mkdir dir="${empty.dir}"/> <mkdir dir="@{apgeneratedsrcdir}"/> <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <src> <dirset dir="@{gensrcdir}" erroronmissingdir="false"> <include name="*"/> Expand Down Expand Up @@ -458,7 +436,7 @@ is divided into following sections: <sequential> <property location="${build.dir}/empty" name="empty.dir"/> <mkdir dir="${empty.dir}"/> <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> <src> <dirset dir="@{gensrcdir}" erroronmissingdir="false"> <include name="*"/> Expand Down Expand Up @@ -537,7 +515,7 @@ is divided into following sections: <element name="customizePrototype" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <syspropertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> Expand Down Expand Up @@ -565,7 +543,7 @@ is divided into following sections: <element name="customizePrototype" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> <syspropertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> Expand Down Expand Up @@ -641,7 +619,7 @@ is divided into following sections: </fileset> </union> <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WorldWindJava" testname="TestNG tests" workingDir="${work.dir}"> <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WorldWindJava" testname="TestNG tests" workingDir="${work.dir}"> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <propertyset> <propertyref prefix="test-sys-prop."/> Expand Down Expand Up @@ -872,9 +850,6 @@ is divided into following sections: <classpath> <path path="@{classpath}"/> </classpath> <bootclasspath> <path path="${platform.bootcp}"/> </bootclasspath> </nbjpdastart> </sequential> </macrodef> Expand Down Expand Up @@ -924,7 +899,7 @@ is divided into following sections: <attribute default="jvm" name="jvm"/> <element name="customize" optional="true"/> <sequential> <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}" module="@{modulename}"> <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}"> <classpath> <path path="@{classpath}"/> </classpath> Expand Down Expand Up @@ -958,7 +933,7 @@ is divided into following sections: <attribute default="jvm" name="jvm"/> <element name="customize" optional="true"/> <sequential> <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}"> <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> <classpath> <path path="@{classpath}"/> </classpath> Expand Down Expand Up @@ -990,7 +965,7 @@ is divided into following sections: <attribute default="jvm" name="jvm"/> <element name="customize" optional="true"/> <sequential> <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}"> <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> Expand Down Expand Up @@ -1224,7 +1199,7 @@ is divided into following sections: <j2seproject3:copylibs manifest="${tmp.manifest.file}"/> <echo level="info">To run this application from the command line without Ant, try:</echo> <property location="${dist.jar}" name="dist.jar.resolved"/> <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo> <echo level="info">java -jar "${dist.jar.resolved}"</echo> </target> <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist"> <j2seproject1:jar manifest="${tmp.manifest.file}"/> Expand Down Expand Up @@ -1326,8 +1301,8 @@ is divided into following sections: <isset property="main.class.available"/> </and> </condition> <property name="platform.jlink" value="${platform.home}/bin/jlink"/> <property name="jlink.systemmodules.internal" value="${platform.home}/jmods"/> <property name="platform.jlink" value="${jdk.home}/bin/jlink"/> <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/> <exec executable="${platform.jlink}"> <arg value="--module-path"/> <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/> Expand Down Expand Up @@ -1520,19 +1495,16 @@ is divided into following sections: </not> </and> </condition> <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output"> <arg value="-version"/> </exec> <condition else="" property="bug5101868workaround" value="*.java"> <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/> <matches pattern="1\.[56](\..*)?" string="${java.version}"/> </condition> <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5"> <and> <isset property="javadoc.html5"/> <available file="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/> <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/> </and> </condition> <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> <classpath> <path path="${javac.classpath}"/> </classpath> Expand Down