1.1 --- a/java/rozsirene-atributy/build.xml Sun Oct 07 16:18:03 2012 +0200
1.2 +++ b/java/rozsirene-atributy/build.xml Sun Dec 10 23:59:24 2023 +0100
1.3 @@ -51,8 +51,7 @@
1.4 -init-macrodef-junit: defines macro for junit execution
1.5 -init-macrodef-debug: defines macro for class debugging
1.6 -init-macrodef-java: defines macro for class execution
1.7 - -do-jar-with-manifest: JAR building (if you are using a manifest)
1.8 - -do-jar-without-manifest: JAR building (if you are not using a manifest)
1.9 + -do-jar: JAR building
1.10 run: execution of project
1.11 -javadoc-build: Javadoc generation
1.12 test-report: JUnit report generation
2.1 --- a/java/rozsirene-atributy/nbproject/build-impl.xml Sun Oct 07 16:18:03 2012 +0200
2.2 +++ b/java/rozsirene-atributy/nbproject/build-impl.xml Sun Dec 10 23:59:24 2023 +0100
2.3 @@ -12,14 +12,14 @@
2.4 - execution
2.5 - debugging
2.6 - javadoc
2.7 - - junit compilation
2.8 - - junit execution
2.9 - - junit debugging
2.10 + - test compilation
2.11 + - test execution
2.12 + - test debugging
2.13 - applet
2.14 - cleanup
2.15
2.16 -->
2.17 -<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="rozsirene-atributy-impl">
2.18 +<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="rozsirene-atributy-impl">
2.19 <fail message="Please build using Ant 1.8.0 or higher.">
2.20 <condition>
2.21 <not>
2.22 @@ -46,14 +46,80 @@
2.23 <property file="${user.properties.file}"/>
2.24 <!-- The two properties below are usually overridden -->
2.25 <!-- by the active platform. Just a fallback. -->
2.26 - <property name="default.javac.source" value="1.4"/>
2.27 - <property name="default.javac.target" value="1.4"/>
2.28 + <property name="default.javac.source" value="1.8"/>
2.29 + <property name="default.javac.target" value="1.8"/>
2.30 </target>
2.31 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
2.32 <property file="nbproject/configs/${config}.properties"/>
2.33 <property file="nbproject/project.properties"/>
2.34 </target>
2.35 - <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
2.36 + <target name="-init-modules-supported">
2.37 + <condition property="modules.supported.internal" value="true">
2.38 + <not>
2.39 + <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
2.40 + </not>
2.41 + </condition>
2.42 + </target>
2.43 + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
2.44 + <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
2.45 + <attribute name="property"/>
2.46 + <attribute name="sourcepath"/>
2.47 + <sequential>
2.48 + <loadresource property="@{property}" quiet="true">
2.49 + <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
2.50 + <filterchain>
2.51 + <stripjavacomments/>
2.52 + <linecontainsregexp>
2.53 + <regexp pattern="module .* \{"/>
2.54 + </linecontainsregexp>
2.55 + <tokenfilter>
2.56 + <linetokenizer/>
2.57 + <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
2.58 + </tokenfilter>
2.59 + <striplinebreaks/>
2.60 + </filterchain>
2.61 + </loadresource>
2.62 + </sequential>
2.63 + </macrodef>
2.64 + </target>
2.65 + <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
2.66 + <fail message="Java 9 support requires Ant 1.10.0 or higher.">
2.67 + <condition>
2.68 + <not>
2.69 + <antversion atleast="1.10.0"/>
2.70 + </not>
2.71 + </condition>
2.72 + </fail>
2.73 + <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
2.74 + <condition property="named.module.internal">
2.75 + <and>
2.76 + <isset property="module.name"/>
2.77 + <length length="0" string="${module.name}" when="greater"/>
2.78 + </and>
2.79 + </condition>
2.80 + <condition property="unnamed.module.internal">
2.81 + <not>
2.82 + <isset property="named.module.internal"/>
2.83 + </not>
2.84 + </condition>
2.85 + <property name="javac.modulepath" value=""/>
2.86 + <property name="run.modulepath" value="${javac.modulepath}"/>
2.87 + <property name="module.build.classes.dir" value="${build.classes.dir}"/>
2.88 + <property name="debug.modulepath" value="${run.modulepath}"/>
2.89 + <property name="javac.upgrademodulepath" value=""/>
2.90 + <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
2.91 + <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
2.92 + <and>
2.93 + <isset property="javac.systemmodulepath"/>
2.94 + <length length="0" string="${javac.systemmodulepath}" when="greater"/>
2.95 + </and>
2.96 + </condition>
2.97 + <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
2.98 + <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
2.99 + <property name="module.name" value=""/>
2.100 + </target>
2.101 + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
2.102 + <property name="platform.java" value="${java.home}/bin/java"/>
2.103 <available file="${manifest.file}" property="manifest.available"/>
2.104 <condition property="splashscreen.available">
2.105 <and>
2.106 @@ -71,31 +137,22 @@
2.107 </not>
2.108 </and>
2.109 </condition>
2.110 - <condition property="manifest.available+main.class">
2.111 + <condition property="profile.available">
2.112 <and>
2.113 - <isset property="manifest.available"/>
2.114 - <isset property="main.class.available"/>
2.115 + <isset property="javac.profile"/>
2.116 + <length length="0" string="${javac.profile}" when="greater"/>
2.117 + <not>
2.118 + <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
2.119 + </not>
2.120 </and>
2.121 </condition>
2.122 <condition property="do.archive">
2.123 - <not>
2.124 - <istrue value="${jar.archive.disabled}"/>
2.125 - </not>
2.126 - </condition>
2.127 - <condition property="do.mkdist">
2.128 - <and>
2.129 - <isset property="do.archive"/>
2.130 - <isset property="libs.CopyLibs.classpath"/>
2.131 + <or>
2.132 <not>
2.133 - <istrue value="${mkdist.disabled}"/>
2.134 + <istrue value="${jar.archive.disabled}"/>
2.135 </not>
2.136 - </and>
2.137 - </condition>
2.138 - <condition property="manifest.available+main.class+mkdist.available">
2.139 - <and>
2.140 - <istrue value="${manifest.available+main.class}"/>
2.141 - <isset property="do.mkdist"/>
2.142 - </and>
2.143 + <istrue value="${not.archive.disabled}"/>
2.144 + </or>
2.145 </condition>
2.146 <condition property="do.archive+manifest.available">
2.147 <and>
2.148 @@ -115,24 +172,12 @@
2.149 <istrue value="${do.archive}"/>
2.150 </and>
2.151 </condition>
2.152 - <condition property="do.archive+manifest.available+main.class">
2.153 + <condition property="do.archive+profile.available">
2.154 <and>
2.155 - <istrue value="${manifest.available+main.class}"/>
2.156 + <isset property="profile.available"/>
2.157 <istrue value="${do.archive}"/>
2.158 </and>
2.159 </condition>
2.160 - <condition property="manifest.available-mkdist.available">
2.161 - <or>
2.162 - <istrue value="${manifest.available}"/>
2.163 - <isset property="do.mkdist"/>
2.164 - </or>
2.165 - </condition>
2.166 - <condition property="manifest.available+main.class-mkdist.available">
2.167 - <or>
2.168 - <istrue value="${manifest.available+main.class}"/>
2.169 - <isset property="do.mkdist"/>
2.170 - </or>
2.171 - </condition>
2.172 <condition property="have.tests">
2.173 <or>
2.174 <available file="${test.src.dir}"/>
2.175 @@ -156,6 +201,7 @@
2.176 </and>
2.177 </condition>
2.178 <property name="run.jvmargs" value=""/>
2.179 + <property name="run.jvmargs.ide" value=""/>
2.180 <property name="javac.compilerargs" value=""/>
2.181 <property name="work.dir" value="${basedir}"/>
2.182 <condition property="no.deps">
2.183 @@ -168,6 +214,7 @@
2.184 <property name="application.args" value=""/>
2.185 <property name="source.encoding" value="${file.encoding}"/>
2.186 <property name="runtime.encoding" value="${source.encoding}"/>
2.187 + <property name="manifest.encoding" value="${source.encoding}"/>
2.188 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
2.189 <and>
2.190 <isset property="javadoc.encoding"/>
2.191 @@ -185,7 +232,15 @@
2.192 </condition>
2.193 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
2.194 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
2.195 - <length length="0" string="${endorsed.classpath}" when="greater"/>
2.196 + <and>
2.197 + <isset property="endorsed.classpath"/>
2.198 + <not>
2.199 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
2.200 + </not>
2.201 + </and>
2.202 + </condition>
2.203 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
2.204 + <isset property="profile.available"/>
2.205 </condition>
2.206 <condition else="false" property="jdkBug6558476">
2.207 <and>
2.208 @@ -195,11 +250,38 @@
2.209 </not>
2.210 </and>
2.211 </condition>
2.212 - <property name="javac.fork" value="${jdkBug6558476}"/>
2.213 + <condition else="false" property="javac.fork">
2.214 + <or>
2.215 + <istrue value="${jdkBug6558476}"/>
2.216 + <istrue value="${javac.external.vm}"/>
2.217 + </or>
2.218 + </condition>
2.219 <property name="jar.index" value="false"/>
2.220 <property name="jar.index.metainf" value="${jar.index}"/>
2.221 <property name="copylibs.rebase" value="true"/>
2.222 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
2.223 + <condition property="junit.available">
2.224 + <or>
2.225 + <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
2.226 + <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
2.227 + </or>
2.228 + </condition>
2.229 + <condition property="testng.available">
2.230 + <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
2.231 + </condition>
2.232 + <condition property="junit+testng.available">
2.233 + <and>
2.234 + <istrue value="${junit.available}"/>
2.235 + <istrue value="${testng.available}"/>
2.236 + </and>
2.237 + </condition>
2.238 + <condition else="testng" property="testng.mode" value="mixed">
2.239 + <istrue value="${junit+testng.available}"/>
2.240 + </condition>
2.241 + <condition else="" property="testng.debug.mode" value="-mixed">
2.242 + <istrue value="${junit+testng.available}"/>
2.243 + </condition>
2.244 + <property name="java.failonerror" value="true"/>
2.245 </target>
2.246 <target name="-post-init">
2.247 <!-- Empty placeholder for easier customization. -->
2.248 @@ -226,11 +308,80 @@
2.249 </sequential>
2.250 </macrodef>
2.251 </target>
2.252 - <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
2.253 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
2.254 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
2.255 <attribute default="${src.dir}" name="srcdir"/>
2.256 <attribute default="${build.classes.dir}" name="destdir"/>
2.257 <attribute default="${javac.classpath}" name="classpath"/>
2.258 + <attribute default="${javac.modulepath}" name="modulepath"/>
2.259 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
2.260 + <attribute default="${javac.processorpath}" name="processorpath"/>
2.261 + <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
2.262 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
2.263 + <attribute default="${includes}" name="includes"/>
2.264 + <attribute default="${excludes}" name="excludes"/>
2.265 + <attribute default="${javac.debug}" name="debug"/>
2.266 + <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
2.267 + <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
2.268 + <attribute default="${empty.dir}" name="gensrcdir"/>
2.269 + <element name="customize" optional="true"/>
2.270 + <sequential>
2.271 + <condition property="warn.excludes.internal">
2.272 + <and>
2.273 + <isset property="named.module.internal"/>
2.274 + <length length="0" string="@{excludes}" trim="true" when="greater"/>
2.275 + </and>
2.276 + </condition>
2.277 + <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
2.278 + <property location="${build.dir}/empty" name="empty.dir"/>
2.279 + <mkdir dir="${empty.dir}"/>
2.280 + <mkdir dir="@{apgeneratedsrcdir}"/>
2.281 + <condition property="processormodulepath.set">
2.282 + <resourcecount count="0" when="greater">
2.283 + <path>
2.284 + <pathelement path="@{processormodulepath}"/>
2.285 + </path>
2.286 + </resourcecount>
2.287 + </condition>
2.288 + <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}">
2.289 + <src>
2.290 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
2.291 + <include name="*"/>
2.292 + </dirset>
2.293 + </src>
2.294 + <classpath>
2.295 + <path path="@{classpath}"/>
2.296 + </classpath>
2.297 + <modulepath>
2.298 + <path path="@{modulepath}"/>
2.299 + </modulepath>
2.300 + <upgrademodulepath>
2.301 + <path path="@{upgrademodulepath}"/>
2.302 + </upgrademodulepath>
2.303 + <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
2.304 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
2.305 + <compilerarg line="${javac.compilerargs}"/>
2.306 + <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
2.307 + <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
2.308 + <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
2.309 + <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
2.310 + <compilerarg line="${ap.processors.internal}"/>
2.311 + <compilerarg line="${annotation.processing.processor.options}"/>
2.312 + <compilerarg value="-s"/>
2.313 + <compilerarg path="@{apgeneratedsrcdir}"/>
2.314 + <compilerarg line="${ap.proc.none.internal}"/>
2.315 + <customize/>
2.316 + </javac>
2.317 + </sequential>
2.318 + </macrodef>
2.319 + </target>
2.320 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
2.321 + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
2.322 + <attribute default="${src.dir}" name="srcdir"/>
2.323 + <attribute default="${build.classes.dir}" name="destdir"/>
2.324 + <attribute default="${javac.classpath}" name="classpath"/>
2.325 + <attribute default="${javac.modulepath}" name="modulepath"/>
2.326 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
2.327 <attribute default="${javac.processorpath}" name="processorpath"/>
2.328 <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
2.329 <attribute default="${includes}" name="includes"/>
2.330 @@ -253,6 +404,7 @@
2.331 <path path="@{classpath}"/>
2.332 </classpath>
2.333 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
2.334 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
2.335 <compilerarg line="${javac.compilerargs}"/>
2.336 <compilerarg value="-processorpath"/>
2.337 <compilerarg path="@{processorpath}:${empty.dir}"/>
2.338 @@ -266,11 +418,13 @@
2.339 </sequential>
2.340 </macrodef>
2.341 </target>
2.342 - <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
2.343 + <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
2.344 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
2.345 <attribute default="${src.dir}" name="srcdir"/>
2.346 <attribute default="${build.classes.dir}" name="destdir"/>
2.347 <attribute default="${javac.classpath}" name="classpath"/>
2.348 + <attribute default="${javac.modulepath}" name="modulepath"/>
2.349 + <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
2.350 <attribute default="${javac.processorpath}" name="processorpath"/>
2.351 <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
2.352 <attribute default="${includes}" name="includes"/>
2.353 @@ -292,13 +446,14 @@
2.354 <path path="@{classpath}"/>
2.355 </classpath>
2.356 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
2.357 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
2.358 <compilerarg line="${javac.compilerargs}"/>
2.359 <customize/>
2.360 </javac>
2.361 </sequential>
2.362 </macrodef>
2.363 </target>
2.364 - <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
2.365 + <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
2.366 <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
2.367 <attribute default="${src.dir}" name="srcdir"/>
2.368 <attribute default="${build.classes.dir}" name="destdir"/>
2.369 @@ -332,45 +487,317 @@
2.370 </sequential>
2.371 </macrodef>
2.372 </target>
2.373 - <target name="-init-macrodef-junit">
2.374 + <target if="${junit.available}" name="-init-macrodef-junit-init">
2.375 + <condition else="false" property="nb.junit.batch" value="true">
2.376 + <and>
2.377 + <istrue value="${junit.available}"/>
2.378 + <not>
2.379 + <isset property="test.method"/>
2.380 + </not>
2.381 + </and>
2.382 + </condition>
2.383 + <condition else="false" property="nb.junit.single" value="true">
2.384 + <and>
2.385 + <istrue value="${junit.available}"/>
2.386 + <isset property="test.method"/>
2.387 + </and>
2.388 + </condition>
2.389 + </target>
2.390 + <target name="-init-test-properties">
2.391 + <property name="test.binaryincludes" value="<nothing>"/>
2.392 + <property name="test.binarytestincludes" value=""/>
2.393 + <property name="test.binaryexcludes" value=""/>
2.394 + </target>
2.395 + <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
2.396 + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
2.397 + <attribute default="${includes}" name="includes"/>
2.398 + <attribute default="${excludes}" name="excludes"/>
2.399 + <element name="customizePrototype" optional="true"/>
2.400 + <sequential>
2.401 + <property name="junit.forkmode" value="perTest"/>
2.402 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
2.403 + <syspropertyset>
2.404 + <propertyref prefix="test-sys-prop."/>
2.405 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.406 + </syspropertyset>
2.407 + <classpath>
2.408 + <path path="${run.test.classpath}"/>
2.409 + </classpath>
2.410 + <modulepath>
2.411 + <path path="${run.test.modulepath}"/>
2.412 + </modulepath>
2.413 + <formatter type="brief" usefile="false"/>
2.414 + <formatter type="xml"/>
2.415 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.416 + <jvmarg value="-ea"/>
2.417 + <jvmarg line="${run.test.jvmargs}"/>
2.418 + <customizePrototype/>
2.419 + </junit>
2.420 + </sequential>
2.421 + </macrodef>
2.422 + </target>
2.423 + <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
2.424 + <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
2.425 + <attribute default="${includes}" name="includes"/>
2.426 + <attribute default="${excludes}" name="excludes"/>
2.427 + <element name="customizePrototype" optional="true"/>
2.428 + <sequential>
2.429 + <property name="junit.forkmode" value="perTest"/>
2.430 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
2.431 + <syspropertyset>
2.432 + <propertyref prefix="test-sys-prop."/>
2.433 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.434 + </syspropertyset>
2.435 + <classpath>
2.436 + <path path="${run.test.classpath}"/>
2.437 + </classpath>
2.438 + <formatter type="brief" usefile="false"/>
2.439 + <formatter type="xml"/>
2.440 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.441 + <jvmarg value="-ea"/>
2.442 + <customizePrototype/>
2.443 + </junit>
2.444 + </sequential>
2.445 + </macrodef>
2.446 + </target>
2.447 + <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}">
2.448 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
2.449 <attribute default="${includes}" name="includes"/>
2.450 <attribute default="${excludes}" name="excludes"/>
2.451 <attribute default="**" name="testincludes"/>
2.452 + <attribute default="" name="testmethods"/>
2.453 + <element name="customize" optional="true"/>
2.454 <sequential>
2.455 - <property name="junit.forkmode" value="perTest"/>
2.456 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
2.457 - <batchtest todir="${build.test.results.dir}">
2.458 - <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
2.459 - <filename name="@{testincludes}"/>
2.460 - </fileset>
2.461 - </batchtest>
2.462 + <j2seproject3:junit-prototype>
2.463 + <customizePrototype>
2.464 + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
2.465 + <customize/>
2.466 + </customizePrototype>
2.467 + </j2seproject3:junit-prototype>
2.468 + </sequential>
2.469 + </macrodef>
2.470 + </target>
2.471 + <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}">
2.472 + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
2.473 + <attribute default="${includes}" name="includes"/>
2.474 + <attribute default="${excludes}" name="excludes"/>
2.475 + <attribute default="**" name="testincludes"/>
2.476 + <attribute default="" name="testmethods"/>
2.477 + <element name="customize" optional="true"/>
2.478 + <sequential>
2.479 + <j2seproject3:junit-prototype>
2.480 + <customizePrototype>
2.481 + <batchtest todir="${build.test.results.dir}">
2.482 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
2.483 + <filename name="@{testincludes}"/>
2.484 + </fileset>
2.485 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
2.486 + <filename name="${test.binarytestincludes}"/>
2.487 + </fileset>
2.488 + </batchtest>
2.489 + <customize/>
2.490 + </customizePrototype>
2.491 + </j2seproject3:junit-prototype>
2.492 + </sequential>
2.493 + </macrodef>
2.494 + </target>
2.495 + <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
2.496 + <target if="${testng.available}" name="-init-macrodef-testng">
2.497 + <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
2.498 + <attribute default="${includes}" name="includes"/>
2.499 + <attribute default="${excludes}" name="excludes"/>
2.500 + <attribute default="**" name="testincludes"/>
2.501 + <attribute default="" name="testmethods"/>
2.502 + <element name="customize" optional="true"/>
2.503 + <sequential>
2.504 + <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
2.505 + <isset property="test.method"/>
2.506 + </condition>
2.507 + <union id="test.set">
2.508 + <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
2.509 + <filename name="@{testincludes}"/>
2.510 + </fileset>
2.511 + </union>
2.512 + <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
2.513 + <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="rozsirene-atributy" testname="TestNG tests" workingDir="${work.dir}">
2.514 + <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
2.515 + <propertyset>
2.516 + <propertyref prefix="test-sys-prop."/>
2.517 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.518 + </propertyset>
2.519 <classpath>
2.520 <path path="${run.test.classpath}"/>
2.521 </classpath>
2.522 - <syspropertyset>
2.523 - <propertyref prefix="test-sys-prop."/>
2.524 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.525 - </syspropertyset>
2.526 - <formatter type="brief" usefile="false"/>
2.527 - <formatter type="xml"/>
2.528 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.529 - <jvmarg value="-ea"/>
2.530 - <jvmarg line="${run.jvmargs}"/>
2.531 - </junit>
2.532 + <customize/>
2.533 + </testng>
2.534 </sequential>
2.535 </macrodef>
2.536 </target>
2.537 - <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
2.538 - <target name="-profile-pre-init">
2.539 + <target name="-init-macrodef-test-impl">
2.540 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.541 + <attribute default="${includes}" name="includes"/>
2.542 + <attribute default="${excludes}" name="excludes"/>
2.543 + <attribute default="**" name="testincludes"/>
2.544 + <attribute default="" name="testmethods"/>
2.545 + <element implicit="true" name="customize" optional="true"/>
2.546 + <sequential>
2.547 + <echo>No tests executed.</echo>
2.548 + </sequential>
2.549 + </macrodef>
2.550 + </target>
2.551 + <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
2.552 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.553 + <attribute default="${includes}" name="includes"/>
2.554 + <attribute default="${excludes}" name="excludes"/>
2.555 + <attribute default="**" name="testincludes"/>
2.556 + <attribute default="" name="testmethods"/>
2.557 + <element implicit="true" name="customize" optional="true"/>
2.558 + <sequential>
2.559 + <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
2.560 + <customize/>
2.561 + </j2seproject3:junit>
2.562 + </sequential>
2.563 + </macrodef>
2.564 + </target>
2.565 + <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
2.566 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.567 + <attribute default="${includes}" name="includes"/>
2.568 + <attribute default="${excludes}" name="excludes"/>
2.569 + <attribute default="**" name="testincludes"/>
2.570 + <attribute default="" name="testmethods"/>
2.571 + <element implicit="true" name="customize" optional="true"/>
2.572 + <sequential>
2.573 + <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
2.574 + <customize/>
2.575 + </j2seproject3:testng>
2.576 + </sequential>
2.577 + </macrodef>
2.578 + </target>
2.579 + <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
2.580 + <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
2.581 + <attribute default="${includes}" name="includes"/>
2.582 + <attribute default="${excludes}" name="excludes"/>
2.583 + <attribute default="**" name="testincludes"/>
2.584 + <attribute default="" name="testmethods"/>
2.585 + <sequential>
2.586 + <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
2.587 + <customize>
2.588 + <jvmarg line="${run.jvmargs}"/>
2.589 + <jvmarg line="${run.jvmargs.ide}"/>
2.590 + </customize>
2.591 + </j2seproject3:test-impl>
2.592 + </sequential>
2.593 + </macrodef>
2.594 + </target>
2.595 + <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
2.596 + <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.597 + <attribute default="${includes}" name="includes"/>
2.598 + <attribute default="${excludes}" name="excludes"/>
2.599 + <attribute default="**" name="testincludes"/>
2.600 + <attribute default="" name="testmethods"/>
2.601 + <element name="customizeDebuggee" optional="true"/>
2.602 + <sequential>
2.603 + <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
2.604 + <customize>
2.605 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
2.606 + <customizeDebuggee/>
2.607 + </customize>
2.608 + </j2seproject3:junit>
2.609 + </sequential>
2.610 + </macrodef>
2.611 + </target>
2.612 + <target if="${testng.available}" name="-init-macrodef-testng-debug">
2.613 + <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.614 + <attribute default="${main.class}" name="testClass"/>
2.615 + <attribute default="" name="testMethod"/>
2.616 + <element name="customize2" optional="true"/>
2.617 + <sequential>
2.618 + <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
2.619 + <isset property="test.method"/>
2.620 + </condition>
2.621 + <condition else="-suitename rozsirene-atributy -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
2.622 + <matches pattern=".*\.xml" string="@{testClass}"/>
2.623 + </condition>
2.624 + <delete dir="${build.test.results.dir}" quiet="true"/>
2.625 + <mkdir dir="${build.test.results.dir}"/>
2.626 + <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
2.627 + <customizeDebuggee>
2.628 + <customize2/>
2.629 + <jvmarg value="-ea"/>
2.630 + <arg line="${testng.debug.mode}"/>
2.631 + <arg line="-d ${build.test.results.dir}"/>
2.632 + <arg line="-listener org.testng.reporters.VerboseReporter"/>
2.633 + <arg line="${testng.cmd.args}"/>
2.634 + </customizeDebuggee>
2.635 + </j2seproject3:debug>
2.636 + </sequential>
2.637 + </macrodef>
2.638 + </target>
2.639 + <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
2.640 + <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
2.641 + <attribute default="${main.class}" name="testClass"/>
2.642 + <attribute default="" name="testMethod"/>
2.643 + <element implicit="true" name="customize2" optional="true"/>
2.644 + <sequential>
2.645 + <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
2.646 + <customize2/>
2.647 + </j2seproject3:testng-debug>
2.648 + </sequential>
2.649 + </macrodef>
2.650 + </target>
2.651 + <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
2.652 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.653 + <attribute default="${includes}" name="includes"/>
2.654 + <attribute default="${excludes}" name="excludes"/>
2.655 + <attribute default="**" name="testincludes"/>
2.656 + <attribute default="" name="testmethods"/>
2.657 + <attribute default="${main.class}" name="testClass"/>
2.658 + <attribute default="" name="testMethod"/>
2.659 + <sequential>
2.660 + <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
2.661 + <customizeDebuggee>
2.662 + <jvmarg line="${run.jvmargs}"/>
2.663 + <jvmarg line="${run.jvmargs.ide}"/>
2.664 + </customizeDebuggee>
2.665 + </j2seproject3:test-debug-impl>
2.666 + </sequential>
2.667 + </macrodef>
2.668 + </target>
2.669 + <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
2.670 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.671 + <attribute default="${includes}" name="includes"/>
2.672 + <attribute default="${excludes}" name="excludes"/>
2.673 + <attribute default="**" name="testincludes"/>
2.674 + <attribute default="" name="testmethods"/>
2.675 + <attribute default="${main.class}" name="testClass"/>
2.676 + <attribute default="" name="testMethod"/>
2.677 + <sequential>
2.678 + <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
2.679 + <customize2>
2.680 + <syspropertyset>
2.681 + <propertyref prefix="test-sys-prop."/>
2.682 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.683 + </syspropertyset>
2.684 + </customize2>
2.685 + </j2seproject3:testng-debug-impl>
2.686 + </sequential>
2.687 + </macrodef>
2.688 + </target>
2.689 + <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
2.690 + <!--
2.691 + pre NB7.2 profiling section; consider it deprecated
2.692 + -->
2.693 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
2.694 + <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
2.695 <!-- Empty placeholder for easier customization. -->
2.696 <!-- You can override this target in the ../build.xml file. -->
2.697 </target>
2.698 - <target name="-profile-post-init">
2.699 + <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
2.700 <!-- Empty placeholder for easier customization. -->
2.701 <!-- You can override this target in the ../build.xml file. -->
2.702 </target>
2.703 - <target name="-profile-init-macrodef-profile">
2.704 + <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
2.705 <macrodef name="resolve">
2.706 <attribute name="name"/>
2.707 <attribute name="value"/>
2.708 @@ -384,7 +811,7 @@
2.709 <sequential>
2.710 <property environment="env"/>
2.711 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
2.712 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
2.713 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
2.714 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.715 <jvmarg value="${profiler.info.jvmargs.agent}"/>
2.716 <jvmarg line="${profiler.info.jvmargs}"/>
2.717 @@ -402,17 +829,24 @@
2.718 </sequential>
2.719 </macrodef>
2.720 </target>
2.721 - <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
2.722 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
2.723 <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
2.724 <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
2.725 </target>
2.726 + <!--
2.727 + end of pre NB7.2 profiling section
2.728 + -->
2.729 <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
2.730 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
2.731 <attribute default="${main.class}" name="name"/>
2.732 + <attribute default="${debug.modulepath}" name="modulepath"/>
2.733 <attribute default="${debug.classpath}" name="classpath"/>
2.734 <attribute default="" name="stopclassname"/>
2.735 <sequential>
2.736 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
2.737 + <modulepath>
2.738 + <path path="@{modulepath}"/>
2.739 + </modulepath>
2.740 <classpath>
2.741 <path path="@{classpath}"/>
2.742 </classpath>
2.743 @@ -431,18 +865,6 @@
2.744 </macrodef>
2.745 </target>
2.746 <target name="-init-debug-args">
2.747 - <property name="version-output" value="java version "${ant.java.version}"/>
2.748 - <condition property="have-jdk-older-than-1.4">
2.749 - <or>
2.750 - <contains string="${version-output}" substring="java version "1.0"/>
2.751 - <contains string="${version-output}" substring="java version "1.1"/>
2.752 - <contains string="${version-output}" substring="java version "1.2"/>
2.753 - <contains string="${version-output}" substring="java version "1.3"/>
2.754 - </or>
2.755 - </condition>
2.756 - <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
2.757 - <istrue value="${have-jdk-older-than-1.4}"/>
2.758 - </condition>
2.759 <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
2.760 <os family="windows"/>
2.761 </condition>
2.762 @@ -452,17 +874,103 @@
2.763 </target>
2.764 <target depends="-init-debug-args" name="-init-macrodef-debug">
2.765 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.766 + <attribute default="${module.name}" name="modulename"/>
2.767 <attribute default="${main.class}" name="classname"/>
2.768 + <attribute default="${debug.modulepath}" name="modulepath"/>
2.769 <attribute default="${debug.classpath}" name="classpath"/>
2.770 + <element name="customizeDebuggee" optional="true"/>
2.771 + <sequential>
2.772 + <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
2.773 + <customize>
2.774 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
2.775 + <customizeDebuggee/>
2.776 + </customize>
2.777 + </j2seproject1:java>
2.778 + </sequential>
2.779 + </macrodef>
2.780 + </target>
2.781 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
2.782 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
2.783 + <attribute default="${module.name}" name="modulename"/>
2.784 + <attribute default="${main.class}" name="classname"/>
2.785 + <attribute default="${run.modulepath}" name="modulepath"/>
2.786 + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
2.787 + <attribute default="${run.classpath}" name="classpath"/>
2.788 + <attribute default="jvm" name="jvm"/>
2.789 <element name="customize" optional="true"/>
2.790 <sequential>
2.791 - <java classname="@{classname}" dir="${work.dir}" fork="true">
2.792 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.793 - <jvmarg line="${debug-args-line}"/>
2.794 - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
2.795 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
2.796 + <classpath>
2.797 + <path path="@{classpath}"/>
2.798 + </classpath>
2.799 + <modulepath>
2.800 + <pathelement path="@{modulepath}"/>
2.801 + <pathelement location="${module.build.classes.dir}"/>
2.802 + </modulepath>
2.803 + <upgrademodulepath>
2.804 + <path path="@{upgrademodulepath}"/>
2.805 + </upgrademodulepath>
2.806 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
2.807 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
2.808 <jvmarg line="${run.jvmargs}"/>
2.809 + <jvmarg line="${run.jvmargs.ide}"/>
2.810 + <syspropertyset>
2.811 + <propertyref prefix="run-sys-prop."/>
2.812 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.813 + </syspropertyset>
2.814 + <customize/>
2.815 + </java>
2.816 + </sequential>
2.817 + </macrodef>
2.818 + </target>
2.819 + <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
2.820 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
2.821 + <attribute default="" name="modulename"/>
2.822 + <attribute default="${main.class}" name="classname"/>
2.823 + <attribute default="${run.modulepath}" name="modulepath"/>
2.824 + <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
2.825 + <attribute default="${run.classpath}" name="classpath"/>
2.826 + <attribute default="jvm" name="jvm"/>
2.827 + <element name="customize" optional="true"/>
2.828 + <sequential>
2.829 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
2.830 + <classpath>
2.831 + <path path="@{classpath}"/>
2.832 + </classpath>
2.833 + <modulepath>
2.834 + <path path="@{modulepath}"/>
2.835 + </modulepath>
2.836 + <upgrademodulepath>
2.837 + <path path="@{upgrademodulepath}"/>
2.838 + </upgrademodulepath>
2.839 + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
2.840 + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
2.841 + <jvmarg line="${run.jvmargs}"/>
2.842 + <jvmarg line="${run.jvmargs.ide}"/>
2.843 + <syspropertyset>
2.844 + <propertyref prefix="run-sys-prop."/>
2.845 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.846 + </syspropertyset>
2.847 + <customize/>
2.848 + </java>
2.849 + </sequential>
2.850 + </macrodef>
2.851 + </target>
2.852 + <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
2.853 + <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
2.854 + <attribute default="" name="modulename"/>
2.855 + <attribute default="${main.class}" name="classname"/>
2.856 + <attribute default="" name="modulepath"/>
2.857 + <attribute default="${run.classpath}" name="classpath"/>
2.858 + <attribute default="jvm" name="jvm"/>
2.859 + <element name="customize" optional="true"/>
2.860 + <sequential>
2.861 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
2.862 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.863 + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
2.864 + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
2.865 + <jvmarg line="${run.jvmargs}"/>
2.866 + <jvmarg line="${run.jvmargs.ide}"/>
2.867 <classpath>
2.868 <path path="@{classpath}"/>
2.869 </classpath>
2.870 @@ -475,29 +983,7 @@
2.871 </sequential>
2.872 </macrodef>
2.873 </target>
2.874 - <target name="-init-macrodef-java">
2.875 - <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
2.876 - <attribute default="${main.class}" name="classname"/>
2.877 - <attribute default="${run.classpath}" name="classpath"/>
2.878 - <element name="customize" optional="true"/>
2.879 - <sequential>
2.880 - <java classname="@{classname}" dir="${work.dir}" fork="true">
2.881 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.882 - <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
2.883 - <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
2.884 - <jvmarg line="${run.jvmargs}"/>
2.885 - <classpath>
2.886 - <path path="@{classpath}"/>
2.887 - </classpath>
2.888 - <syspropertyset>
2.889 - <propertyref prefix="run-sys-prop."/>
2.890 - <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.891 - </syspropertyset>
2.892 - <customize/>
2.893 - </java>
2.894 - </sequential>
2.895 - </macrodef>
2.896 - </target>
2.897 + <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
2.898 <target name="-init-macrodef-copylibs">
2.899 <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
2.900 <attribute default="${manifest.file}" name="manifest"/>
2.901 @@ -512,12 +998,15 @@
2.902 <path path="${run.classpath.without.build.classes.dir}"/>
2.903 <chainedmapper>
2.904 <flattenmapper/>
2.905 + <filtermapper>
2.906 + <replacestring from=" " to="%20"/>
2.907 + </filtermapper>
2.908 <globmapper from="*" to="lib/*"/>
2.909 </chainedmapper>
2.910 </pathconvert>
2.911 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
2.912 - <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
2.913 - <fileset dir="${build.classes.dir}"/>
2.914 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
2.915 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
2.916 <manifest>
2.917 <attribute name="Class-Path" value="${jar.classpath}"/>
2.918 <customize/>
2.919 @@ -528,8 +1017,8 @@
2.920 </target>
2.921 <target name="-init-presetdef-jar">
2.922 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
2.923 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
2.924 - <j2seproject1:fileset dir="${build.classes.dir}"/>
2.925 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
2.926 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
2.927 </jar>
2.928 </presetdef>
2.929 </target>
2.930 @@ -557,7 +1046,7 @@
2.931 <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
2.932 <property name="ap.cmd.line.internal" value=""/>
2.933 </target>
2.934 - <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
2.935 + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
2.936 <!--
2.937 ===================
2.938 COMPILATION SECTION
2.939 @@ -584,7 +1073,9 @@
2.940 <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
2.941 </target>
2.942 <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
2.943 - <antcall target="clean"/>
2.944 + <antcall target="clean">
2.945 + <param name="no.dependencies" value="true"/>
2.946 + </antcall>
2.947 </target>
2.948 <target depends="init,deps-jar" name="-pre-pre-compile">
2.949 <mkdir dir="${build.classes.dir}"/>
2.950 @@ -610,7 +1101,7 @@
2.951 <target if="has.persistence.xml" name="-copy-persistence-xml">
2.952 <mkdir dir="${build.classes.dir}/META-INF"/>
2.953 <copy todir="${build.classes.dir}/META-INF">
2.954 - <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
2.955 + <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
2.956 </copy>
2.957 </target>
2.958 <target name="-post-compile">
2.959 @@ -625,7 +1116,7 @@
2.960 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
2.961 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
2.962 <j2seproject3:force-recompile/>
2.963 - <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
2.964 + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
2.965 </target>
2.966 <target name="-post-compile-single">
2.967 <!-- Empty placeholder for easier customization. -->
2.968 @@ -645,65 +1136,191 @@
2.969 <!-- Empty placeholder for easier customization. -->
2.970 <!-- You can override this target in the ../build.xml file. -->
2.971 </target>
2.972 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
2.973 - <j2seproject1:jar/>
2.974 + <target depends="init,compile" name="-check-module-main-class">
2.975 + <pathconvert property="main.class.file">
2.976 + <string value="${main.class}"/>
2.977 + <unpackagemapper from="*" to="*.class"/>
2.978 + </pathconvert>
2.979 + <condition property="do.module.main.class">
2.980 + <and>
2.981 + <isset property="main.class.available"/>
2.982 + <available file="${build.classes.dir}/module-info.class"/>
2.983 + <available file="${build.classes.dir}/${main.class.file}"/>
2.984 + <isset property="libs.CopyLibs.classpath"/>
2.985 + <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
2.986 + </and>
2.987 + </condition>
2.988 </target>
2.989 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
2.990 - <j2seproject1:jar manifest="${manifest.file}"/>
2.991 + <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
2.992 + <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
2.993 + <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
2.994 </target>
2.995 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
2.996 - <j2seproject1:jar manifest="${manifest.file}">
2.997 - <j2seproject1:manifest>
2.998 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
2.999 - </j2seproject1:manifest>
2.1000 - </j2seproject1:jar>
2.1001 - <echo level="info">To run this application from the command line without Ant, try:</echo>
2.1002 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
2.1003 - <property location="${dist.jar}" name="dist.jar.resolved"/>
2.1004 - <pathconvert property="run.classpath.with.dist.jar">
2.1005 - <path path="${run.classpath}"/>
2.1006 - <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
2.1007 - </pathconvert>
2.1008 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
2.1009 - </target>
2.1010 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
2.1011 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
2.1012 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
2.1013 <touch file="${tmp.manifest.file}" verbose="false"/>
2.1014 </target>
2.1015 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
2.1016 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
2.1017 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
2.1018 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
2.1019 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
2.1020 </target>
2.1021 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
2.1022 - <manifest file="${tmp.manifest.file}" mode="update">
2.1023 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
2.1024 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
2.1025 <attribute name="Main-Class" value="${main.class}"/>
2.1026 </manifest>
2.1027 </target>
2.1028 - <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
2.1029 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
2.1030 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
2.1031 + <attribute name="Profile" value="${javac.profile}"/>
2.1032 + </manifest>
2.1033 + </target>
2.1034 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
2.1035 <basename file="${application.splash}" property="splashscreen.basename"/>
2.1036 <mkdir dir="${build.classes.dir}/META-INF"/>
2.1037 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
2.1038 - <manifest file="${tmp.manifest.file}" mode="update">
2.1039 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
2.1040 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
2.1041 </manifest>
2.1042 </target>
2.1043 - <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
2.1044 + <target depends="init,compile" name="-check-do-mkdist">
2.1045 + <condition property="do.mkdist">
2.1046 + <and>
2.1047 + <isset property="do.archive"/>
2.1048 + <isset property="libs.CopyLibs.classpath"/>
2.1049 + <not>
2.1050 + <istrue value="${mkdist.disabled}"/>
2.1051 + </not>
2.1052 + <not>
2.1053 + <available file="${build.classes.dir}/module-info.class"/>
2.1054 + </not>
2.1055 + </and>
2.1056 + </condition>
2.1057 + </target>
2.1058 + <target depends="init,-init-macrodef-copylibs,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.mkdist" name="-do-jar-copylibs">
2.1059 <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
2.1060 <echo level="info">To run this application from the command line without Ant, try:</echo>
2.1061 <property location="${dist.jar}" name="dist.jar.resolved"/>
2.1062 <echo level="info">java -jar "${dist.jar.resolved}"</echo>
2.1063 </target>
2.1064 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
2.1065 + <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">
2.1066 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
2.1067 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
2.1068 + <property location="${dist.jar}" name="dist.jar.resolved"/>
2.1069 + <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
2.1070 + <isset property="named.module.internal"/>
2.1071 + </condition>
2.1072 + <pathconvert property="run.classpath.with.dist.jar">
2.1073 + <path path="${run.classpath}"/>
2.1074 + <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
2.1075 + </pathconvert>
2.1076 + <pathconvert property="run.modulepath.with.dist.jar">
2.1077 + <path location="${dist.jar.resolved}"/>
2.1078 + <path path="${run.modulepath}"/>
2.1079 + <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
2.1080 + </pathconvert>
2.1081 + <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
2.1082 + <isset property="named.module.internal"/>
2.1083 + </condition>
2.1084 + <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
2.1085 + <and>
2.1086 + <isset property="modules.supported.internal"/>
2.1087 + <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
2.1088 + </and>
2.1089 + </condition>
2.1090 + <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
2.1091 + <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
2.1092 + </condition>
2.1093 + <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
2.1094 + <isset property="do.module.main.class"/>
2.1095 + </condition>
2.1096 + <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
2.1097 + <isset property="named.module.internal"/>
2.1098 + </condition>
2.1099 + <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}">
2.1100 + <isset property="main.class.available"/>
2.1101 + </condition>
2.1102 + <condition else="debug" property="jar.usage.level" value="info">
2.1103 + <isset property="main.class.available"/>
2.1104 + </condition>
2.1105 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
2.1106 + </target>
2.1107 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
2.1108 <delete>
2.1109 <fileset file="${tmp.manifest.file}"/>
2.1110 </delete>
2.1111 </target>
2.1112 - <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
2.1113 + <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,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
2.1114 + <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,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
2.1115 <target name="-post-jar">
2.1116 <!-- Empty placeholder for easier customization. -->
2.1117 <!-- You can override this target in the ../build.xml file. -->
2.1118 </target>
2.1119 - <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
2.1120 + <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
2.1121 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
2.1122 + <!--
2.1123 + =================
2.1124 + DEPLOY SECTION
2.1125 + =================
2.1126 + -->
2.1127 + <target name="-pre-deploy">
2.1128 + <!-- Empty placeholder for easier customization. -->
2.1129 + <!-- You can override this target in the ../build.xml file. -->
2.1130 + </target>
2.1131 + <target depends="init" name="-check-jlink">
2.1132 + <condition property="do.jlink.internal">
2.1133 + <and>
2.1134 + <istrue value="${do.jlink}"/>
2.1135 + <isset property="do.archive"/>
2.1136 + <isset property="named.module.internal"/>
2.1137 + </and>
2.1138 + </condition>
2.1139 + </target>
2.1140 + <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
2.1141 + <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
2.1142 + <property name="jlink.launcher.name" value="${application.title}"/>
2.1143 + <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
2.1144 + <and>
2.1145 + <isset property="jlink.additionalmodules"/>
2.1146 + <length length="0" string="${jlink.additionalmodules}" when="greater"/>
2.1147 + </and>
2.1148 + </condition>
2.1149 + <condition property="jlink.do.strip.internal">
2.1150 + <and>
2.1151 + <isset property="jlink.strip"/>
2.1152 + <istrue value="${jlink.strip}"/>
2.1153 + </and>
2.1154 + </condition>
2.1155 + <condition property="jlink.do.additionalparam.internal">
2.1156 + <and>
2.1157 + <isset property="jlink.additionalparam"/>
2.1158 + <length length="0" string="${jlink.additionalparam}" when="greater"/>
2.1159 + </and>
2.1160 + </condition>
2.1161 + <condition property="jlink.do.launcher.internal">
2.1162 + <and>
2.1163 + <istrue value="${jlink.launcher}"/>
2.1164 + <isset property="main.class.available"/>
2.1165 + </and>
2.1166 + </condition>
2.1167 + <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
2.1168 + <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
2.1169 + <exec executable="${platform.jlink}">
2.1170 + <arg value="--module-path"/>
2.1171 + <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
2.1172 + <arg value="--add-modules"/>
2.1173 + <arg value="${jlink.add.modules}"/>
2.1174 + <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
2.1175 + <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
2.1176 + <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
2.1177 + <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
2.1178 + <arg value="--output"/>
2.1179 + <arg value="${dist.jlink.output}"/>
2.1180 + </exec>
2.1181 + </target>
2.1182 + <target name="-post-deploy">
2.1183 + <!-- Empty placeholder for easier customization. -->
2.1184 + <!-- You can override this target in the ../build.xml file. -->
2.1185 + </target>
2.1186 + <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
2.1187 <!--
2.1188 =================
2.1189 EXECUTION SECTION
2.1190 @@ -740,9 +1357,9 @@
2.1191 </target>
2.1192 <target depends="init,compile" name="-debug-start-debuggee">
2.1193 <j2seproject3:debug>
2.1194 - <customize>
2.1195 + <customizeDebuggee>
2.1196 <arg line="${application.args}"/>
2.1197 - </customize>
2.1198 + </customizeDebuggee>
2.1199 </j2seproject3:debug>
2.1200 </target>
2.1201 <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
2.1202 @@ -773,7 +1390,11 @@
2.1203 PROFILING SECTION
2.1204 =================
2.1205 -->
2.1206 - <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
2.1207 + <!--
2.1208 + pre NB7.2 profiler integration
2.1209 + -->
2.1210 + <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
2.1211 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
2.1212 <nbprofiledirect>
2.1213 <classpath>
2.1214 <path path="${run.classpath}"/>
2.1215 @@ -781,8 +1402,9 @@
2.1216 </nbprofiledirect>
2.1217 <profile/>
2.1218 </target>
2.1219 - <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
2.1220 + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
2.1221 <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
2.1222 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
2.1223 <nbprofiledirect>
2.1224 <classpath>
2.1225 <path path="${run.classpath}"/>
2.1226 @@ -790,12 +1412,8 @@
2.1227 </nbprofiledirect>
2.1228 <profile classname="${profile.class}"/>
2.1229 </target>
2.1230 - <!--
2.1231 - =========================
2.1232 - APPLET PROFILING SECTION
2.1233 - =========================
2.1234 - -->
2.1235 - <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
2.1236 + <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
2.1237 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
2.1238 <nbprofiledirect>
2.1239 <classpath>
2.1240 <path path="${run.classpath}"/>
2.1241 @@ -807,32 +1425,60 @@
2.1242 </customize>
2.1243 </profile>
2.1244 </target>
2.1245 - <!--
2.1246 - =========================
2.1247 - TESTS PROFILING SECTION
2.1248 - =========================
2.1249 - -->
2.1250 - <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
2.1251 + <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
2.1252 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
2.1253 <nbprofiledirect>
2.1254 <classpath>
2.1255 <path path="${run.test.classpath}"/>
2.1256 </classpath>
2.1257 </nbprofiledirect>
2.1258 - <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
2.1259 - <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
2.1260 - <jvmarg value="${profiler.info.jvmargs.agent}"/>
2.1261 - <jvmarg line="${profiler.info.jvmargs}"/>
2.1262 - <test name="${profile.class}"/>
2.1263 - <classpath>
2.1264 - <path path="${run.test.classpath}"/>
2.1265 - </classpath>
2.1266 - <syspropertyset>
2.1267 - <propertyref prefix="test-sys-prop."/>
2.1268 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.1269 - </syspropertyset>
2.1270 - <formatter type="brief" usefile="false"/>
2.1271 - <formatter type="xml"/>
2.1272 - </junit>
2.1273 + <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
2.1274 + <customize>
2.1275 + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
2.1276 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
2.1277 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
2.1278 + <jvmarg line="${profiler.info.jvmargs}"/>
2.1279 + <classpath>
2.1280 + <path path="${run.test.classpath}"/>
2.1281 + </classpath>
2.1282 + </customize>
2.1283 + </j2seproject3:junit>
2.1284 + </target>
2.1285 + <!--
2.1286 + end of pre NB72 profiling section
2.1287 + -->
2.1288 + <target if="netbeans.home" name="-profile-check">
2.1289 + <condition property="profiler.configured">
2.1290 + <or>
2.1291 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
2.1292 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
2.1293 + </or>
2.1294 + </condition>
2.1295 + </target>
2.1296 + <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
2.1297 + <startprofiler/>
2.1298 + <antcall target="run"/>
2.1299 + </target>
2.1300 + <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
2.1301 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
2.1302 + <startprofiler/>
2.1303 + <antcall target="run-single"/>
2.1304 + </target>
2.1305 + <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
2.1306 + <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
2.1307 + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
2.1308 + <startprofiler/>
2.1309 + <antcall target="test-single"/>
2.1310 + </target>
2.1311 + <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
2.1312 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
2.1313 + <startprofiler/>
2.1314 + <antcall target="run-test-with-main"/>
2.1315 + </target>
2.1316 + <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
2.1317 + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
2.1318 + <startprofiler/>
2.1319 + <antcall target="run-applet"/>
2.1320 </target>
2.1321 <!--
2.1322 ===============
2.1323 @@ -849,11 +1495,20 @@
2.1324 </not>
2.1325 </and>
2.1326 </condition>
2.1327 - <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}">
2.1328 + <condition else="" property="bug5101868workaround" value="*.java">
2.1329 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
2.1330 + </condition>
2.1331 + <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
2.1332 + <and>
2.1333 + <isset property="javadoc.html5"/>
2.1334 + <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
2.1335 + </and>
2.1336 + </condition>
2.1337 + <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}">
2.1338 <classpath>
2.1339 <path path="${javac.classpath}"/>
2.1340 </classpath>
2.1341 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
2.1342 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
2.1343 <filename name="**/*.java"/>
2.1344 </fileset>
2.1345 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
2.1346 @@ -861,6 +1516,7 @@
2.1347 <exclude name="*.java"/>
2.1348 </fileset>
2.1349 <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
2.1350 + <arg line="${javadoc.html5.cmd.line.arg}"/>
2.1351 </javadoc>
2.1352 <copy todir="${dist.javadoc.dir}">
2.1353 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
2.1354 @@ -877,7 +1533,7 @@
2.1355 <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
2.1356 <!--
2.1357 =========================
2.1358 - JUNIT COMPILATION SECTION
2.1359 + TEST COMPILATION SECTION
2.1360 =========================
2.1361 -->
2.1362 <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
2.1363 @@ -887,11 +1543,63 @@
2.1364 <!-- Empty placeholder for easier customization. -->
2.1365 <!-- You can override this target in the ../build.xml file. -->
2.1366 </target>
2.1367 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
2.1368 + <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
2.1369 + <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
2.1370 + <and>
2.1371 + <isset property="test.module.name"/>
2.1372 + <length length="0" string="${test.module.name}" when="greater"/>
2.1373 + </and>
2.1374 + </condition>
2.1375 + <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
2.1376 + <and>
2.1377 + <isset property="test.module.name"/>
2.1378 + <length length="0" string="${test.module.name}" when="greater"/>
2.1379 + </and>
2.1380 + </condition>
2.1381 + </target>
2.1382 + <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
2.1383 + <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
2.1384 + <and>
2.1385 + <isset property="test.module.name"/>
2.1386 + <length length="0" string="${test.module.name}" when="greater"/>
2.1387 + </and>
2.1388 + </condition>
2.1389 + <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
2.1390 + <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
2.1391 + <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
2.1392 + <chainedmapper>
2.1393 + <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
2.1394 + <filtermapper>
2.1395 + <uniqfilter/>
2.1396 + <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
2.1397 + </filtermapper>
2.1398 + <cutdirsmapper dirs="1"/>
2.1399 + <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
2.1400 + </chainedmapper>
2.1401 + </pathconvert>
2.1402 + <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}">
2.1403 + <and>
2.1404 + <isset property="test.module.name"/>
2.1405 + <length length="0" string="${test.module.name}" when="greater"/>
2.1406 + </and>
2.1407 + </condition>
2.1408 + </target>
2.1409 + <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
2.1410 + <property name="javac.test.sourcepath" value="${empty.dir}"/>
2.1411 + <property name="javac.test.compilerargs" value=""/>
2.1412 + <property name="run.test.jvmargs" value=""/>
2.1413 + </target>
2.1414 + <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
2.1415 <target if="do.depend.true" name="-compile-test-depend">
2.1416 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
2.1417 </target>
2.1418 - <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
2.1419 - <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
2.1420 + <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">
2.1421 + <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.src.dir}">
2.1422 + <customize>
2.1423 + <compilerarg line="${javac.test.compilerargs}"/>
2.1424 + </customize>
2.1425 + </j2seproject3:javac>
2.1426 <copy todir="${build.test.classes.dir}">
2.1427 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
2.1428 </copy>
2.1429 @@ -905,10 +1613,14 @@
2.1430 <!-- Empty placeholder for easier customization. -->
2.1431 <!-- You can override this target in the ../build.xml file. -->
2.1432 </target>
2.1433 - <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
2.1434 + <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
2.1435 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
2.1436 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
2.1437 - <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
2.1438 + <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
2.1439 + <customize>
2.1440 + <compilerarg line="${javac.test.compilerargs}"/>
2.1441 + </customize>
2.1442 + </j2seproject3:javac>
2.1443 <copy todir="${build.test.classes.dir}">
2.1444 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
2.1445 </copy>
2.1446 @@ -920,14 +1632,14 @@
2.1447 <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
2.1448 <!--
2.1449 =======================
2.1450 - JUNIT EXECUTION SECTION
2.1451 + TEST EXECUTION SECTION
2.1452 =======================
2.1453 -->
2.1454 <target depends="init" if="have.tests" name="-pre-test-run">
2.1455 <mkdir dir="${build.test.results.dir}"/>
2.1456 </target>
2.1457 - <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
2.1458 - <j2seproject3:junit testincludes="**/*Test.java"/>
2.1459 + <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
2.1460 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
2.1461 </target>
2.1462 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
2.1463 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
2.1464 @@ -938,41 +1650,43 @@
2.1465 <target depends="init" if="have.tests" name="-pre-test-run-single">
2.1466 <mkdir dir="${build.test.results.dir}"/>
2.1467 </target>
2.1468 - <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
2.1469 + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
2.1470 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
2.1471 - <j2seproject3:junit excludes="" includes="${test.includes}"/>
2.1472 + <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
2.1473 </target>
2.1474 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
2.1475 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
2.1476 </target>
2.1477 - <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
2.1478 + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
2.1479 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
2.1480 + <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
2.1481 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
2.1482 + <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
2.1483 + </target>
2.1484 + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
2.1485 + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
2.1486 + </target>
2.1487 + <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
2.1488 <!--
2.1489 =======================
2.1490 - JUNIT DEBUGGING SECTION
2.1491 + TEST DEBUGGING SECTION
2.1492 =======================
2.1493 -->
2.1494 - <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
2.1495 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
2.1496 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
2.1497 - <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
2.1498 - <delete file="${test.report.file}"/>
2.1499 - <mkdir dir="${build.test.results.dir}"/>
2.1500 - <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
2.1501 - <customize>
2.1502 - <syspropertyset>
2.1503 - <propertyref prefix="test-sys-prop."/>
2.1504 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.1505 - </syspropertyset>
2.1506 - <arg value="${test.class}"/>
2.1507 - <arg value="showoutput=true"/>
2.1508 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
2.1509 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
2.1510 - </customize>
2.1511 - </j2seproject3:debug>
2.1512 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
2.1513 + </target>
2.1514 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
2.1515 + <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
2.1516 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
2.1517 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
2.1518 </target>
2.1519 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
2.1520 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
2.1521 </target>
2.1522 - <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
2.1523 + <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
2.1524 + <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
2.1525 + <target depends="debug-test-method" name="debug-single-method"/>
2.1526 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
2.1527 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
2.1528 </target>
2.1529 @@ -998,9 +1712,9 @@
2.1530 <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
2.1531 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
2.1532 <j2seproject3:debug classname="sun.applet.AppletViewer">
2.1533 - <customize>
2.1534 + <customizeDebuggee>
2.1535 <arg value="${applet.url}"/>
2.1536 - </customize>
2.1537 + </customizeDebuggee>
2.1538 </j2seproject3:debug>
2.1539 </target>
2.1540 <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
2.1541 @@ -1027,6 +1741,7 @@
2.1542 </target>
2.1543 <target depends="init" name="-do-clean">
2.1544 <delete dir="${build.dir}"/>
2.1545 + <delete dir="${dist.jlink.output}"/>
2.1546 <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
2.1547 </target>
2.1548 <target name="-post-clean">
2.1549 @@ -1037,9 +1752,12 @@
2.1550 <target name="-check-call-dep">
2.1551 <property file="${call.built.properties}" prefix="already.built."/>
2.1552 <condition property="should.call.dep">
2.1553 - <not>
2.1554 - <isset property="already.built.${call.subproject}"/>
2.1555 - </not>
2.1556 + <and>
2.1557 + <not>
2.1558 + <isset property="already.built.${call.subproject}"/>
2.1559 + </not>
2.1560 + <available file="${call.script}"/>
2.1561 + </and>
2.1562 </condition>
2.1563 </target>
2.1564 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
3.1 --- a/java/rozsirene-atributy/nbproject/genfiles.properties Sun Oct 07 16:18:03 2012 +0200
3.2 +++ b/java/rozsirene-atributy/nbproject/genfiles.properties Sun Dec 10 23:59:24 2023 +0100
3.3 @@ -1,8 +1,8 @@
3.4 build.xml.data.CRC32=ca43bb03
3.5 -build.xml.script.CRC32=ece139f4
3.6 -build.xml.stylesheet.CRC32=28e38971@1.38.2.45
3.7 +build.xml.script.CRC32=3b4ae2a0
3.8 +build.xml.stylesheet.CRC32=f85dc8f2@1.105.0.48
3.9 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
3.10 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
3.11 nbproject/build-impl.xml.data.CRC32=ca43bb03
3.12 -nbproject/build-impl.xml.script.CRC32=dad65463
3.13 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46
3.14 +nbproject/build-impl.xml.script.CRC32=e8b330b8
3.15 +nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.105.0.48
4.1 --- a/java/rozsirene-atributy/nbproject/project.properties Sun Oct 07 16:18:03 2012 +0200
4.2 +++ b/java/rozsirene-atributy/nbproject/project.properties Sun Dec 10 23:59:24 2023 +0100
4.3 @@ -1,84 +1,94 @@
4.4 -annotation.processing.enabled=true
4.5 -annotation.processing.enabled.in.editor=false
4.6 -annotation.processing.processors.list=
4.7 -annotation.processing.run.all.processors=true
4.8 -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
4.9 -application.title=rozsirene-atributy
4.10 -application.vendor=fiki
4.11 -build.classes.dir=${build.dir}/classes
4.12 -build.classes.excludes=**/*.java,**/*.form
4.13 -# This directory is removed when the project is cleaned:
4.14 -build.dir=build
4.15 -build.generated.dir=${build.dir}/generated
4.16 -build.generated.sources.dir=${build.dir}/generated-sources
4.17 -# Only compile against the classpath explicitly listed here:
4.18 -build.sysclasspath=ignore
4.19 -build.test.classes.dir=${build.dir}/test/classes
4.20 -build.test.results.dir=${build.dir}/test/results
4.21 -# Uncomment to specify the preferred debugger connection transport:
4.22 -#debug.transport=dt_socket
4.23 -debug.classpath=\
4.24 - ${run.classpath}
4.25 -debug.test.classpath=\
4.26 - ${run.test.classpath}
4.27 -# This directory is removed when the project is cleaned:
4.28 -dist.dir=dist
4.29 -dist.jar=${dist.dir}/rozsirene-atributy.jar
4.30 -dist.javadoc.dir=${dist.dir}/javadoc
4.31 -endorsed.classpath=
4.32 +#Sun Dec 10 23:58:00 CET 2023
4.33 excludes=
4.34 -includes=**
4.35 -jar.archive.disabled=${jnlp.enabled}
4.36 -jar.compress=false
4.37 -jar.index=${jnlp.enabled}
4.38 -javac.classpath=
4.39 -# Space-separated list of extra javac options
4.40 -javac.compilerargs=
4.41 -javac.deprecation=false
4.42 -javac.processorpath=\
4.43 - ${javac.classpath}
4.44 -javac.source=1.7
4.45 -javac.target=1.7
4.46 javac.test.classpath=\
4.47 ${javac.classpath}:\
4.48 - ${build.classes.dir}:\
4.49 - ${libs.junit.classpath}:\
4.50 - ${libs.junit_4.classpath}
4.51 -javac.test.processorpath=\
4.52 - ${javac.test.classpath}
4.53 -javadoc.additionalparam=
4.54 -javadoc.author=false
4.55 -javadoc.encoding=${source.encoding}
4.56 -javadoc.noindex=false
4.57 -javadoc.nonavbar=false
4.58 -javadoc.notree=false
4.59 -javadoc.private=false
4.60 -javadoc.splitindex=true
4.61 -javadoc.use=true
4.62 -javadoc.version=false
4.63 -javadoc.windowtitle=
4.64 -jnlp.codebase.type=user
4.65 -jnlp.codebase.user=
4.66 -jnlp.descriptor=application
4.67 -jnlp.enabled=false
4.68 -jnlp.mixed.code=defaut
4.69 -jnlp.offline-allowed=false
4.70 -jnlp.signed=false
4.71 -main.class=cz.frantovo.rozsireneAtributy.Start\u00e9r
4.72 -manifest.file=manifest.mf
4.73 -meta.inf.dir=${src.dir}/META-INF
4.74 -mkdist.disabled=false
4.75 -platform.active=default_platform
4.76 + ${build.classes.dir}
4.77 run.classpath=\
4.78 ${javac.classpath}:\
4.79 ${build.classes.dir}
4.80 -# Space-separated list of JVM arguments used when running the project
4.81 -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
4.82 -# or test-sys-prop.name=value to set system properties for unit tests):
4.83 +javac.processorpath=\
4.84 + ${javac.classpath}
4.85 +dist.javadoc.dir=${dist.dir}/javadoc
4.86 +jnlp.codebase.user=
4.87 +jnlp.offline-allowed=false
4.88 +test.src.dir=test
4.89 +jnlp.signing.keystore=
4.90 +jnlp.signing.alias=
4.91 +run.modulepath=\
4.92 + ${javac.modulepath}
4.93 +annotation.processing.enabled=true
4.94 +jnlp.codebase.type=user
4.95 +jar.index=${jnlp.enabled}
4.96 +build.sysclasspath=ignore
4.97 +debug.modulepath=${run.modulepath}
4.98 +javac.compilerargs=
4.99 +auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
4.100 +javadoc.noindex=false
4.101 +javadoc.private=false
4.102 +jar.archive.disabled=${jnlp.enabled}
4.103 +javadoc.author=false
4.104 +endorsed.classpath=
4.105 +main.class=cz.frantovo.rozsireneAtributy.Start\u00E9r
4.106 +junit.selected.version=4
4.107 +source.encoding=UTF-8
4.108 +javac.source=1.7
4.109 +includes=**
4.110 +javadoc.use=true
4.111 +jar.compress=false
4.112 +javadoc.nonavbar=false
4.113 +annotation.processing.enabled.in.editor=false
4.114 +javadoc.notree=false
4.115 +annotation.processing.processors.list=
4.116 +javac.deprecation=false
4.117 +application.vendor=fiki
4.118 +jlink.launcher=false
4.119 +javadoc.additionalparam=
4.120 +manifest.custom.caller.allowable.codebase=
4.121 +jnlp.mixed.code=default
4.122 +jnlp.signed=false
4.123 +jlink.launcher.name=rozsirene-atributy
4.124 +build.generated.sources.dir=${build.dir}/generated-sources
4.125 +javadoc.splitindex=true
4.126 +javac.processormodulepath=
4.127 +manifest.custom.application.library.allowable.codebase=
4.128 run.jvmargs=
4.129 +javadoc.encoding=${source.encoding}
4.130 +javac.classpath=
4.131 +manifest.custom.permissions=
4.132 +mkdist.disabled=false
4.133 +run.test.modulepath=\
4.134 + ${javac.test.modulepath}
4.135 +build.classes.excludes=**/*.java,**/*.form
4.136 +dist.jar=${dist.dir}/rozsirene-atributy.jar
4.137 +build.classes.dir=${build.dir}/classes
4.138 +debug.test.modulepath=${run.test.modulepath}
4.139 +build.test.classes.dir=${build.dir}/test/classes
4.140 +javadoc.windowtitle=
4.141 +build.test.results.dir=${build.dir}/test/results
4.142 +jnlp.enabled=false
4.143 +dist.dir=dist
4.144 +build.dir=build
4.145 +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
4.146 +build.generated.dir=${build.dir}/generated
4.147 +javadoc.version=false
4.148 +application.title=rozsirene-atributy
4.149 +javac.test.modulepath=\
4.150 + ${javac.modulepath}
4.151 +debug.test.classpath=${run.test.classpath}
4.152 +javac.external.vm=false
4.153 +javac.target=1.7
4.154 +jnlp.signing=
4.155 +platform.active=default_platform
4.156 +manifest.file=manifest.mf
4.157 +manifest.custom.codebase=
4.158 +javadoc.html5=false
4.159 +javac.test.processorpath=${javac.test.classpath}
4.160 +jnlp.descriptor=application
4.161 +meta.inf.dir=${src.dir}/META-INF
4.162 run.test.classpath=\
4.163 ${javac.test.classpath}:\
4.164 ${build.test.classes.dir}
4.165 -source.encoding=UTF-8
4.166 +annotation.processing.run.all.processors=true
4.167 +javac.modulepath=
4.168 src.dir=src
4.169 -test.src.dir=test
4.170 +debug.classpath=${run.classpath}