1.1 --- a/java/rozsirene-atributy-jedit/nbproject/build-impl.xml Sat Aug 18 13:22:45 2012 +0200
1.2 +++ b/java/rozsirene-atributy-jedit/nbproject/build-impl.xml Mon Dec 11 00:49:59 2023 +0100
1.3 @@ -12,9 +12,9 @@
1.4 - execution
1.5 - debugging
1.6 - javadoc
1.7 - - junit compilation
1.8 - - junit execution
1.9 - - junit debugging
1.10 + - test compilation
1.11 + - test execution
1.12 + - test debugging
1.13 - applet
1.14 - cleanup
1.15
1.16 @@ -46,14 +46,15 @@
1.17 <property file="${user.properties.file}"/>
1.18 <!-- The two properties below are usually overridden -->
1.19 <!-- by the active platform. Just a fallback. -->
1.20 - <property name="default.javac.source" value="1.4"/>
1.21 - <property name="default.javac.target" value="1.4"/>
1.22 + <property name="default.javac.source" value="1.6"/>
1.23 + <property name="default.javac.target" value="1.6"/>
1.24 </target>
1.25 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
1.26 <property file="nbproject/configs/${config}.properties"/>
1.27 <property file="nbproject/project.properties"/>
1.28 </target>
1.29 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
1.30 + <property name="platform.java" value="${java.home}/bin/java"/>
1.31 <available file="${manifest.file}" property="manifest.available"/>
1.32 <condition property="splashscreen.available">
1.33 <and>
1.34 @@ -71,16 +72,20 @@
1.35 </not>
1.36 </and>
1.37 </condition>
1.38 - <condition property="manifest.available+main.class">
1.39 + <condition property="profile.available">
1.40 <and>
1.41 - <isset property="manifest.available"/>
1.42 - <isset property="main.class.available"/>
1.43 + <isset property="javac.profile"/>
1.44 + <length length="0" string="${javac.profile}" when="greater"/>
1.45 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
1.46 </and>
1.47 </condition>
1.48 <condition property="do.archive">
1.49 - <not>
1.50 - <istrue value="${jar.archive.disabled}"/>
1.51 - </not>
1.52 + <or>
1.53 + <not>
1.54 + <istrue value="${jar.archive.disabled}"/>
1.55 + </not>
1.56 + <istrue value="${not.archive.disabled}"/>
1.57 + </or>
1.58 </condition>
1.59 <condition property="do.mkdist">
1.60 <and>
1.61 @@ -91,12 +96,6 @@
1.62 </not>
1.63 </and>
1.64 </condition>
1.65 - <condition property="manifest.available+main.class+mkdist.available">
1.66 - <and>
1.67 - <istrue value="${manifest.available+main.class}"/>
1.68 - <isset property="do.mkdist"/>
1.69 - </and>
1.70 - </condition>
1.71 <condition property="do.archive+manifest.available">
1.72 <and>
1.73 <isset property="manifest.available"/>
1.74 @@ -115,24 +114,12 @@
1.75 <istrue value="${do.archive}"/>
1.76 </and>
1.77 </condition>
1.78 - <condition property="do.archive+manifest.available+main.class">
1.79 + <condition property="do.archive+profile.available">
1.80 <and>
1.81 - <istrue value="${manifest.available+main.class}"/>
1.82 + <isset property="profile.available"/>
1.83 <istrue value="${do.archive}"/>
1.84 </and>
1.85 </condition>
1.86 - <condition property="manifest.available-mkdist.available">
1.87 - <or>
1.88 - <istrue value="${manifest.available}"/>
1.89 - <isset property="do.mkdist"/>
1.90 - </or>
1.91 - </condition>
1.92 - <condition property="manifest.available+main.class-mkdist.available">
1.93 - <or>
1.94 - <istrue value="${manifest.available+main.class}"/>
1.95 - <isset property="do.mkdist"/>
1.96 - </or>
1.97 - </condition>
1.98 <condition property="have.tests">
1.99 <or>
1.100 <available file="${test.src.dir}"/>
1.101 @@ -156,6 +143,7 @@
1.102 </and>
1.103 </condition>
1.104 <property name="run.jvmargs" value=""/>
1.105 + <property name="run.jvmargs.ide" value=""/>
1.106 <property name="javac.compilerargs" value=""/>
1.107 <property name="work.dir" value="${basedir}"/>
1.108 <condition property="no.deps">
1.109 @@ -168,6 +156,7 @@
1.110 <property name="application.args" value=""/>
1.111 <property name="source.encoding" value="${file.encoding}"/>
1.112 <property name="runtime.encoding" value="${source.encoding}"/>
1.113 + <property name="manifest.encoding" value="${source.encoding}"/>
1.114 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
1.115 <and>
1.116 <isset property="javadoc.encoding"/>
1.117 @@ -185,7 +174,15 @@
1.118 </condition>
1.119 <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
1.120 <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
1.121 - <length length="0" string="${endorsed.classpath}" when="greater"/>
1.122 + <and>
1.123 + <isset property="endorsed.classpath"/>
1.124 + <not>
1.125 + <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
1.126 + </not>
1.127 + </and>
1.128 + </condition>
1.129 + <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
1.130 + <isset property="profile.available"/>
1.131 </condition>
1.132 <condition else="false" property="jdkBug6558476">
1.133 <and>
1.134 @@ -195,11 +192,38 @@
1.135 </not>
1.136 </and>
1.137 </condition>
1.138 - <property name="javac.fork" value="${jdkBug6558476}"/>
1.139 + <condition else="false" property="javac.fork">
1.140 + <or>
1.141 + <istrue value="${jdkBug6558476}"/>
1.142 + <istrue value="${javac.external.vm}"/>
1.143 + </or>
1.144 + </condition>
1.145 <property name="jar.index" value="false"/>
1.146 <property name="jar.index.metainf" value="${jar.index}"/>
1.147 <property name="copylibs.rebase" value="true"/>
1.148 <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
1.149 + <condition property="junit.available">
1.150 + <or>
1.151 + <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
1.152 + <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
1.153 + </or>
1.154 + </condition>
1.155 + <condition property="testng.available">
1.156 + <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
1.157 + </condition>
1.158 + <condition property="junit+testng.available">
1.159 + <and>
1.160 + <istrue value="${junit.available}"/>
1.161 + <istrue value="${testng.available}"/>
1.162 + </and>
1.163 + </condition>
1.164 + <condition else="testng" property="testng.mode" value="mixed">
1.165 + <istrue value="${junit+testng.available}"/>
1.166 + </condition>
1.167 + <condition else="" property="testng.debug.mode" value="-mixed">
1.168 + <istrue value="${junit+testng.available}"/>
1.169 + </condition>
1.170 + <property name="java.failonerror" value="true"/>
1.171 </target>
1.172 <target name="-post-init">
1.173 <!-- Empty placeholder for easier customization. -->
1.174 @@ -253,6 +277,7 @@
1.175 <path path="@{classpath}"/>
1.176 </classpath>
1.177 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.178 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.179 <compilerarg line="${javac.compilerargs}"/>
1.180 <compilerarg value="-processorpath"/>
1.181 <compilerarg path="@{processorpath}:${empty.dir}"/>
1.182 @@ -292,6 +317,7 @@
1.183 <path path="@{classpath}"/>
1.184 </classpath>
1.185 <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
1.186 + <compilerarg line="${javac.profile.cmd.line.arg}"/>
1.187 <compilerarg line="${javac.compilerargs}"/>
1.188 <customize/>
1.189 </javac>
1.190 @@ -332,11 +358,57 @@
1.191 </sequential>
1.192 </macrodef>
1.193 </target>
1.194 - <target name="-init-macrodef-junit">
1.195 + <target if="${junit.available}" name="-init-macrodef-junit-init">
1.196 + <condition else="false" property="nb.junit.batch" value="true">
1.197 + <and>
1.198 + <istrue value="${junit.available}"/>
1.199 + <not>
1.200 + <isset property="test.method"/>
1.201 + </not>
1.202 + </and>
1.203 + </condition>
1.204 + <condition else="false" property="nb.junit.single" value="true">
1.205 + <and>
1.206 + <istrue value="${junit.available}"/>
1.207 + <isset property="test.method"/>
1.208 + </and>
1.209 + </condition>
1.210 + </target>
1.211 + <target name="-init-test-properties">
1.212 + <property name="test.binaryincludes" value="<nothing>"/>
1.213 + <property name="test.binarytestincludes" value=""/>
1.214 + <property name="test.binaryexcludes" value=""/>
1.215 + </target>
1.216 + <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
1.217 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.218 <attribute default="${includes}" name="includes"/>
1.219 <attribute default="${excludes}" name="excludes"/>
1.220 <attribute default="**" name="testincludes"/>
1.221 + <attribute default="" name="testmethods"/>
1.222 + <element name="customize" optional="true"/>
1.223 + <sequential>
1.224 + <property name="junit.forkmode" value="perTest"/>
1.225 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.226 + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
1.227 + <syspropertyset>
1.228 + <propertyref prefix="test-sys-prop."/>
1.229 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.230 + </syspropertyset>
1.231 + <formatter type="brief" usefile="false"/>
1.232 + <formatter type="xml"/>
1.233 + <jvmarg value="-ea"/>
1.234 + <customize/>
1.235 + </junit>
1.236 + </sequential>
1.237 + </macrodef>
1.238 + </target>
1.239 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
1.240 + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.241 + <attribute default="${includes}" name="includes"/>
1.242 + <attribute default="${excludes}" name="excludes"/>
1.243 + <attribute default="**" name="testincludes"/>
1.244 + <attribute default="" name="testmethods"/>
1.245 + <element name="customize" optional="true"/>
1.246 <sequential>
1.247 <property name="junit.forkmode" value="perTest"/>
1.248 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.249 @@ -344,33 +416,277 @@
1.250 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.251 <filename name="@{testincludes}"/>
1.252 </fileset>
1.253 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
1.254 + <filename name="${test.binarytestincludes}"/>
1.255 + </fileset>
1.256 </batchtest>
1.257 - <classpath>
1.258 - <path path="${run.test.classpath}"/>
1.259 - </classpath>
1.260 <syspropertyset>
1.261 <propertyref prefix="test-sys-prop."/>
1.262 <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.263 </syspropertyset>
1.264 <formatter type="brief" usefile="false"/>
1.265 <formatter type="xml"/>
1.266 - <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.267 <jvmarg value="-ea"/>
1.268 - <jvmarg line="${run.jvmargs}"/>
1.269 + <customize/>
1.270 </junit>
1.271 </sequential>
1.272 </macrodef>
1.273 </target>
1.274 - <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
1.275 - <target name="-profile-pre-init">
1.276 + <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
1.277 + <target if="${testng.available}" name="-init-macrodef-testng">
1.278 + <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
1.279 + <attribute default="${includes}" name="includes"/>
1.280 + <attribute default="${excludes}" name="excludes"/>
1.281 + <attribute default="**" name="testincludes"/>
1.282 + <attribute default="" name="testmethods"/>
1.283 + <element name="customize" optional="true"/>
1.284 + <sequential>
1.285 + <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
1.286 + <isset property="test.method"/>
1.287 + </condition>
1.288 + <union id="test.set">
1.289 + <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
1.290 + <filename name="@{testincludes}"/>
1.291 + </fileset>
1.292 + </union>
1.293 + <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
1.294 + <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-jedit" testname="TestNG tests" workingDir="${work.dir}">
1.295 + <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
1.296 + <propertyset>
1.297 + <propertyref prefix="test-sys-prop."/>
1.298 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.299 + </propertyset>
1.300 + <customize/>
1.301 + </testng>
1.302 + </sequential>
1.303 + </macrodef>
1.304 + </target>
1.305 + <target name="-init-macrodef-test-impl">
1.306 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.307 + <attribute default="${includes}" name="includes"/>
1.308 + <attribute default="${excludes}" name="excludes"/>
1.309 + <attribute default="**" name="testincludes"/>
1.310 + <attribute default="" name="testmethods"/>
1.311 + <element implicit="true" name="customize" optional="true"/>
1.312 + <sequential>
1.313 + <echo>No tests executed.</echo>
1.314 + </sequential>
1.315 + </macrodef>
1.316 + </target>
1.317 + <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
1.318 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.319 + <attribute default="${includes}" name="includes"/>
1.320 + <attribute default="${excludes}" name="excludes"/>
1.321 + <attribute default="**" name="testincludes"/>
1.322 + <attribute default="" name="testmethods"/>
1.323 + <element implicit="true" name="customize" optional="true"/>
1.324 + <sequential>
1.325 + <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.326 + <customize/>
1.327 + </j2seproject3:junit>
1.328 + </sequential>
1.329 + </macrodef>
1.330 + </target>
1.331 + <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
1.332 + <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.333 + <attribute default="${includes}" name="includes"/>
1.334 + <attribute default="${excludes}" name="excludes"/>
1.335 + <attribute default="**" name="testincludes"/>
1.336 + <attribute default="" name="testmethods"/>
1.337 + <element implicit="true" name="customize" optional="true"/>
1.338 + <sequential>
1.339 + <j2seproject3:testng excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.340 + <customize/>
1.341 + </j2seproject3:testng>
1.342 + </sequential>
1.343 + </macrodef>
1.344 + </target>
1.345 + <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
1.346 + <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3">
1.347 + <attribute default="${includes}" name="includes"/>
1.348 + <attribute default="${excludes}" name="excludes"/>
1.349 + <attribute default="**" name="testincludes"/>
1.350 + <attribute default="" name="testmethods"/>
1.351 + <sequential>
1.352 + <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.353 + <customize>
1.354 + <classpath>
1.355 + <path path="${run.test.classpath}"/>
1.356 + </classpath>
1.357 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.358 + <jvmarg line="${run.jvmargs}"/>
1.359 + <jvmarg line="${run.jvmargs.ide}"/>
1.360 + </customize>
1.361 + </j2seproject3:test-impl>
1.362 + </sequential>
1.363 + </macrodef>
1.364 + </target>
1.365 + <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
1.366 + <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.367 + <attribute default="${includes}" name="includes"/>
1.368 + <attribute default="${excludes}" name="excludes"/>
1.369 + <attribute default="**" name="testincludes"/>
1.370 + <attribute default="" name="testmethods"/>
1.371 + <element name="customize" optional="true"/>
1.372 + <sequential>
1.373 + <property name="junit.forkmode" value="perTest"/>
1.374 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.375 + <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
1.376 + <syspropertyset>
1.377 + <propertyref prefix="test-sys-prop."/>
1.378 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.379 + </syspropertyset>
1.380 + <formatter type="brief" usefile="false"/>
1.381 + <formatter type="xml"/>
1.382 + <jvmarg value="-ea"/>
1.383 + <jvmarg line="${debug-args-line}"/>
1.384 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.385 + <customize/>
1.386 + </junit>
1.387 + </sequential>
1.388 + </macrodef>
1.389 + </target>
1.390 + <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
1.391 + <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.392 + <attribute default="${includes}" name="includes"/>
1.393 + <attribute default="${excludes}" name="excludes"/>
1.394 + <attribute default="**" name="testincludes"/>
1.395 + <attribute default="" name="testmethods"/>
1.396 + <element name="customize" optional="true"/>
1.397 + <sequential>
1.398 + <property name="junit.forkmode" value="perTest"/>
1.399 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
1.400 + <batchtest todir="${build.test.results.dir}">
1.401 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.402 + <filename name="@{testincludes}"/>
1.403 + </fileset>
1.404 + <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
1.405 + <filename name="${test.binarytestincludes}"/>
1.406 + </fileset>
1.407 + </batchtest>
1.408 + <syspropertyset>
1.409 + <propertyref prefix="test-sys-prop."/>
1.410 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.411 + </syspropertyset>
1.412 + <formatter type="brief" usefile="false"/>
1.413 + <formatter type="xml"/>
1.414 + <jvmarg value="-ea"/>
1.415 + <jvmarg line="${debug-args-line}"/>
1.416 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.417 + <customize/>
1.418 + </junit>
1.419 + </sequential>
1.420 + </macrodef>
1.421 + </target>
1.422 + <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
1.423 + <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.424 + <attribute default="${includes}" name="includes"/>
1.425 + <attribute default="${excludes}" name="excludes"/>
1.426 + <attribute default="**" name="testincludes"/>
1.427 + <attribute default="" name="testmethods"/>
1.428 + <element implicit="true" name="customize" optional="true"/>
1.429 + <sequential>
1.430 + <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.431 + <customize/>
1.432 + </j2seproject3:junit-debug>
1.433 + </sequential>
1.434 + </macrodef>
1.435 + </target>
1.436 + <target if="${testng.available}" name="-init-macrodef-testng-debug">
1.437 + <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.438 + <attribute default="${main.class}" name="testClass"/>
1.439 + <attribute default="" name="testMethod"/>
1.440 + <element name="customize2" optional="true"/>
1.441 + <sequential>
1.442 + <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
1.443 + <isset property="test.method"/>
1.444 + </condition>
1.445 + <condition else="-suitename rozsirene-atributy-jedit -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
1.446 + <matches pattern=".*\.xml" string="@{testClass}"/>
1.447 + </condition>
1.448 + <delete dir="${build.test.results.dir}" quiet="true"/>
1.449 + <mkdir dir="${build.test.results.dir}"/>
1.450 + <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
1.451 + <customize>
1.452 + <customize2/>
1.453 + <jvmarg value="-ea"/>
1.454 + <arg line="${testng.debug.mode}"/>
1.455 + <arg line="-d ${build.test.results.dir}"/>
1.456 + <arg line="-listener org.testng.reporters.VerboseReporter"/>
1.457 + <arg line="${testng.cmd.args}"/>
1.458 + </customize>
1.459 + </j2seproject3:debug>
1.460 + </sequential>
1.461 + </macrodef>
1.462 + </target>
1.463 + <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
1.464 + <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
1.465 + <attribute default="${main.class}" name="testClass"/>
1.466 + <attribute default="" name="testMethod"/>
1.467 + <element implicit="true" name="customize2" optional="true"/>
1.468 + <sequential>
1.469 + <j2seproject3:testng-debug testClass="@{testClass}" testMethod="@{testMethod}">
1.470 + <customize2/>
1.471 + </j2seproject3:testng-debug>
1.472 + </sequential>
1.473 + </macrodef>
1.474 + </target>
1.475 + <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
1.476 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.477 + <attribute default="${includes}" name="includes"/>
1.478 + <attribute default="${excludes}" name="excludes"/>
1.479 + <attribute default="**" name="testincludes"/>
1.480 + <attribute default="" name="testmethods"/>
1.481 + <attribute default="${main.class}" name="testClass"/>
1.482 + <attribute default="" name="testMethod"/>
1.483 + <sequential>
1.484 + <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
1.485 + <customize>
1.486 + <classpath>
1.487 + <path path="${run.test.classpath}"/>
1.488 + </classpath>
1.489 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.490 + <jvmarg line="${run.jvmargs}"/>
1.491 + <jvmarg line="${run.jvmargs.ide}"/>
1.492 + </customize>
1.493 + </j2seproject3:test-debug-impl>
1.494 + </sequential>
1.495 + </macrodef>
1.496 + </target>
1.497 + <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
1.498 + <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.499 + <attribute default="${includes}" name="includes"/>
1.500 + <attribute default="${excludes}" name="excludes"/>
1.501 + <attribute default="**" name="testincludes"/>
1.502 + <attribute default="" name="testmethods"/>
1.503 + <attribute default="${main.class}" name="testClass"/>
1.504 + <attribute default="" name="testMethod"/>
1.505 + <sequential>
1.506 + <j2seproject3:testng-debug-impl testClass="@{testClass}" testMethod="@{testMethod}">
1.507 + <customize2>
1.508 + <syspropertyset>
1.509 + <propertyref prefix="test-sys-prop."/>
1.510 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.511 + </syspropertyset>
1.512 + </customize2>
1.513 + </j2seproject3:testng-debug-impl>
1.514 + </sequential>
1.515 + </macrodef>
1.516 + </target>
1.517 + <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
1.518 + <!--
1.519 + pre NB7.2 profiling section; consider it deprecated
1.520 + -->
1.521 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
1.522 + <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
1.523 <!-- Empty placeholder for easier customization. -->
1.524 <!-- You can override this target in the ../build.xml file. -->
1.525 </target>
1.526 - <target name="-profile-post-init">
1.527 + <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
1.528 <!-- Empty placeholder for easier customization. -->
1.529 <!-- You can override this target in the ../build.xml file. -->
1.530 </target>
1.531 - <target name="-profile-init-macrodef-profile">
1.532 + <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
1.533 <macrodef name="resolve">
1.534 <attribute name="name"/>
1.535 <attribute name="value"/>
1.536 @@ -384,7 +700,7 @@
1.537 <sequential>
1.538 <property environment="env"/>
1.539 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
1.540 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
1.541 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
1.542 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.543 <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.544 <jvmarg line="${profiler.info.jvmargs}"/>
1.545 @@ -402,10 +718,13 @@
1.546 </sequential>
1.547 </macrodef>
1.548 </target>
1.549 - <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
1.550 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
1.551 <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
1.552 <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
1.553 </target>
1.554 + <!--
1.555 + end of pre NB7.2 profiling section
1.556 + -->
1.557 <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
1.558 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
1.559 <attribute default="${main.class}" name="name"/>
1.560 @@ -456,13 +775,14 @@
1.561 <attribute default="${debug.classpath}" name="classpath"/>
1.562 <element name="customize" optional="true"/>
1.563 <sequential>
1.564 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.565 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.566 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.567 <jvmarg line="${debug-args-line}"/>
1.568 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.569 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.570 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.571 <jvmarg line="${run.jvmargs}"/>
1.572 + <jvmarg line="${run.jvmargs.ide}"/>
1.573 <classpath>
1.574 <path path="@{classpath}"/>
1.575 </classpath>
1.576 @@ -479,13 +799,15 @@
1.577 <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.578 <attribute default="${main.class}" name="classname"/>
1.579 <attribute default="${run.classpath}" name="classpath"/>
1.580 + <attribute default="jvm" name="jvm"/>
1.581 <element name="customize" optional="true"/>
1.582 <sequential>
1.583 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.584 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.585 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.586 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.587 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.588 <jvmarg line="${run.jvmargs}"/>
1.589 + <jvmarg line="${run.jvmargs.ide}"/>
1.590 <classpath>
1.591 <path path="@{classpath}"/>
1.592 </classpath>
1.593 @@ -512,12 +834,15 @@
1.594 <path path="${run.classpath.without.build.classes.dir}"/>
1.595 <chainedmapper>
1.596 <flattenmapper/>
1.597 + <filtermapper>
1.598 + <replacestring from=" " to="%20"/>
1.599 + </filtermapper>
1.600 <globmapper from="*" to="lib/*"/>
1.601 </chainedmapper>
1.602 </pathconvert>
1.603 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.604 - <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}">
1.605 - <fileset dir="${build.classes.dir}"/>
1.606 + <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}">
1.607 + <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.608 <manifest>
1.609 <attribute name="Class-Path" value="${jar.classpath}"/>
1.610 <customize/>
1.611 @@ -528,8 +853,8 @@
1.612 </target>
1.613 <target name="-init-presetdef-jar">
1.614 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
1.615 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
1.616 - <j2seproject1:fileset dir="${build.classes.dir}"/>
1.617 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
1.618 + <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.619 </jar>
1.620 </presetdef>
1.621 </target>
1.622 @@ -557,7 +882,7 @@
1.623 <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
1.624 <property name="ap.cmd.line.internal" value=""/>
1.625 </target>
1.626 - <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"/>
1.627 + <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"/>
1.628 <!--
1.629 ===================
1.630 COMPILATION SECTION
1.631 @@ -584,6 +909,7 @@
1.632 <param location="${project.rozsirene-atributy}/build.xml" name="call.script"/>
1.633 <param name="call.target" value="jar"/>
1.634 <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
1.635 + <param name="transfer.not.archive.disabled" value="true"/>
1.636 </antcall>
1.637 </target>
1.638 <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
1.639 @@ -617,7 +943,7 @@
1.640 <target if="has.persistence.xml" name="-copy-persistence-xml">
1.641 <mkdir dir="${build.classes.dir}/META-INF"/>
1.642 <copy todir="${build.classes.dir}/META-INF">
1.643 - <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
1.644 + <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
1.645 </copy>
1.646 </target>
1.647 <target name="-post-compile">
1.648 @@ -652,65 +978,67 @@
1.649 <!-- Empty placeholder for easier customization. -->
1.650 <!-- You can override this target in the ../build.xml file. -->
1.651 </target>
1.652 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
1.653 - <j2seproject1:jar/>
1.654 + <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
1.655 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.656 + <touch file="${tmp.manifest.file}" verbose="false"/>
1.657 </target>
1.658 - <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">
1.659 - <j2seproject1:jar manifest="${manifest.file}"/>
1.660 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
1.661 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.662 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
1.663 </target>
1.664 - <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">
1.665 - <j2seproject1:jar manifest="${manifest.file}">
1.666 - <j2seproject1:manifest>
1.667 - <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
1.668 - </j2seproject1:manifest>
1.669 - </j2seproject1:jar>
1.670 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1.671 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.672 + <attribute name="Main-Class" value="${main.class}"/>
1.673 + </manifest>
1.674 + </target>
1.675 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1.676 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.677 + <attribute name="Profile" value="${javac.profile}"/>
1.678 + </manifest>
1.679 + </target>
1.680 + <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
1.681 + <basename file="${application.splash}" property="splashscreen.basename"/>
1.682 + <mkdir dir="${build.classes.dir}/META-INF"/>
1.683 + <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1.684 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.685 + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
1.686 + </manifest>
1.687 + </target>
1.688 + <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" if="do.mkdist" name="-do-jar-copylibs">
1.689 + <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
1.690 <echo level="info">To run this application from the command line without Ant, try:</echo>
1.691 + <property location="${dist.jar}" name="dist.jar.resolved"/>
1.692 + <echo level="info">java -jar "${dist.jar.resolved}"</echo>
1.693 + </target>
1.694 + <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" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
1.695 + <j2seproject1:jar manifest="${tmp.manifest.file}"/>
1.696 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.697 <property location="${dist.jar}" name="dist.jar.resolved"/>
1.698 <pathconvert property="run.classpath.with.dist.jar">
1.699 <path path="${run.classpath}"/>
1.700 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.701 </pathconvert>
1.702 - <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1.703 + <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
1.704 + <isset property="main.class.available"/>
1.705 + </condition>
1.706 + <condition else="debug" property="jar.usage.level" value="info">
1.707 + <isset property="main.class.available"/>
1.708 + </condition>
1.709 + <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
1.710 </target>
1.711 - <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
1.712 - <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.713 - <touch file="${tmp.manifest.file}" verbose="false"/>
1.714 - </target>
1.715 - <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
1.716 - <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.717 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
1.718 - </target>
1.719 - <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">
1.720 - <manifest file="${tmp.manifest.file}" mode="update">
1.721 - <attribute name="Main-Class" value="${main.class}"/>
1.722 - </manifest>
1.723 - </target>
1.724 - <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">
1.725 - <basename file="${application.splash}" property="splashscreen.basename"/>
1.726 - <mkdir dir="${build.classes.dir}/META-INF"/>
1.727 - <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1.728 - <manifest file="${tmp.manifest.file}" mode="update">
1.729 - <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
1.730 - </manifest>
1.731 - </target>
1.732 - <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">
1.733 - <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
1.734 - <echo level="info">To run this application from the command line without Ant, try:</echo>
1.735 - <property location="${dist.jar}" name="dist.jar.resolved"/>
1.736 - <echo level="info">java -jar "${dist.jar.resolved}"</echo>
1.737 - </target>
1.738 - <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
1.739 + <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
1.740 <delete>
1.741 <fileset file="${tmp.manifest.file}"/>
1.742 </delete>
1.743 </target>
1.744 - <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"/>
1.745 + <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"/>
1.746 + <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"/>
1.747 <target name="-post-jar">
1.748 <!-- Empty placeholder for easier customization. -->
1.749 <!-- You can override this target in the ../build.xml file. -->
1.750 </target>
1.751 - <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"/>
1.752 + <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
1.753 + <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
1.754 <!--
1.755 =================
1.756 EXECUTION SECTION
1.757 @@ -780,7 +1108,11 @@
1.758 PROFILING SECTION
1.759 =================
1.760 -->
1.761 - <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
1.762 + <!--
1.763 + pre NB7.2 profiler integration
1.764 + -->
1.765 + <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
1.766 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.767 <nbprofiledirect>
1.768 <classpath>
1.769 <path path="${run.classpath}"/>
1.770 @@ -788,8 +1120,9 @@
1.771 </nbprofiledirect>
1.772 <profile/>
1.773 </target>
1.774 - <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
1.775 + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
1.776 <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
1.777 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.778 <nbprofiledirect>
1.779 <classpath>
1.780 <path path="${run.classpath}"/>
1.781 @@ -797,12 +1130,8 @@
1.782 </nbprofiledirect>
1.783 <profile classname="${profile.class}"/>
1.784 </target>
1.785 - <!--
1.786 - =========================
1.787 - APPLET PROFILING SECTION
1.788 - =========================
1.789 - -->
1.790 - <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
1.791 + <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
1.792 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.793 <nbprofiledirect>
1.794 <classpath>
1.795 <path path="${run.classpath}"/>
1.796 @@ -814,12 +1143,8 @@
1.797 </customize>
1.798 </profile>
1.799 </target>
1.800 - <!--
1.801 - =========================
1.802 - TESTS PROFILING SECTION
1.803 - =========================
1.804 - -->
1.805 - <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
1.806 + <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
1.807 + <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
1.808 <nbprofiledirect>
1.809 <classpath>
1.810 <path path="${run.test.classpath}"/>
1.811 @@ -842,6 +1167,42 @@
1.812 </junit>
1.813 </target>
1.814 <!--
1.815 + end of pre NB72 profiling section
1.816 + -->
1.817 + <target if="netbeans.home" name="-profile-check">
1.818 + <condition property="profiler.configured">
1.819 + <or>
1.820 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
1.821 + <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
1.822 + </or>
1.823 + </condition>
1.824 + </target>
1.825 + <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
1.826 + <startprofiler/>
1.827 + <antcall target="run"/>
1.828 + </target>
1.829 + <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">
1.830 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.831 + <startprofiler/>
1.832 + <antcall target="run-single"/>
1.833 + </target>
1.834 + <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
1.835 + <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
1.836 + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1.837 + <startprofiler/>
1.838 + <antcall target="test-single"/>
1.839 + </target>
1.840 + <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
1.841 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.842 + <startprofiler/>
1.843 + <antcall target="run-test-with-main"/>
1.844 + </target>
1.845 + <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
1.846 + <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1.847 + <startprofiler/>
1.848 + <antcall target="run-applet"/>
1.849 + </target>
1.850 + <!--
1.851 ===============
1.852 JAVADOC SECTION
1.853 ===============
1.854 @@ -856,11 +1217,14 @@
1.855 </not>
1.856 </and>
1.857 </condition>
1.858 - <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}">
1.859 + <condition else="" property="bug5101868workaround" value="*.java">
1.860 + <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
1.861 + </condition>
1.862 + <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}">
1.863 <classpath>
1.864 <path path="${javac.classpath}"/>
1.865 </classpath>
1.866 - <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
1.867 + <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
1.868 <filename name="**/*.java"/>
1.869 </fileset>
1.870 <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
1.871 @@ -884,7 +1248,7 @@
1.872 <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
1.873 <!--
1.874 =========================
1.875 - JUNIT COMPILATION SECTION
1.876 + TEST COMPILATION SECTION
1.877 =========================
1.878 -->
1.879 <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
1.880 @@ -927,14 +1291,14 @@
1.881 <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
1.882 <!--
1.883 =======================
1.884 - JUNIT EXECUTION SECTION
1.885 + TEST EXECUTION SECTION
1.886 =======================
1.887 -->
1.888 <target depends="init" if="have.tests" name="-pre-test-run">
1.889 <mkdir dir="${build.test.results.dir}"/>
1.890 </target>
1.891 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.892 - <j2seproject3:junit testincludes="**/*Test.java"/>
1.893 + <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
1.894 </target>
1.895 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.896 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.897 @@ -947,39 +1311,40 @@
1.898 </target>
1.899 <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1.900 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1.901 - <j2seproject3:junit excludes="" includes="${test.includes}"/>
1.902 + <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
1.903 </target>
1.904 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
1.905 <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.906 </target>
1.907 <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"/>
1.908 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
1.909 + <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
1.910 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
1.911 + <j2seproject3:test excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
1.912 + </target>
1.913 + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
1.914 + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
1.915 + </target>
1.916 + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
1.917 <!--
1.918 =======================
1.919 - JUNIT DEBUGGING SECTION
1.920 + TEST DEBUGGING SECTION
1.921 =======================
1.922 -->
1.923 - <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
1.924 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
1.925 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1.926 - <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
1.927 - <delete file="${test.report.file}"/>
1.928 - <mkdir dir="${build.test.results.dir}"/>
1.929 - <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}">
1.930 - <customize>
1.931 - <syspropertyset>
1.932 - <propertyref prefix="test-sys-prop."/>
1.933 - <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.934 - </syspropertyset>
1.935 - <arg value="${test.class}"/>
1.936 - <arg value="showoutput=true"/>
1.937 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
1.938 - <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
1.939 - </customize>
1.940 - </j2seproject3:debug>
1.941 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
1.942 + </target>
1.943 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
1.944 + <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1.945 + <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
1.946 + <j2seproject3:test-debug excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
1.947 </target>
1.948 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
1.949 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
1.950 </target>
1.951 <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.952 + <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
1.953 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
1.954 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
1.955 </target>
1.956 @@ -1037,6 +1402,7 @@
1.957 <param location="${project.rozsirene-atributy}/build.xml" name="call.script"/>
1.958 <param name="call.target" value="clean"/>
1.959 <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
1.960 + <param name="transfer.not.archive.disabled" value="true"/>
1.961 </antcall>
1.962 </target>
1.963 <target depends="init" name="-do-clean">
1.964 @@ -1051,9 +1417,12 @@
1.965 <target name="-check-call-dep">
1.966 <property file="${call.built.properties}" prefix="already.built."/>
1.967 <condition property="should.call.dep">
1.968 - <not>
1.969 - <isset property="already.built.${call.subproject}"/>
1.970 - </not>
1.971 + <and>
1.972 + <not>
1.973 + <isset property="already.built.${call.subproject}"/>
1.974 + </not>
1.975 + <available file="${call.script}"/>
1.976 + </and>
1.977 </condition>
1.978 </target>
1.979 <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">