Modified: sis/branches/JDK8/ide-project/NetBeans/nbproject/build-impl.xml URL: http://svn.apache.org/viewvc/sis/branches/JDK8/ide-project/NetBeans/nbproject/build-impl.xml?rev=1828799&r1=1828798&r2=1828799&view=diff ============================================================================== --- sis/branches/JDK8/ide-project/NetBeans/nbproject/build-impl.xml (original) +++ sis/branches/JDK8/ide-project/NetBeans/nbproject/build-impl.xml Tue Apr 10 08:52:43 2018 @@ -19,7 +19,7 @@ is divided into following sections: - cleanup --> -<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1"; xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"; xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc"; xmlns:unless="ant:unless" basedir=".." default="default" name="Apache_SIS_for_JDK8-impl"> +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1"; xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"; xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc"; basedir=".." default="default" name="Apache_SIS_for_JDK8-impl"> <fail message="Please build using Ant 1.8.0 or higher."> <condition> <not> @@ -53,72 +53,7 @@ is divided into following sections: <property file="nbproject/configs/${config}.properties"/> <property file="nbproject/project.properties"/> </target> - <target name="-init-modules-supported"> - <condition property="modules.supported.internal" value="true"> - <not> - <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/> - </not> - </condition> - </target> - <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename"> - <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute name="property"/> - <attribute name="sourcepath"/> - <sequential> - <loadresource property="@{property}" quiet="true"> - <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/> - <filterchain> - <stripjavacomments/> - <linecontainsregexp> - <regexp pattern="module .* \{"/> - </linecontainsregexp> - <tokenfilter> - <linetokenizer/> - <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/> - </tokenfilter> - <striplinebreaks/> - </filterchain> - </loadresource> - </sequential> - </macrodef> - </target> - <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties"> - <fail message="Java 9 support requires Ant 1.10.0 or higher."> - <condition> - <not> - <antversion atleast="1.10.0"/> - </not> - </condition> - </fail> - <j2seproject3:modulename property="module.name" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"/> - <condition property="named.module.internal"> - <and> - <isset property="module.name"/> - <length length="0" string="${module.name}" when="greater"/> - </and> - </condition> - <condition property="unnamed.module.internal"> - <not> - <isset property="named.module.internal"/> - </not> - </condition> - <property name="javac.modulepath" value=""/> - <property name="run.modulepath" value="${javac.modulepath}"/> - <property name="module.build.classes.dir" value="${build.classes.dir}"/> - <property name="debug.modulepath" value="${run.modulepath}"/> - <property name="javac.upgrademodulepath" value=""/> - <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/> - <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'"> - <and> - <isset property="javac.systemmodulepath"/> - <length length="0" string="${javac.systemmodulepath}" when="greater"/> - </and> - </condition> - <property name="dist.jlink.dir" value="${dist.dir}/jlink"/> - <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/> - <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"> + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> <property name="platform.java" value="${java.home}/bin/java"/> <available file="${manifest.file}" property="manifest.available"/> <condition property="splashscreen.available"> @@ -141,9 +76,7 @@ is divided into following sections: <and> <isset property="javac.profile"/> <length length="0" string="${javac.profile}" when="greater"/> - <not> - <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/> - </not> + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/> </and> </condition> <condition property="do.archive"> @@ -161,9 +94,6 @@ is divided into following sections: <not> <istrue value="${mkdist.disabled}"/> </not> - <not> - <istrue value="${modules.supported.internal}"/> - </not> </and> </condition> <condition property="do.archive+manifest.available"> @@ -195,15 +125,16 @@ is divided into following sections: <available file="${test.webapp.dir}"/> <available file="${test.javafx.dir}"/> <available file="${test.console.dir}"/> + <available file="${test.portrayal.dir}"/> <available file="${test.earth-obs.dir}"/> <available file="${test.geotiff.dir}"/> <available file="${test.netcdf.dir}"/> <available file="${test.shapefile.dir}"/> + <available file="${test.sql.dir}"/> <available file="${test.xmlstore.dir}"/> <available file="${test.storage.dir}"/> <available file="${test.feature.dir}"/> <available file="${test.raster.dir}"/> - <available file="${test.portrayal.dir}"/> <available file="${test.referencing.dir}"/> <available file="${test.ref-by-id.dir}"/> <available file="${test.metadata.dir}"/> @@ -218,15 +149,16 @@ is divided into following sections: <available file="${src.webapp.dir}"/> <available file="${src.javafx.dir}"/> <available file="${src.console.dir}"/> + <available file="${src.portrayal.dir}"/> <available file="${src.earth-obs.dir}"/> <available file="${src.geotiff.dir}"/> <available file="${src.netcdf.dir}"/> <available file="${src.shapefile.dir}"/> + <available file="${src.sql.dir}"/> <available file="${src.xmlstore.dir}"/> <available file="${src.storage.dir}"/> <available file="${src.feature.dir}"/> <available file="${src.raster.dir}"/> - <available file="${src.portrayal.dir}"/> <available file="${src.referencing.dir}"/> <available file="${src.ref-by-id.dir}"/> <available file="${src.metadata.dir}"/> @@ -340,15 +272,16 @@ is divided into following sections: <fail unless="src.webapp.dir">Must set src.webapp.dir</fail> <fail unless="src.javafx.dir">Must set src.javafx.dir</fail> <fail unless="src.console.dir">Must set src.console.dir</fail> + <fail unless="src.portrayal.dir">Must set src.portrayal.dir</fail> <fail unless="src.earth-obs.dir">Must set src.earth-obs.dir</fail> <fail unless="src.geotiff.dir">Must set src.geotiff.dir</fail> <fail unless="src.netcdf.dir">Must set src.netcdf.dir</fail> <fail unless="src.shapefile.dir">Must set src.shapefile.dir</fail> + <fail unless="src.sql.dir">Must set src.sql.dir</fail> <fail unless="src.xmlstore.dir">Must set src.xmlstore.dir</fail> <fail unless="src.storage.dir">Must set src.storage.dir</fail> <fail unless="src.feature.dir">Must set src.feature.dir</fail> <fail unless="src.raster.dir">Must set src.raster.dir</fail> - <fail unless="src.portrayal.dir">Must set src.portrayal.dir</fail> <fail unless="src.referencing.dir">Must set src.referencing.dir</fail> <fail unless="src.ref-by-id.dir">Must set src.ref-by-id.dir</fail> <fail unless="src.metadata.dir">Must set src.metadata.dir</fail> @@ -359,15 +292,16 @@ is divided into following sections: <fail unless="test.webapp.dir">Must set test.webapp.dir</fail> <fail unless="test.javafx.dir">Must set test.javafx.dir</fail> <fail unless="test.console.dir">Must set test.console.dir</fail> + <fail unless="test.portrayal.dir">Must set test.portrayal.dir</fail> <fail unless="test.earth-obs.dir">Must set test.earth-obs.dir</fail> <fail unless="test.geotiff.dir">Must set test.geotiff.dir</fail> <fail unless="test.netcdf.dir">Must set test.netcdf.dir</fail> <fail unless="test.shapefile.dir">Must set test.shapefile.dir</fail> + <fail unless="test.sql.dir">Must set test.sql.dir</fail> <fail unless="test.xmlstore.dir">Must set test.xmlstore.dir</fail> <fail unless="test.storage.dir">Must set test.storage.dir</fail> <fail unless="test.feature.dir">Must set test.feature.dir</fail> <fail unless="test.raster.dir">Must set test.raster.dir</fail> - <fail unless="test.portrayal.dir">Must set test.portrayal.dir</fail> <fail unless="test.referencing.dir">Must set test.referencing.dir</fail> <fail unless="test.ref-by-id.dir">Must set test.ref-by-id.dir</fail> <fail unless="test.metadata.dir">Must set test.metadata.dir</fail> @@ -392,80 +326,11 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module"> + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/> + <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> - <attribute default="${javac.modulepath}" name="modulepath"/> - <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/> - <attribute default="${javac.processorpath}" name="processorpath"/> - <attribute default="${javac.processormodulepath}" name="processormodulepath"/> - <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> - <attribute default="${includes}" name="includes"/> - <attribute default="${excludes}" name="excludes"/> - <attribute default="${javac.debug}" name="debug"/> - <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/> - <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" if:set="named.module.internal" name="sourcepath"/> - <attribute default="${empty.dir}" name="gensrcdir"/> - <element name="customize" optional="true"/> - <sequential> - <condition property="warn.excludes.internal"> - <and> - <isset property="named.module.internal"/> - <length length="0" string="@{excludes}" trim="true" when="greater"/> - </and> - </condition> - <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/> - <property location="${build.dir}/empty" name="empty.dir"/> - <mkdir dir="${empty.dir}"/> - <mkdir dir="@{apgeneratedsrcdir}"/> - <condition property="processormodulepath.set"> - <resourcecount count="0" when="greater"> - <path> - <pathelement path="@{processormodulepath}"/> - </path> - </resourcecount> - </condition> - <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="*"/> - </dirset> - </src> - <classpath> - <path path="@{classpath}"/> - </classpath> - <modulepath> - <path path="@{modulepath}"/> - </modulepath> - <upgrademodulepath> - <path path="@{upgrademodulepath}"/> - </upgrademodulepath> - <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/> - <compilerarg line="${javac.profile.cmd.line.arg}"/> - <compilerarg line="${javac.compilerargs}"/> - <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/> - <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/> - <compilerarg unless:set="processormodulepath.set" value="-processorpath"/> - <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/> - <compilerarg line="${ap.processors.internal}"/> - <compilerarg line="${annotation.processing.processor.options}"/> - <compilerarg value="-s"/> - <compilerarg path="@{apgeneratedsrcdir}"/> - <compilerarg line="${ap.proc.none.internal}"/> - <customize/> - </javac> - </sequential> - </macrodef> - </target> - <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal"> - <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/> - <attribute default="${build.classes.dir}" name="destdir"/> - <attribute default="${javac.classpath}" name="classpath"/> - <attribute default="${javac.modulepath}" name="modulepath"/> - <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/> <attribute default="${javac.processorpath}" name="processorpath"/> <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> <attribute default="${includes}" name="includes"/> @@ -502,13 +367,11 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> + <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/> + <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> - <attribute default="${javac.modulepath}" name="modulepath"/> - <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/> <attribute default="${javac.processorpath}" name="processorpath"/> <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> <attribute default="${includes}" name="includes"/> @@ -537,9 +400,9 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> + <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/> + <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}" name="srcdir"/> <attribute default="${build.classes.dir}" name="destdir"/> <attribute default="${javac.classpath}" name="classpath"/> <sequential> @@ -592,150 +455,113 @@ is divided into following sections: <property name="test.binarytestincludes" value=""/> <property name="test.binaryexcludes" value=""/> </target> - <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module"> - <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3";> + <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> - <element name="customizePrototype" optional="true"/> + <attribute default="**" name="testincludes"/> + <attribute default="" name="testmethods"/> + <element name="customize" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> <syspropertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </syspropertyset> - <classpath> - <path path="${run.test.classpath}"/> - </classpath> - <modulepath> - <path path="${run.test.modulepath}"/> - </modulepath> <formatter type="brief" usefile="false"/> <formatter type="xml"/> - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg value="-ea"/> - <jvmarg line="${run.test.jvmargs}"/> - <customizePrototype/> + <customize/> </junit> </sequential> </macrodef> </target> - <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal"> - <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3";> + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> - <element name="customizePrototype" optional="true"/> + <attribute default="**" name="testincludes"/> + <attribute default="" name="testmethods"/> + <element name="customize" optional="true"/> <sequential> <property name="junit.forkmode" value="perTest"/> <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> + <batchtest todir="${build.test.results.dir}"> + <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.javafx.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.portrayal.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.earth-obs.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.geotiff.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.shapefile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.sql.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.xmlstore.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.storage.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.ref-by-id.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.metadata.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.utility.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.fra-profile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.gdal.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> + <filename name="${test.binarytestincludes}"/> + </fileset> + </batchtest> <syspropertyset> <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </syspropertyset> - <classpath> - <path path="${run.test.classpath}"/> - </classpath> <formatter type="brief" usefile="false"/> <formatter type="xml"/> - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg value="-ea"/> - <customizePrototype/> + <customize/> </junit> </sequential> </macrodef> </target> - <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}"> - <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute default="${includes}" name="includes"/> - <attribute default="${excludes}" name="excludes"/> - <attribute default="**" name="testincludes"/> - <attribute default="" name="testmethods"/> - <element name="customize" optional="true"/> - <sequential> - <j2seproject3:junit-prototype> - <customizePrototype> - <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> - <customize/> - </customizePrototype> - </j2seproject3:junit-prototype> - </sequential> - </macrodef> - </target> - <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}"> - <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute default="${includes}" name="includes"/> - <attribute default="${excludes}" name="excludes"/> - <attribute default="**" name="testincludes"/> - <attribute default="" name="testmethods"/> - <element name="customize" optional="true"/> - <sequential> - <j2seproject3:junit-prototype> - <customizePrototype> - <batchtest todir="${build.test.results.dir}"> - <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.javafx.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.earth-obs.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.geotiff.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.shapefile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.xmlstore.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.storage.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.portrayal.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.ref-by-id.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.metadata.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.utility.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.fra-profile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${test.gdal.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> - <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> - <filename name="${test.binarytestincludes}"/> - </fileset> - </batchtest> - <customize/> - </customizePrototype> - </j2seproject3:junit-prototype> - </sequential> - </macrodef> - </target> <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/> <target if="${testng.available}" name="-init-macrodef-testng"> <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3";> @@ -758,6 +584,9 @@ is divided into following sections: <fileset dir="${test.console.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> <filename name="@{testincludes}"/> </fileset> + <fileset dir="${test.portrayal.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> <fileset dir="${test.earth-obs.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> <filename name="@{testincludes}"/> </fileset> @@ -770,6 +599,9 @@ is divided into following sections: <fileset dir="${test.shapefile.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> <filename name="@{testincludes}"/> </fileset> + <fileset dir="${test.sql.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> <fileset dir="${test.xmlstore.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> <filename name="@{testincludes}"/> </fileset> @@ -782,9 +614,6 @@ is divided into following sections: <fileset dir="${test.raster.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> <filename name="@{testincludes}"/> </fileset> - <fileset dir="${test.portrayal.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> <fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> <filename name="@{testincludes}"/> </fileset> @@ -811,10 +640,6 @@ is divided into following sections: <propertyref prefix="test-sys-prop."/> <mapper from="test-sys-prop.*" to="*" type="glob"/> </propertyset> - <classpath> - <path path="${run.test.classpath}"/> - </classpath> - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <customize/> </testng> </sequential> @@ -869,6 +694,10 @@ is divided into following sections: <sequential> <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> <customize> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg line="${run.jvmargs}"/> <jvmarg line="${run.jvmargs.ide}"/> </customize> @@ -876,20 +705,128 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl"> + <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}"> + <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3";> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <attribute default="" name="testmethods"/> + <element name="customize" optional="true"/> + <sequential> + <property name="junit.forkmode" value="perTest"/> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + <jvmarg value="-ea"/> + <jvmarg line="${debug-args-line}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <customize/> + </junit> + </sequential> + </macrodef> + </target> + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch"> + <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3";> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <attribute default="" name="testmethods"/> + <element name="customize" optional="true"/> + <sequential> + <property name="junit.forkmode" value="perTest"/> + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> + <batchtest todir="${build.test.results.dir}"> + <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.javafx.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.portrayal.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.earth-obs.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.geotiff.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.shapefile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.sql.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.xmlstore.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.storage.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.ref-by-id.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.metadata.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.utility.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.fra-profile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${test.gdal.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}"> + <filename name="${test.binarytestincludes}"/> + </fileset> + </batchtest> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + <jvmarg value="-ea"/> + <jvmarg line="${debug-args-line}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <customize/> + </junit> + </sequential> + </macrodef> + </target> + <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl"> <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3";> <attribute default="${includes}" name="includes"/> <attribute default="${excludes}" name="excludes"/> <attribute default="**" name="testincludes"/> <attribute default="" name="testmethods"/> - <element name="customizeDebuggee" optional="true"/> + <element implicit="true" name="customize" optional="true"/> <sequential> - <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> - <customize> - <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> - <customizeDebuggee/> - </customize> - </j2seproject3:junit> + <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> + <customize/> + </j2seproject3:junit-debug> </sequential> </macrodef> </target> @@ -908,14 +845,14 @@ is divided into following sections: <delete dir="${build.test.results.dir}" quiet="true"/> <mkdir dir="${build.test.results.dir}"/> <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}"> - <customizeDebuggee> + <customize> <customize2/> <jvmarg value="-ea"/> <arg line="${testng.debug.mode}"/> <arg line="-d ${build.test.results.dir}"/> <arg line="-listener org.testng.reporters.VerboseReporter"/> <arg line="${testng.cmd.args}"/> - </customizeDebuggee> + </customize> </j2seproject3:debug> </sequential> </macrodef> @@ -942,10 +879,14 @@ is divided into following sections: <attribute default="" name="testMethod"/> <sequential> <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}"> - <customizeDebuggee> + <customize> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg line="${run.jvmargs}"/> <jvmarg line="${run.jvmargs.ide}"/> - </customizeDebuggee> + </customize> </j2seproject3:test-debug-impl> </sequential> </macrodef> @@ -1025,14 +966,10 @@ is divided into following sections: <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1";> <attribute default="${main.class}" name="name"/> - <attribute default="${debug.modulepath}" name="modulepath"/> <attribute default="${debug.classpath}" name="classpath"/> <attribute default="" name="stopclassname"/> <sequential> <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}"> - <modulepath> - <path path="@{modulepath}"/> - </modulepath> <classpath> <path path="@{classpath}"/> </classpath> @@ -1051,6 +988,18 @@ is divided into following sections: </macrodef> </target> <target name="-init-debug-args"> + <property name="version-output" value="java version "${ant.java.version}"/> + <condition property="have-jdk-older-than-1.4"> + <or> + <contains string="${version-output}" substring="java version "1.0"/> + <contains string="${version-output}" substring="java version "1.1"/> + <contains string="${version-output}" substring="java version "1.2"/> + <contains string="${version-output}" substring="java version "1.3"/> + </or> + </condition> + <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> + <istrue value="${have-jdk-older-than-1.4}"/> + </condition> <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> <os family="windows"/> </condition> @@ -1060,79 +1009,21 @@ is divided into following sections: </target> <target depends="-init-debug-args" name="-init-macrodef-debug"> <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3";> - <attribute default="${module.name}" name="modulename"/> <attribute default="${main.class}" name="classname"/> - <attribute default="${debug.modulepath}" name="modulepath"/> <attribute default="${debug.classpath}" name="classpath"/> - <element name="customizeDebuggee" optional="true"/> - <sequential> - <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}"> - <customize> - <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> - <customizeDebuggee/> - </customize> - </j2seproject1:java> - </sequential> - </macrodef> - </target> - <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module"> - <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1";> - <attribute default="${module.name}" name="modulename"/> - <attribute default="${main.class}" name="classname"/> - <attribute default="${run.modulepath}" name="modulepath"/> - <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/> - <attribute default="${run.classpath}" name="classpath"/> - <attribute default="jvm" name="jvm"/> <element name="customize" optional="true"/> <sequential> - <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}"> - <classpath> - <path path="@{classpath}"/> - </classpath> - <modulepath> - <pathelement path="@{modulepath}"/> - <pathelement location="${module.build.classes.dir}"/> - </modulepath> - <upgrademodulepath> - <path path="@{upgrademodulepath}"/> - </upgrademodulepath> + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> + <jvmarg line="${debug-args-line}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> <jvmarg line="${run.jvmargs}"/> <jvmarg line="${run.jvmargs.ide}"/> - <syspropertyset> - <propertyref prefix="run-sys-prop."/> - <mapper from="run-sys-prop.*" to="*" type="glob"/> - </syspropertyset> - <customize/> - </java> - </sequential> - </macrodef> - </target> - <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module"> - <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1";> - <attribute default="" name="modulename"/> - <attribute default="${main.class}" name="classname"/> - <attribute default="${run.modulepath}" name="modulepath"/> - <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/> - <attribute default="${run.classpath}" name="classpath"/> - <attribute default="jvm" name="jvm"/> - <element name="customize" optional="true"/> - <sequential> - <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> <classpath> <path path="@{classpath}"/> </classpath> - <modulepath> - <path path="@{modulepath}"/> - </modulepath> - <upgrademodulepath> - <path path="@{upgrademodulepath}"/> - </upgrademodulepath> - <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> - <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> - <jvmarg line="${run.jvmargs}"/> - <jvmarg line="${run.jvmargs.ide}"/> <syspropertyset> <propertyref prefix="run-sys-prop."/> <mapper from="run-sys-prop.*" to="*" type="glob"/> @@ -1142,11 +1033,9 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal"> + <target name="-init-macrodef-java"> <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1";> - <attribute default="" name="modulename"/> <attribute default="${main.class}" name="classname"/> - <attribute default="" name="modulepath"/> <attribute default="${run.classpath}" name="classpath"/> <attribute default="jvm" name="jvm"/> <element name="customize" optional="true"/> @@ -1169,7 +1058,6 @@ is divided into following sections: </sequential> </macrodef> </target> - <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/> <target name="-init-macrodef-copylibs"> <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3";> <attribute default="${manifest.file}" name="manifest"/> @@ -1260,7 +1148,6 @@ is divided into following sections: <param name="call.target" value="jar"/> <param name="transfer.built-jar.properties" value="${built-jar.properties}"/> <param name="transfer.not.archive.disabled" value="true"/> - <param name="transfer.do.jlink" value="false"/> </antcall> </target> <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> @@ -1268,9 +1155,7 @@ is divided into following sections: <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/> </target> <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build"> - <antcall target="clean"> - <param name="no.dependencies" value="true"/> - </antcall> + <antcall target="clean"/> </target> <target depends="init,deps-jar" name="-pre-pre-compile"> <mkdir dir="${build.classes.dir}"/> @@ -1285,7 +1170,7 @@ is divided into following sections: <include name="*"/> </dirset> </pathconvert> - <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/> + <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/> </target> <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> @@ -1294,15 +1179,16 @@ is divided into following sections: <fileset dir="${src.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.javafx.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + <fileset dir="${src.portrayal.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.shapefile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + <fileset dir="${src.sql.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> - <fileset dir="${src.portrayal.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> @@ -1330,7 +1216,7 @@ is divided into following sections: <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> <j2seproject3:force-recompile/> - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.portrayal.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"/> + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"/> </target> <target name="-post-compile-single"> <!-- Empty placeholder for easier customization. --> @@ -1350,25 +1236,6 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,compile" name="-check-module-main-class"> - <pathconvert property="main.class.file"> - <string value="${main.class}"/> - <unpackagemapper from="*" to="*.class"/> - </pathconvert> - <condition property="do.module.main.class"> - <and> - <isset property="main.class.available"/> - <available file="${build.classes.dir}/module-info.class"/> - <available file="${build.classes.dir}/${main.class.file}"/> - <isset property="libs.CopyLibs.classpath"/> - <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/> - </and> - </condition> - </target> - <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class"> - <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/> - <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/> - </target> <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available"> <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> <touch file="${tmp.manifest.file}" verbose="false"/> @@ -1405,37 +1272,11 @@ is divided into following sections: <j2seproject1:jar manifest="${tmp.manifest.file}"/> <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> <property location="${dist.jar}" name="dist.jar.resolved"/> - <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value=""> - <isset property="named.module.internal"/> - </condition> <pathconvert property="run.classpath.with.dist.jar"> <path path="${run.classpath}"/> - <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/> - </pathconvert> - <pathconvert property="run.modulepath.with.dist.jar"> - <path location="${dist.jar.resolved}"/> - <path path="${run.modulepath}"/> <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> </pathconvert> - <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}"> - <isset property="named.module.internal"/> - </condition> - <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}"> - <and> - <isset property="modules.supported.internal"/> - <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/> - </and> - </condition> - <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}"> - <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/> - </condition> - <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value=""> - <isset property="do.module.main.class"/> - </condition> - <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}"> - <isset property="named.module.internal"/> - </condition> - <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}"> + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}"> <isset property="main.class.available"/> </condition> <condition else="debug" property="jar.usage.level" value="info"> @@ -1454,73 +1295,8 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/> - <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/> - <!-- - ================= - DEPLOY SECTION - ================= - --> - <target name="-pre-deploy"> - <!-- Empty placeholder for easier customization. --> - <!-- You can override this target in the ../build.xml file. --> - </target> - <target depends="init" name="-check-jlink"> - <condition property="do.jlink.internal"> - <and> - <istrue value="${do.jlink}"/> - <isset property="do.archive"/> - <isset property="named.module.internal"/> - </and> - </condition> - </target> - <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy"> - <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/> - <property name="jlink.launcher.name" value="${application.title}"/> - <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}"> - <and> - <isset property="jlink.additionalmodules"/> - <length length="0" string="${jlink.additionalmodules}" when="greater"/> - </and> - </condition> - <condition property="jlink.do.strip.internal"> - <and> - <isset property="jlink.strip"/> - <istrue value="${jlink.strip}"/> - </and> - </condition> - <condition property="jlink.do.additionalparam.internal"> - <and> - <isset property="jlink.additionalparam"/> - <length length="0" string="${jlink.additionalparam}" when="greater"/> - </and> - </condition> - <condition property="jlink.do.launcher.internal"> - <and> - <istrue value="${jlink.launcher}"/> - <isset property="main.class.available"/> - </and> - </condition> - <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}"/> - <arg value="--add-modules"/> - <arg value="${jlink.add.modules}"/> - <arg if:set="jlink.do.strip.internal" value="--strip-debug"/> - <arg if:set="jlink.do.launcher.internal" value="--launcher"/> - <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/> - <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/> - <arg value="--output"/> - <arg value="${dist.jlink.output}"/> - </exec> - </target> - <target name="-post-deploy"> - <!-- Empty placeholder for easier customization. --> - <!-- You can override this target in the ../build.xml file. --> - </target> - <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/> + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/> + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/> <!-- ================= EXECUTION SECTION @@ -1557,9 +1333,9 @@ is divided into following sections: </target> <target depends="init,compile" name="-debug-start-debuggee"> <j2seproject3:debug> - <customizeDebuggee> + <customize> <arg line="${application.args}"/> - </customizeDebuggee> + </customize> </j2seproject3:debug> </target> <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/> @@ -1625,24 +1401,28 @@ is divided into following sections: </customize> </profile> </target> - <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72"> + <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72"> <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail> <nbprofiledirect> <classpath> <path path="${run.test.classpath}"/> </classpath> </nbprofiledirect> - <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods=""> - <customize> - <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> - <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> - <jvmarg value="${profiler.info.jvmargs.agent}"/> - <jvmarg line="${profiler.info.jvmargs}"/> - <classpath> - <path path="${run.test.classpath}"/> - </classpath> - </customize> - </j2seproject3:junit> + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true"> + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> + <jvmarg value="${profiler.info.jvmargs.agent}"/> + <jvmarg line="${profiler.info.jvmargs}"/> + <test name="${profile.class}"/> + <classpath> + <path path="${run.test.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + </junit> </target> <!-- end of pre NB72 profiling section @@ -1698,12 +1478,6 @@ is divided into following sections: <condition else="" property="bug5101868workaround" value="*.java"> <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="${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}" 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}"/> @@ -1720,6 +1494,9 @@ is divided into following sections: <fileset dir="${src.console.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> + <fileset dir="${src.portrayal.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> <fileset dir="${src.earth-obs.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> @@ -1732,6 +1509,9 @@ is divided into following sections: <fileset dir="${src.shapefile.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> + <fileset dir="${src.sql.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> <fileset dir="${src.xmlstore.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> @@ -1744,9 +1524,6 @@ is divided into following sections: <fileset dir="${src.raster.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> - <fileset dir="${src.portrayal.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> - <filename name="**/*.java"/> - </fileset> <fileset dir="${src.referencing.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> <filename name="**/*.java"/> </fileset> @@ -1773,7 +1550,6 @@ is divided into following sections: <exclude name="*.java"/> </fileset> <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/> - <arg line="${javadoc.html5.cmd.line.arg}"/> </javadoc> <copy todir="${dist.javadoc.dir}"> <fileset dir="${src.local-src.dir}" excludes="${excludes}" includes="${includes}"> @@ -1788,6 +1564,9 @@ is divided into following sections: <fileset dir="${src.console.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/doc-files/**"/> </fileset> + <fileset dir="${src.portrayal.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> <fileset dir="${src.earth-obs.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/doc-files/**"/> </fileset> @@ -1800,6 +1579,9 @@ is divided into following sections: <fileset dir="${src.shapefile.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/doc-files/**"/> </fileset> + <fileset dir="${src.sql.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/doc-files/**"/> + </fileset> <fileset dir="${src.xmlstore.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/doc-files/**"/> </fileset> @@ -1812,9 +1594,6 @@ is divided into following sections: <fileset dir="${src.raster.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/doc-files/**"/> </fileset> - <fileset dir="${src.portrayal.dir}" excludes="${excludes}" includes="${includes}"> - <filename name="**/doc-files/**"/> - </fileset> <fileset dir="${src.referencing.dir}" excludes="${excludes}" includes="${includes}"> <filename name="**/doc-files/**"/> </fileset> @@ -1857,76 +1636,25 @@ is divided into following sections: <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module"> - <j2seproject3:modulename property="test.module.name" sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.portrayal.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/> - <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.portrayal.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"> - <and> - <isset property="test.module.name"/> - <length length="0" string="${test.module.name}" when="greater"/> - </and> - </condition> - <condition else="--patch-module ${module.name}=${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.portrayal.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED"> - <and> - <isset property="test.module.name"/> - <length length="0" string="${test.module.name}" when="greater"/> - </and> - </condition> - </target> - <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties"> - <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}"> - <and> - <isset property="test.module.name"/> - <length length="0" string="${test.module.name}" when="greater"/> - </and> - </condition> - <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/> - <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/> - <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal"> - <chainedmapper> - <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/> - <filtermapper> - <uniqfilter/> - <replacestring from="${build.test.classes.dir.abs.internal}" to=""/> - </filtermapper> - <cutdirsmapper dirs="1"/> - <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/> - </chainedmapper> - </pathconvert> - <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}"> - <and> - <isset property="test.module.name"/> - <length length="0" string="${test.module.name}" when="greater"/> - </and> - </condition> - </target> - <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal"> - <property name="javac.test.sourcepath" value="${empty.dir}"/> - <property name="javac.test.compilerargs" value=""/> - <property name="run.test.jvmargs" value=""/> - </target> - <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/> <target if="do.depend.true" name="-compile-test-depend"> - <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.portrayal.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/> + <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/> </target> - <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> - <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.portrayal.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"> - <customize> - <compilerarg line="${javac.test.compilerargs}"/> - </customize> - </j2seproject3:javac> + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/> <copy todir="${build.test.classes.dir}"> <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${test.javafx.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + <fileset dir="${test.portrayal.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${test.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${test.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> <fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
[... 114 lines stripped ...]
