1.1 --- a/other/signatures/build.xml Thu Jul 21 11:15:37 2011 -0400
1.2 +++ b/other/signatures/build.xml Thu Jul 21 11:16:26 2011 -0400
1.3 @@ -2,6 +2,11 @@
1.4 <!-- You may freely edit this file. See commented blocks below for -->
1.5 <!-- some examples of how to customize the build. -->
1.6 <!-- (If you delete it and reopen the project it will be recreated.) -->
1.7 +<!-- By default, only the Clean and Build commands use this build script. -->
1.8 +<!-- Commands such as Run, Debug, and Test only use this build script if -->
1.9 +<!-- the Compile on Save feature is turned off for the project. -->
1.10 +<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
1.11 +<!-- in the project's Project Properties dialog box.-->
1.12 <project name="signatures" default="default" basedir=".">
1.13 <description>Builds, tests, and runs the project signatures.</description>
1.14 <import file="nbproject/build-impl.xml"/>
2.1 --- a/other/signatures/nbproject/build-impl.xml Thu Jul 21 11:15:37 2011 -0400
2.2 +++ b/other/signatures/nbproject/build-impl.xml Thu Jul 21 11:16:26 2011 -0400
2.3 @@ -19,7 +19,14 @@
2.4 - cleanup
2.5
2.6 -->
2.7 -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" 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="signatures-impl">
2.8 +<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="signatures-impl">
2.9 + <fail message="Please build using Ant 1.8.0 or higher.">
2.10 + <condition>
2.11 + <not>
2.12 + <antversion atleast="1.8.0"/>
2.13 + </not>
2.14 + </condition>
2.15 + </fail>
2.16 <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
2.17 <!--
2.18 ======================
2.19 @@ -48,21 +55,84 @@
2.20 </target>
2.21 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
2.22 <available file="${manifest.file}" property="manifest.available"/>
2.23 - <condition property="manifest.available+main.class">
2.24 + <condition property="splashscreen.available">
2.25 <and>
2.26 - <isset property="manifest.available"/>
2.27 + <not>
2.28 + <equals arg1="${application.splash}" arg2="" trim="true"/>
2.29 + </not>
2.30 + <available file="${application.splash}"/>
2.31 + </and>
2.32 + </condition>
2.33 + <condition property="main.class.available">
2.34 + <and>
2.35 <isset property="main.class"/>
2.36 <not>
2.37 <equals arg1="${main.class}" arg2="" trim="true"/>
2.38 </not>
2.39 </and>
2.40 </condition>
2.41 + <condition property="manifest.available+main.class">
2.42 + <and>
2.43 + <isset property="manifest.available"/>
2.44 + <isset property="main.class.available"/>
2.45 + </and>
2.46 + </condition>
2.47 + <condition property="do.archive">
2.48 + <not>
2.49 + <istrue value="${jar.archive.disabled}"/>
2.50 + </not>
2.51 + </condition>
2.52 + <condition property="do.mkdist">
2.53 + <and>
2.54 + <isset property="do.archive"/>
2.55 + <isset property="libs.CopyLibs.classpath"/>
2.56 + <not>
2.57 + <istrue value="${mkdist.disabled}"/>
2.58 + </not>
2.59 + </and>
2.60 + </condition>
2.61 <condition property="manifest.available+main.class+mkdist.available">
2.62 <and>
2.63 <istrue value="${manifest.available+main.class}"/>
2.64 - <isset property="libs.CopyLibs.classpath"/>
2.65 + <isset property="do.mkdist"/>
2.66 </and>
2.67 </condition>
2.68 + <condition property="do.archive+manifest.available">
2.69 + <and>
2.70 + <isset property="manifest.available"/>
2.71 + <istrue value="${do.archive}"/>
2.72 + </and>
2.73 + </condition>
2.74 + <condition property="do.archive+main.class.available">
2.75 + <and>
2.76 + <isset property="main.class.available"/>
2.77 + <istrue value="${do.archive}"/>
2.78 + </and>
2.79 + </condition>
2.80 + <condition property="do.archive+splashscreen.available">
2.81 + <and>
2.82 + <isset property="splashscreen.available"/>
2.83 + <istrue value="${do.archive}"/>
2.84 + </and>
2.85 + </condition>
2.86 + <condition property="do.archive+manifest.available+main.class">
2.87 + <and>
2.88 + <istrue value="${manifest.available+main.class}"/>
2.89 + <istrue value="${do.archive}"/>
2.90 + </and>
2.91 + </condition>
2.92 + <condition property="manifest.available-mkdist.available">
2.93 + <or>
2.94 + <istrue value="${manifest.available}"/>
2.95 + <isset property="do.mkdist"/>
2.96 + </or>
2.97 + </condition>
2.98 + <condition property="manifest.available+main.class-mkdist.available">
2.99 + <or>
2.100 + <istrue value="${manifest.available+main.class}"/>
2.101 + <isset property="do.mkdist"/>
2.102 + </or>
2.103 + </condition>
2.104 <condition property="have.tests">
2.105 <or>
2.106 <available file="${test.src.dir}"/>
2.107 @@ -97,6 +167,7 @@
2.108 <property name="javadoc.preview" value="true"/>
2.109 <property name="application.args" value=""/>
2.110 <property name="source.encoding" value="${file.encoding}"/>
2.111 + <property name="runtime.encoding" value="${source.encoding}"/>
2.112 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
2.113 <and>
2.114 <isset property="javadoc.encoding"/>
2.115 @@ -112,12 +183,23 @@
2.116 <condition property="do.depend.true">
2.117 <istrue value="${do.depend}"/>
2.118 </condition>
2.119 - <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
2.120 + <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
2.121 + <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
2.122 + <length length="0" string="${endorsed.classpath}" when="greater"/>
2.123 + </condition>
2.124 + <condition else="false" property="jdkBug6558476">
2.125 <and>
2.126 - <isset property="jaxws.endorsed.dir"/>
2.127 - <available file="nbproject/jaxws-build.xml"/>
2.128 + <matches pattern="1\.[56]" string="${java.specification.version}"/>
2.129 + <not>
2.130 + <os family="unix"/>
2.131 + </not>
2.132 </and>
2.133 </condition>
2.134 + <property name="javac.fork" value="${jdkBug6558476}"/>
2.135 + <property name="jar.index" value="false"/>
2.136 + <property name="jar.index.metainf" value="${jar.index}"/>
2.137 + <property name="copylibs.rebase" value="true"/>
2.138 + <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>
2.139 </target>
2.140 <target name="-post-init">
2.141 <!-- Empty placeholder for easier customization. -->
2.142 @@ -144,26 +226,79 @@
2.143 </sequential>
2.144 </macrodef>
2.145 </target>
2.146 - <target name="-init-macrodef-javac">
2.147 + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
2.148 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
2.149 <attribute default="${src.dir}" name="srcdir"/>
2.150 <attribute default="${build.classes.dir}" name="destdir"/>
2.151 <attribute default="${javac.classpath}" name="classpath"/>
2.152 + <attribute default="${javac.processorpath}" name="processorpath"/>
2.153 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
2.154 <attribute default="${includes}" name="includes"/>
2.155 <attribute default="${excludes}" name="excludes"/>
2.156 <attribute default="${javac.debug}" name="debug"/>
2.157 - <attribute default="" name="sourcepath"/>
2.158 + <attribute default="${empty.dir}" name="sourcepath"/>
2.159 + <attribute default="${empty.dir}" name="gensrcdir"/>
2.160 <element name="customize" optional="true"/>
2.161 <sequential>
2.162 - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
2.163 + <property location="${build.dir}/empty" name="empty.dir"/>
2.164 + <mkdir dir="${empty.dir}"/>
2.165 + <mkdir dir="@{apgeneratedsrcdir}"/>
2.166 + <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.167 + <src>
2.168 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
2.169 + <include name="*"/>
2.170 + </dirset>
2.171 + </src>
2.172 <classpath>
2.173 <path path="@{classpath}"/>
2.174 </classpath>
2.175 - <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
2.176 + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
2.177 + <compilerarg line="${javac.compilerargs}"/>
2.178 + <compilerarg value="-processorpath"/>
2.179 + <compilerarg path="@{processorpath}:${empty.dir}"/>
2.180 + <compilerarg line="${ap.processors.internal}"/>
2.181 + <compilerarg line="${annotation.processing.processor.options}"/>
2.182 + <compilerarg value="-s"/>
2.183 + <compilerarg path="@{apgeneratedsrcdir}"/>
2.184 + <compilerarg line="${ap.proc.none.internal}"/>
2.185 <customize/>
2.186 </javac>
2.187 </sequential>
2.188 </macrodef>
2.189 + </target>
2.190 + <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
2.191 + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
2.192 + <attribute default="${src.dir}" name="srcdir"/>
2.193 + <attribute default="${build.classes.dir}" name="destdir"/>
2.194 + <attribute default="${javac.classpath}" name="classpath"/>
2.195 + <attribute default="${javac.processorpath}" name="processorpath"/>
2.196 + <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
2.197 + <attribute default="${includes}" name="includes"/>
2.198 + <attribute default="${excludes}" name="excludes"/>
2.199 + <attribute default="${javac.debug}" name="debug"/>
2.200 + <attribute default="${empty.dir}" name="sourcepath"/>
2.201 + <attribute default="${empty.dir}" name="gensrcdir"/>
2.202 + <element name="customize" optional="true"/>
2.203 + <sequential>
2.204 + <property location="${build.dir}/empty" name="empty.dir"/>
2.205 + <mkdir dir="${empty.dir}"/>
2.206 + <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.207 + <src>
2.208 + <dirset dir="@{gensrcdir}" erroronmissingdir="false">
2.209 + <include name="*"/>
2.210 + </dirset>
2.211 + </src>
2.212 + <classpath>
2.213 + <path path="@{classpath}"/>
2.214 + </classpath>
2.215 + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
2.216 + <compilerarg line="${javac.compilerargs}"/>
2.217 + <customize/>
2.218 + </javac>
2.219 + </sequential>
2.220 + </macrodef>
2.221 + </target>
2.222 + <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
2.223 <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
2.224 <attribute default="${src.dir}" name="srcdir"/>
2.225 <attribute default="${build.classes.dir}" name="destdir"/>
2.226 @@ -180,14 +315,19 @@
2.227 <attribute default="${build.classes.dir}" name="destdir"/>
2.228 <sequential>
2.229 <fail unless="javac.includes">Must set javac.includes</fail>
2.230 - <pathconvert pathsep="," property="javac.includes.binary">
2.231 + <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
2.232 <path>
2.233 <filelist dir="@{destdir}" files="${javac.includes}"/>
2.234 </path>
2.235 <globmapper from="*.java" to="*.class"/>
2.236 </pathconvert>
2.237 + <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
2.238 + <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
2.239 <delete>
2.240 - <files includes="${javac.includes.binary}"/>
2.241 + <files includesfile="${javac.includesfile.binary}"/>
2.242 + </delete>
2.243 + <delete>
2.244 + <fileset file="${javac.includesfile.binary}"/>
2.245 </delete>
2.246 </sequential>
2.247 </macrodef>
2.248 @@ -198,7 +338,8 @@
2.249 <attribute default="${excludes}" name="excludes"/>
2.250 <attribute default="**" name="testincludes"/>
2.251 <sequential>
2.252 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
2.253 + <property name="junit.forkmode" value="perTest"/>
2.254 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
2.255 <batchtest todir="${build.test.results.dir}">
2.256 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
2.257 <filename name="@{testincludes}"/>
2.258 @@ -213,18 +354,64 @@
2.259 </syspropertyset>
2.260 <formatter type="brief" usefile="false"/>
2.261 <formatter type="xml"/>
2.262 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.263 + <jvmarg value="-ea"/>
2.264 <jvmarg line="${run.jvmargs}"/>
2.265 </junit>
2.266 </sequential>
2.267 </macrodef>
2.268 </target>
2.269 - <target name="-init-macrodef-nbjpda">
2.270 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
2.271 + <target name="-profile-pre-init">
2.272 + <!-- Empty placeholder for easier customization. -->
2.273 + <!-- You can override this target in the ../build.xml file. -->
2.274 + </target>
2.275 + <target name="-profile-post-init">
2.276 + <!-- Empty placeholder for easier customization. -->
2.277 + <!-- You can override this target in the ../build.xml file. -->
2.278 + </target>
2.279 + <target name="-profile-init-macrodef-profile">
2.280 + <macrodef name="resolve">
2.281 + <attribute name="name"/>
2.282 + <attribute name="value"/>
2.283 + <sequential>
2.284 + <property name="@{name}" value="${env.@{value}}"/>
2.285 + </sequential>
2.286 + </macrodef>
2.287 + <macrodef name="profile">
2.288 + <attribute default="${main.class}" name="classname"/>
2.289 + <element name="customize" optional="true"/>
2.290 + <sequential>
2.291 + <property environment="env"/>
2.292 + <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
2.293 + <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
2.294 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
2.295 + <jvmarg line="${profiler.info.jvmargs}"/>
2.296 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
2.297 + <arg line="${application.args}"/>
2.298 + <classpath>
2.299 + <path path="${run.classpath}"/>
2.300 + </classpath>
2.301 + <syspropertyset>
2.302 + <propertyref prefix="run-sys-prop."/>
2.303 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
2.304 + </syspropertyset>
2.305 + <customize/>
2.306 + </java>
2.307 + </sequential>
2.308 + </macrodef>
2.309 + </target>
2.310 + <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" name="-profile-init-check">
2.311 + <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
2.312 + <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
2.313 + </target>
2.314 + <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
2.315 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
2.316 <attribute default="${main.class}" name="name"/>
2.317 <attribute default="${debug.classpath}" name="classpath"/>
2.318 <attribute default="" name="stopclassname"/>
2.319 <sequential>
2.320 - <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
2.321 + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
2.322 <classpath>
2.323 <path path="@{classpath}"/>
2.324 </classpath>
2.325 @@ -235,7 +422,9 @@
2.326 <attribute default="${build.classes.dir}" name="dir"/>
2.327 <sequential>
2.328 <nbjpdareload>
2.329 - <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
2.330 + <fileset dir="@{dir}" includes="${fix.classes}">
2.331 + <include name="${fix.includes}*.class"/>
2.332 + </fileset>
2.333 </nbjpdareload>
2.334 </sequential>
2.335 </macrodef>
2.336 @@ -253,6 +442,12 @@
2.337 <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
2.338 <istrue value="${have-jdk-older-than-1.4}"/>
2.339 </condition>
2.340 + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
2.341 + <os family="windows"/>
2.342 + </condition>
2.343 + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
2.344 + <isset property="debug.transport"/>
2.345 + </condition>
2.346 </target>
2.347 <target depends="-init-debug-args" name="-init-macrodef-debug">
2.348 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
2.349 @@ -261,8 +456,11 @@
2.350 <element name="customize" optional="true"/>
2.351 <sequential>
2.352 <java classname="@{classname}" dir="${work.dir}" fork="true">
2.353 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.354 <jvmarg line="${debug-args-line}"/>
2.355 - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
2.356 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
2.357 + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
2.358 + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
2.359 <jvmarg line="${run.jvmargs}"/>
2.360 <classpath>
2.361 <path path="@{classpath}"/>
2.362 @@ -279,12 +477,16 @@
2.363 <target name="-init-macrodef-java">
2.364 <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
2.365 <attribute default="${main.class}" name="classname"/>
2.366 + <attribute default="${run.classpath}" name="classpath"/>
2.367 <element name="customize" optional="true"/>
2.368 <sequential>
2.369 <java classname="@{classname}" dir="${work.dir}" fork="true">
2.370 + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
2.371 + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
2.372 + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
2.373 <jvmarg line="${run.jvmargs}"/>
2.374 <classpath>
2.375 - <path path="${run.classpath}"/>
2.376 + <path path="@{classpath}"/>
2.377 </classpath>
2.378 <syspropertyset>
2.379 <propertyref prefix="run-sys-prop."/>
2.380 @@ -295,20 +497,94 @@
2.381 </sequential>
2.382 </macrodef>
2.383 </target>
2.384 + <target name="-init-macrodef-copylibs">
2.385 + <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
2.386 + <attribute default="${manifest.file}" name="manifest"/>
2.387 + <element name="customize" optional="true"/>
2.388 + <sequential>
2.389 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
2.390 + <pathconvert property="run.classpath.without.build.classes.dir">
2.391 + <path path="${run.classpath}"/>
2.392 + <map from="${build.classes.dir.resolved}" to=""/>
2.393 + </pathconvert>
2.394 + <pathconvert pathsep=" " property="jar.classpath">
2.395 + <path path="${run.classpath.without.build.classes.dir}"/>
2.396 + <chainedmapper>
2.397 + <flattenmapper/>
2.398 + <globmapper from="*" to="lib/*"/>
2.399 + </chainedmapper>
2.400 + </pathconvert>
2.401 + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
2.402 + <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.403 + <fileset dir="${build.classes.dir}"/>
2.404 + <manifest>
2.405 + <attribute name="Class-Path" value="${jar.classpath}"/>
2.406 + <customize/>
2.407 + </manifest>
2.408 + </copylibs>
2.409 + </sequential>
2.410 + </macrodef>
2.411 + </target>
2.412 <target name="-init-presetdef-jar">
2.413 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
2.414 - <jar compress="${jar.compress}" jarfile="${dist.jar}">
2.415 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
2.416 <j2seproject1:fileset dir="${build.classes.dir}"/>
2.417 </jar>
2.418 </presetdef>
2.419 </target>
2.420 - <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" name="init"/>
2.421 + <target name="-init-ap-cmdline-properties">
2.422 + <property name="annotation.processing.enabled" value="true"/>
2.423 + <property name="annotation.processing.processors.list" value=""/>
2.424 + <property name="annotation.processing.processor.options" value=""/>
2.425 + <property name="annotation.processing.run.all.processors" value="true"/>
2.426 + <property name="javac.processorpath" value="${javac.classpath}"/>
2.427 + <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
2.428 + <condition property="ap.supported.internal" value="true">
2.429 + <not>
2.430 + <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
2.431 + </not>
2.432 + </condition>
2.433 + </target>
2.434 + <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
2.435 + <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
2.436 + <isfalse value="${annotation.processing.run.all.processors}"/>
2.437 + </condition>
2.438 + <condition else="" property="ap.proc.none.internal" value="-proc:none">
2.439 + <isfalse value="${annotation.processing.enabled}"/>
2.440 + </condition>
2.441 + </target>
2.442 + <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
2.443 + <property name="ap.cmd.line.internal" value=""/>
2.444 + </target>
2.445 + <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.446 <!--
2.447 ===================
2.448 COMPILATION SECTION
2.449 ===================
2.450 -->
2.451 - <target depends="init" name="deps-jar" unless="no.deps"/>
2.452 + <target name="-deps-jar-init" unless="built-jar.properties">
2.453 + <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
2.454 + <delete file="${built-jar.properties}" quiet="true"/>
2.455 + </target>
2.456 + <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
2.457 + <echo level="warn" message="Cycle detected: signatures was already built"/>
2.458 + </target>
2.459 + <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
2.460 + <mkdir dir="${build.dir}"/>
2.461 + <touch file="${built-jar.properties}" verbose="false"/>
2.462 + <property file="${built-jar.properties}" prefix="already.built.jar."/>
2.463 + <antcall target="-warn-already-built-jar"/>
2.464 + <propertyfile file="${built-jar.properties}">
2.465 + <entry key="${basedir}" value=""/>
2.466 + </propertyfile>
2.467 + </target>
2.468 + <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
2.469 + <target depends="init" name="-check-automatic-build">
2.470 + <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
2.471 + </target>
2.472 + <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
2.473 + <antcall target="clean"/>
2.474 + </target>
2.475 <target depends="init,deps-jar" name="-pre-pre-compile">
2.476 <mkdir dir="${build.classes.dir}"/>
2.477 </target>
2.478 @@ -317,19 +593,30 @@
2.479 <!-- You can override this target in the ../build.xml file. -->
2.480 </target>
2.481 <target if="do.depend.true" name="-compile-depend">
2.482 - <j2seproject3:depend/>
2.483 + <pathconvert property="build.generated.subdirs">
2.484 + <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
2.485 + <include name="*"/>
2.486 + </dirset>
2.487 + </pathconvert>
2.488 + <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
2.489 </target>
2.490 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
2.491 - <j2seproject3:javac/>
2.492 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
2.493 + <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
2.494 <copy todir="${build.classes.dir}">
2.495 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
2.496 </copy>
2.497 </target>
2.498 + <target if="has.persistence.xml" name="-copy-persistence-xml">
2.499 + <mkdir dir="${build.classes.dir}/META-INF"/>
2.500 + <copy todir="${build.classes.dir}/META-INF">
2.501 + <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
2.502 + </copy>
2.503 + </target>
2.504 <target name="-post-compile">
2.505 <!-- Empty placeholder for easier customization. -->
2.506 <!-- You can override this target in the ../build.xml file. -->
2.507 </target>
2.508 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
2.509 + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
2.510 <target name="-pre-compile-single">
2.511 <!-- Empty placeholder for easier customization. -->
2.512 <!-- You can override this target in the ../build.xml file. -->
2.513 @@ -337,13 +624,13 @@
2.514 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
2.515 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
2.516 <j2seproject3:force-recompile/>
2.517 - <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
2.518 + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
2.519 </target>
2.520 <target name="-post-compile-single">
2.521 <!-- Empty placeholder for easier customization. -->
2.522 <!-- You can override this target in the ../build.xml file. -->
2.523 </target>
2.524 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
2.525 + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
2.526 <!--
2.527 ====================
2.528 JAR BUILDING SECTION
2.529 @@ -357,52 +644,60 @@
2.530 <!-- Empty placeholder for easier customization. -->
2.531 <!-- You can override this target in the ../build.xml file. -->
2.532 </target>
2.533 - <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
2.534 + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
2.535 <j2seproject1:jar/>
2.536 </target>
2.537 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
2.538 + <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.539 <j2seproject1:jar manifest="${manifest.file}"/>
2.540 </target>
2.541 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
2.542 + <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.543 <j2seproject1:jar manifest="${manifest.file}">
2.544 <j2seproject1:manifest>
2.545 <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
2.546 </j2seproject1:manifest>
2.547 </j2seproject1:jar>
2.548 - <echo>To run this application from the command line without Ant, try:</echo>
2.549 + <echo level="info">To run this application from the command line without Ant, try:</echo>
2.550 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
2.551 <property location="${dist.jar}" name="dist.jar.resolved"/>
2.552 <pathconvert property="run.classpath.with.dist.jar">
2.553 <path path="${run.classpath}"/>
2.554 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
2.555 </pathconvert>
2.556 - <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
2.557 + <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
2.558 </target>
2.559 - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
2.560 - <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
2.561 - <pathconvert property="run.classpath.without.build.classes.dir">
2.562 - <path path="${run.classpath}"/>
2.563 - <map from="${build.classes.dir.resolved}" to=""/>
2.564 - </pathconvert>
2.565 - <pathconvert pathsep=" " property="jar.classpath">
2.566 - <path path="${run.classpath.without.build.classes.dir}"/>
2.567 - <chainedmapper>
2.568 - <flattenmapper/>
2.569 - <globmapper from="*" to="lib/*"/>
2.570 - </chainedmapper>
2.571 - </pathconvert>
2.572 - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
2.573 - <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
2.574 - <fileset dir="${build.classes.dir}"/>
2.575 - <manifest>
2.576 - <attribute name="Main-Class" value="${main.class}"/>
2.577 - <attribute name="Class-Path" value="${jar.classpath}"/>
2.578 - </manifest>
2.579 - </copylibs>
2.580 - <echo>To run this application from the command line without Ant, try:</echo>
2.581 + <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
2.582 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
2.583 + <touch file="${tmp.manifest.file}" verbose="false"/>
2.584 + </target>
2.585 + <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
2.586 + <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
2.587 + <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
2.588 + </target>
2.589 + <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.590 + <manifest file="${tmp.manifest.file}" mode="update">
2.591 + <attribute name="Main-Class" value="${main.class}"/>
2.592 + </manifest>
2.593 + </target>
2.594 + <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.595 + <basename file="${application.splash}" property="splashscreen.basename"/>
2.596 + <mkdir dir="${build.classes.dir}/META-INF"/>
2.597 + <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
2.598 + <manifest file="${tmp.manifest.file}" mode="update">
2.599 + <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
2.600 + </manifest>
2.601 + </target>
2.602 + <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.603 + <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
2.604 + <echo level="info">To run this application from the command line without Ant, try:</echo>
2.605 <property location="${dist.jar}" name="dist.jar.resolved"/>
2.606 - <echo>java -jar "${dist.jar.resolved}"</echo>
2.607 + <echo level="info">java -jar "${dist.jar.resolved}"</echo>
2.608 </target>
2.609 + <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
2.610 + <delete>
2.611 + <fileset file="${tmp.manifest.file}"/>
2.612 + </delete>
2.613 + </target>
2.614 + <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.615 <target name="-post-jar">
2.616 <!-- Empty placeholder for easier customization. -->
2.617 <!-- You can override this target in the ../build.xml file. -->
2.618 @@ -423,10 +718,14 @@
2.619 <target name="-do-not-recompile">
2.620 <property name="javac.includes.binary" value=""/>
2.621 </target>
2.622 - <target depends="init,-do-not-recompile,compile-single" name="run-single">
2.623 + <target depends="init,compile-single" name="run-single">
2.624 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
2.625 <j2seproject1:java classname="${run.class}"/>
2.626 </target>
2.627 + <target depends="init,compile-test-single" name="run-test-with-main">
2.628 + <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
2.629 + <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
2.630 + </target>
2.631 <!--
2.632 =================
2.633 DEBUGGING SECTION
2.634 @@ -435,6 +734,9 @@
2.635 <target depends="init" if="netbeans.home" name="-debug-start-debugger">
2.636 <j2seproject1:nbjpdastart name="${debug.class}"/>
2.637 </target>
2.638 + <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
2.639 + <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
2.640 + </target>
2.641 <target depends="init,compile" name="-debug-start-debuggee">
2.642 <j2seproject3:debug>
2.643 <customize>
2.644 @@ -451,7 +753,12 @@
2.645 <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
2.646 <j2seproject3:debug classname="${debug.class}"/>
2.647 </target>
2.648 - <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
2.649 + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
2.650 + <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
2.651 + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
2.652 + <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
2.653 + </target>
2.654 + <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
2.655 <target depends="init" name="-pre-debug-fix">
2.656 <fail unless="fix.includes">Must set fix.includes</fail>
2.657 <property name="javac.includes" value="${fix.includes}.java"/>
2.658 @@ -461,20 +768,98 @@
2.659 </target>
2.660 <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
2.661 <!--
2.662 + =================
2.663 + PROFILING SECTION
2.664 + =================
2.665 + -->
2.666 + <target depends="profile-init,compile" description="Profile a project in the IDE." if="netbeans.home" name="profile">
2.667 + <nbprofiledirect>
2.668 + <classpath>
2.669 + <path path="${run.classpath}"/>
2.670 + </classpath>
2.671 + </nbprofiledirect>
2.672 + <profile/>
2.673 + </target>
2.674 + <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="netbeans.home" name="profile-single">
2.675 + <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
2.676 + <nbprofiledirect>
2.677 + <classpath>
2.678 + <path path="${run.classpath}"/>
2.679 + </classpath>
2.680 + </nbprofiledirect>
2.681 + <profile classname="${profile.class}"/>
2.682 + </target>
2.683 + <!--
2.684 + =========================
2.685 + APPLET PROFILING SECTION
2.686 + =========================
2.687 + -->
2.688 + <target depends="profile-init,compile-single" if="netbeans.home" name="profile-applet">
2.689 + <nbprofiledirect>
2.690 + <classpath>
2.691 + <path path="${run.classpath}"/>
2.692 + </classpath>
2.693 + </nbprofiledirect>
2.694 + <profile classname="sun.applet.AppletViewer">
2.695 + <customize>
2.696 + <arg value="${applet.url}"/>
2.697 + </customize>
2.698 + </profile>
2.699 + </target>
2.700 + <!--
2.701 + =========================
2.702 + TESTS PROFILING SECTION
2.703 + =========================
2.704 + -->
2.705 + <target depends="profile-init,compile-test-single" if="netbeans.home" name="profile-test-single">
2.706 + <nbprofiledirect>
2.707 + <classpath>
2.708 + <path path="${run.test.classpath}"/>
2.709 + </classpath>
2.710 + </nbprofiledirect>
2.711 + <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
2.712 + <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
2.713 + <jvmarg value="${profiler.info.jvmargs.agent}"/>
2.714 + <jvmarg line="${profiler.info.jvmargs}"/>
2.715 + <test name="${profile.class}"/>
2.716 + <classpath>
2.717 + <path path="${run.test.classpath}"/>
2.718 + </classpath>
2.719 + <syspropertyset>
2.720 + <propertyref prefix="test-sys-prop."/>
2.721 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
2.722 + </syspropertyset>
2.723 + <formatter type="brief" usefile="false"/>
2.724 + <formatter type="xml"/>
2.725 + </junit>
2.726 + </target>
2.727 + <!--
2.728 ===============
2.729 JAVADOC SECTION
2.730 ===============
2.731 -->
2.732 - <target depends="init" name="-javadoc-build">
2.733 + <target depends="init" if="have.sources" name="-javadoc-build">
2.734 <mkdir dir="${dist.javadoc.dir}"/>
2.735 <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.736 <classpath>
2.737 <path path="${javac.classpath}"/>
2.738 </classpath>
2.739 - <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
2.740 + <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
2.741 <filename name="**/*.java"/>
2.742 </fileset>
2.743 + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
2.744 + <include name="**/*.java"/>
2.745 + <exclude name="*.java"/>
2.746 + </fileset>
2.747 </javadoc>
2.748 + <copy todir="${dist.javadoc.dir}">
2.749 + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
2.750 + <filename name="**/doc-files/**"/>
2.751 + </fileset>
2.752 + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
2.753 + <include name="**/doc-files/**"/>
2.754 + </fileset>
2.755 + </copy>
2.756 </target>
2.757 <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
2.758 <nbbrowse file="${dist.javadoc.dir}/index.html"/>
2.759 @@ -495,8 +880,8 @@
2.760 <target if="do.depend.true" name="-compile-test-depend">
2.761 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
2.762 </target>
2.763 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
2.764 - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
2.765 + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
2.766 + <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.767 <copy todir="${build.test.classes.dir}">
2.768 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
2.769 </copy>
2.770 @@ -510,10 +895,10 @@
2.771 <!-- Empty placeholder for easier customization. -->
2.772 <!-- You can override this target in the ../build.xml file. -->
2.773 </target>
2.774 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
2.775 + <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
2.776 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
2.777 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
2.778 - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
2.779 + <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.780 <copy todir="${build.test.classes.dir}">
2.781 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
2.782 </copy>
2.783 @@ -535,7 +920,7 @@
2.784 <j2seproject3:junit testincludes="**/*Test.java"/>
2.785 </target>
2.786 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
2.787 - <fail if="tests.failed">Some tests failed; see details above.</fail>
2.788 + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
2.789 </target>
2.790 <target depends="init" if="have.tests" name="test-report"/>
2.791 <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
2.792 @@ -548,9 +933,9 @@
2.793 <j2seproject3:junit excludes="" includes="${test.includes}"/>
2.794 </target>
2.795 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
2.796 - <fail if="tests.failed">Some tests failed; see details above.</fail>
2.797 + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
2.798 </target>
2.799 - <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
2.800 + <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.801 <!--
2.802 =======================
2.803 JUNIT DEBUGGING SECTION
2.804 @@ -577,7 +962,7 @@
2.805 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
2.806 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
2.807 </target>
2.808 - <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
2.809 + <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
2.810 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
2.811 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
2.812 </target>
2.813 @@ -614,14 +999,45 @@
2.814 CLEANUP SECTION
2.815 ===============
2.816 -->
2.817 - <target depends="init" name="deps-clean" unless="no.deps"/>
2.818 + <target name="-deps-clean-init" unless="built-clean.properties">
2.819 + <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
2.820 + <delete file="${built-clean.properties}" quiet="true"/>
2.821 + </target>
2.822 + <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
2.823 + <echo level="warn" message="Cycle detected: signatures was already built"/>
2.824 + </target>
2.825 + <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
2.826 + <mkdir dir="${build.dir}"/>
2.827 + <touch file="${built-clean.properties}" verbose="false"/>
2.828 + <property file="${built-clean.properties}" prefix="already.built.clean."/>
2.829 + <antcall target="-warn-already-built-clean"/>
2.830 + <propertyfile file="${built-clean.properties}">
2.831 + <entry key="${basedir}" value=""/>
2.832 + </propertyfile>
2.833 + </target>
2.834 <target depends="init" name="-do-clean">
2.835 <delete dir="${build.dir}"/>
2.836 - <delete dir="${dist.dir}"/>
2.837 + <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
2.838 </target>
2.839 <target name="-post-clean">
2.840 <!-- Empty placeholder for easier customization. -->
2.841 <!-- You can override this target in the ../build.xml file. -->
2.842 </target>
2.843 <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
2.844 + <target name="-check-call-dep">
2.845 + <property file="${call.built.properties}" prefix="already.built."/>
2.846 + <condition property="should.call.dep">
2.847 + <not>
2.848 + <isset property="already.built.${call.subproject}"/>
2.849 + </not>
2.850 + </condition>
2.851 + </target>
2.852 + <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
2.853 + <ant antfile="${call.script}" inheritall="false" target="${call.target}">
2.854 + <propertyset>
2.855 + <propertyref prefix="transfer."/>
2.856 + <mapper from="transfer.*" to="*" type="glob"/>
2.857 + </propertyset>
2.858 + </ant>
2.859 + </target>
2.860 </project>
3.1 --- a/other/signatures/nbproject/genfiles.properties Thu Jul 21 11:15:37 2011 -0400
3.2 +++ b/other/signatures/nbproject/genfiles.properties Thu Jul 21 11:16:26 2011 -0400
3.3 @@ -1,8 +1,8 @@
3.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
3.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
3.6 build.xml.data.CRC32=ee7e9246
3.7 -build.xml.script.CRC32=514579df
3.8 -build.xml.stylesheet.CRC32=be360661
3.9 +build.xml.script.CRC32=5ad3d30a
3.10 +build.xml.stylesheet.CRC32=28e38971@1.45.0.45
3.11 nbproject/build-impl.xml.data.CRC32=ee7e9246
3.12 -nbproject/build-impl.xml.script.CRC32=a510d55b
3.13 -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
3.14 +nbproject/build-impl.xml.script.CRC32=c40a4c5e
3.15 +nbproject/build-impl.xml.stylesheet.CRC32=cfcde7f8@1.45.0.45
4.1 --- a/other/signatures/nbproject/project.properties Thu Jul 21 11:15:37 2011 -0400
4.2 +++ b/other/signatures/nbproject/project.properties Thu Jul 21 11:16:26 2011 -0400
4.3 @@ -3,6 +3,7 @@
4.4 # This directory is removed when the project is cleaned:
4.5 build.dir=build
4.6 build.generated.dir=${build.dir}/generated
4.7 +build.generated.sources.dir=${build.dir}/generated-sources
4.8 # Only compile against the classpath explicitly listed here:
4.9 build.sysclasspath=ignore
4.10 build.test.classes.dir=${build.dir}/test/classes