<property file="nbproject/project.properties"/>\r
</target>\r
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
- <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>\r
- <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>\r
- <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>\r
- <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>\r
- <condition property="platform.javac" value="${platform.home}/bin/javac">\r
- <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>\r
- </condition>\r
- <property name="platform.javac" value="${platform.javac.tmp}"/>\r
- <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>\r
- <condition property="platform.java" value="${platform.home}/bin/java">\r
- <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>\r
- </condition>\r
- <property name="platform.java" value="${platform.java.tmp}"/>\r
- <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>\r
- <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">\r
- <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>\r
- </condition>\r
- <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>\r
- <condition property="platform.invalid" value="true">\r
- <or>\r
- <contains string="${platform.javac}" substring="$${platforms."/>\r
- <contains string="${platform.java}" substring="$${platforms."/>\r
- <contains string="${platform.javadoc}" substring="$${platforms."/>\r
- </or>\r
- </condition>\r
- <fail unless="platform.home">Must set platform.home</fail>\r
- <fail unless="platform.bootcp">Must set platform.bootcp</fail>\r
- <fail unless="platform.java">Must set platform.java</fail>\r
- <fail unless="platform.javac">Must set platform.javac</fail>\r
- <fail if="platform.invalid">\r
- The J2SE Platform is not correctly set up.\r
- Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. \r
- Either open the project in the IDE and setup the Platform with the same name or add it manually.\r
- For example like this:\r
- ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file)\r
- or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used) \r
- </fail>\r
<available file="${manifest.file}" property="manifest.available"/>\r
<condition property="splashscreen.available">\r
<and>\r
<condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
<length length="0" string="${endorsed.classpath}" when="greater"/>\r
</condition>\r
+ <condition else="false" property="jdkBug6558476">\r
+ <and>\r
+ <matches pattern="1\.[56]" string="${java.specification.version}"/>\r
+ <not>\r
+ <os family="unix"/>\r
+ </not>\r
+ </and>\r
+ </condition>\r
+ <property name="javac.fork" value="${jdkBug6558476}"/>\r
<property name="jar.index" value="false"/>\r
<property name="jar.index.metainf" value="${jar.index}"/>\r
<property name="copylibs.rebase" value="true"/>\r
<property location="${build.dir}/empty" name="empty.dir"/>\r
<mkdir dir="${empty.dir}"/>\r
<mkdir dir="@{apgeneratedsrcdir}"/>\r
- <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}">\r
+ <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}">\r
<src>\r
<dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
<include name="*"/>\r
<sequential>\r
<property location="${build.dir}/empty" name="empty.dir"/>\r
<mkdir dir="${empty.dir}"/>\r
- <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}">\r
+ <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}">\r
<src>\r
<dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
<include name="*"/>\r
<attribute default="**" name="testincludes"/>\r
<sequential>\r
<property name="junit.forkmode" value="perTest"/>\r
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
<batchtest todir="${build.test.results.dir}">\r
<fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">\r
<filename name="@{testincludes}"/>\r
<classpath>\r
<path path="@{classpath}"/>\r
</classpath>\r
- <bootclasspath>\r
- <path path="${platform.bootcp}"/>\r
- </bootclasspath>\r
</nbjpdastart>\r
</sequential>\r
</macrodef>\r
</macrodef>\r
</target>\r
<target name="-init-debug-args">\r
- <exec executable="${platform.java}" outputproperty="version-output">\r
- <arg value="-version"/>\r
- </exec>\r
+ <property name="version-output" value="java version "${ant.java.version}"/>\r
<condition property="have-jdk-older-than-1.4">\r
<or>\r
<contains string="${version-output}" substring="java version "1.0"/>\r
<attribute default="${debug.classpath}" name="classpath"/>\r
<element name="customize" optional="true"/>\r
<sequential>\r
- <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+ <java classname="@{classname}" dir="${work.dir}" fork="true">\r
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
<jvmarg line="${debug-args-line}"/>\r
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
<attribute default="${run.classpath}" name="classpath"/>\r
<element name="customize" optional="true"/>\r
<sequential>\r
- <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+ <java classname="@{classname}" dir="${work.dir}" fork="true">\r
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
<path path="${run.classpath}"/>\r
<map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
</pathconvert>\r
- <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
+ <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
</target>\r
<target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">\r
<tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>\r
<echo level="info">To run this application from the command line without Ant, try:</echo>\r
<property location="${dist.jar}" name="dist.jar.resolved"/>\r
- <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>\r
+ <echo level="info">java -jar "${dist.jar.resolved}"</echo>\r
</target>\r
<target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">\r
<delete>\r
</not>\r
</and>\r
</condition>\r
- <javadoc additionalparam="${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}">\r
+ <javadoc additionalparam="${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}">\r
<classpath>\r
<path path="${javac.classpath}"/>\r
</classpath>\r