1.1 --- a/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:50:27 2008 +0200
1.2 +++ b/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:50:27 2008 +0200
1.3 @@ -18,32 +18,35 @@
1.4 - applet
1.5 - cleanup
1.6
1.7 --->
1.8 -<project name="friendpackage-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1">
1.9 - <target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
1.10 + -->
1.11 +<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="friendpackage-impl">
1.12 + <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
1.13 <!--
1.14 - ======================
1.15 - INITIALIZATION SECTION
1.16 - ======================
1.17 - -->
1.18 + ======================
1.19 + INITIALIZATION SECTION
1.20 + ======================
1.21 + -->
1.22 <target name="-pre-init">
1.23 <!-- Empty placeholder for easier customization. -->
1.24 <!-- You can override this target in the ../build.xml file. -->
1.25 </target>
1.26 - <target name="-init-private" depends="-pre-init">
1.27 + <target depends="-pre-init" name="-init-private">
1.28 + <property file="nbproject/private/config.properties"/>
1.29 + <property file="nbproject/private/configs/${config}.properties"/>
1.30 <property file="nbproject/private/private.properties"/>
1.31 </target>
1.32 - <target name="-init-user" depends="-pre-init,-init-private">
1.33 + <target depends="-pre-init,-init-private" name="-init-user">
1.34 <property file="${user.properties.file}"/>
1.35 <!-- The two properties below are usually overridden -->
1.36 <!-- by the active platform. Just a fallback. -->
1.37 <property name="default.javac.source" value="1.4"/>
1.38 <property name="default.javac.target" value="1.4"/>
1.39 </target>
1.40 - <target name="-init-project" depends="-pre-init,-init-private,-init-user">
1.41 + <target depends="-pre-init,-init-private,-init-user" name="-init-project">
1.42 + <property file="nbproject/configs/${config}.properties"/>
1.43 <property file="nbproject/project.properties"/>
1.44 </target>
1.45 - <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
1.46 + <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
1.47 <available file="${manifest.file}" property="manifest.available"/>
1.48 <condition property="manifest.available+main.class">
1.49 <and>
1.50 @@ -77,7 +80,10 @@
1.51 </and>
1.52 </condition>
1.53 <condition property="no.javadoc.preview">
1.54 - <isfalse value="${javadoc.preview}"/>
1.55 + <and>
1.56 + <isset property="javadoc.preview"/>
1.57 + <isfalse value="${javadoc.preview}"/>
1.58 + </and>
1.59 </condition>
1.60 <property name="run.jvmargs" value=""/>
1.61 <property name="javac.compilerargs" value=""/>
1.62 @@ -90,12 +96,24 @@
1.63 <property name="javac.debug" value="true"/>
1.64 <property name="javadoc.preview" value="true"/>
1.65 <property name="application.args" value=""/>
1.66 + <property name="source.encoding" value="${file.encoding}"/>
1.67 + <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
1.68 + <and>
1.69 + <isset property="javadoc.encoding"/>
1.70 + <not>
1.71 + <equals arg1="${javadoc.encoding}" arg2=""/>
1.72 + </not>
1.73 + </and>
1.74 + </condition>
1.75 + <property name="javadoc.encoding.used" value="${source.encoding}"/>
1.76 + <property name="includes" value="**"/>
1.77 + <property name="excludes" value=""/>
1.78 </target>
1.79 <target name="-post-init">
1.80 <!-- Empty placeholder for easier customization. -->
1.81 <!-- You can override this target in the ../build.xml file. -->
1.82 </target>
1.83 - <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
1.84 + <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
1.85 <fail unless="src.dir">Must set src.dir</fail>
1.86 <fail unless="test.src.dir">Must set test.src.dir</fail>
1.87 <fail unless="build.dir">Must set build.dir</fail>
1.88 @@ -118,36 +136,70 @@
1.89 </target>
1.90 <target name="-init-macrodef-javac">
1.91 <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
1.92 - <attribute name="srcdir" default="${src.dir}"/>
1.93 - <attribute name="destdir" default="${build.classes.dir}"/>
1.94 - <attribute name="classpath" default="${javac.classpath}"/>
1.95 - <attribute name="debug" default="${javac.debug}"/>
1.96 + <attribute default="${src.dir}" name="srcdir"/>
1.97 + <attribute default="${build.classes.dir}" name="destdir"/>
1.98 + <attribute default="${javac.classpath}" name="classpath"/>
1.99 + <attribute default="${includes}" name="includes"/>
1.100 + <attribute default="${excludes}" name="excludes"/>
1.101 + <attribute default="${javac.debug}" name="debug"/>
1.102 + <attribute default="" name="javac.compilerargs.jaxws"/>
1.103 + <attribute default="" name="sourcepath"/>
1.104 <element name="customize" optional="true"/>
1.105 <sequential>
1.106 - <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
1.107 + <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}">
1.108 <classpath>
1.109 <path path="@{classpath}"/>
1.110 </classpath>
1.111 - <compilerarg line="${javac.compilerargs}"/>
1.112 + <compilerarg line="${javac.compilerargs} @{javac.compilerargs.jaxws}"/>
1.113 <customize/>
1.114 </javac>
1.115 </sequential>
1.116 </macrodef>
1.117 + <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
1.118 + <attribute default="${src.dir}" name="srcdir"/>
1.119 + <attribute default="${build.classes.dir}" name="destdir"/>
1.120 + <attribute default="${javac.classpath}" name="classpath"/>
1.121 + <sequential>
1.122 + <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
1.123 + <classpath>
1.124 + <path path="@{classpath}"/>
1.125 + </classpath>
1.126 + </depend>
1.127 + </sequential>
1.128 + </macrodef>
1.129 + <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
1.130 + <attribute default="${build.classes.dir}" name="destdir"/>
1.131 + <sequential>
1.132 + <fail unless="javac.includes">Must set javac.includes</fail>
1.133 + <pathconvert pathsep="," property="javac.includes.binary">
1.134 + <path>
1.135 + <filelist dir="@{destdir}" files="${javac.includes}"/>
1.136 + </path>
1.137 + <globmapper from="*.java" to="*.class"/>
1.138 + </pathconvert>
1.139 + <delete>
1.140 + <files includes="${javac.includes.binary}"/>
1.141 + </delete>
1.142 + </sequential>
1.143 + </macrodef>
1.144 </target>
1.145 <target name="-init-macrodef-junit">
1.146 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.147 - <attribute name="includes" default="**/*Test.java"/>
1.148 + <attribute default="${includes}" name="includes"/>
1.149 + <attribute default="${excludes}" name="excludes"/>
1.150 <sequential>
1.151 - <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
1.152 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
1.153 <batchtest todir="${build.test.results.dir}">
1.154 - <fileset dir="${test.src.dir}" includes="@{includes}"/>
1.155 + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.156 + <filename name="**/*Test.java"/>
1.157 + </fileset>
1.158 </batchtest>
1.159 <classpath>
1.160 <path path="${run.test.classpath}"/>
1.161 </classpath>
1.162 <syspropertyset>
1.163 <propertyref prefix="test-sys-prop."/>
1.164 - <mapper type="glob" from="test-sys-prop.*" to="*"/>
1.165 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.166 </syspropertyset>
1.167 <formatter type="brief" usefile="false"/>
1.168 <formatter type="xml"/>
1.169 @@ -158,11 +210,11 @@
1.170 </target>
1.171 <target name="-init-macrodef-nbjpda">
1.172 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
1.173 - <attribute name="name" default="${main.class}"/>
1.174 - <attribute name="classpath" default="${debug.classpath}"/>
1.175 - <attribute name="stopclassname" default=""/>
1.176 + <attribute default="${main.class}" name="name"/>
1.177 + <attribute default="${debug.classpath}" name="classpath"/>
1.178 + <attribute default="" name="stopclassname"/>
1.179 <sequential>
1.180 - <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}">
1.181 + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
1.182 <classpath>
1.183 <path path="@{classpath}"/>
1.184 </classpath>
1.185 @@ -170,24 +222,36 @@
1.186 </sequential>
1.187 </macrodef>
1.188 <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
1.189 - <attribute name="dir" default="${build.classes.dir}"/>
1.190 + <attribute default="${build.classes.dir}" name="dir"/>
1.191 <sequential>
1.192 <nbjpdareload>
1.193 - <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
1.194 + <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
1.195 </nbjpdareload>
1.196 </sequential>
1.197 </macrodef>
1.198 </target>
1.199 - <target name="-init-macrodef-debug">
1.200 + <target name="-init-debug-args">
1.201 + <property name="version-output" value="java version "${ant.java.version}"/>
1.202 + <condition property="have-jdk-older-than-1.4">
1.203 + <or>
1.204 + <contains string="${version-output}" substring="java version "1.0"/>
1.205 + <contains string="${version-output}" substring="java version "1.1"/>
1.206 + <contains string="${version-output}" substring="java version "1.2"/>
1.207 + <contains string="${version-output}" substring="java version "1.3"/>
1.208 + </or>
1.209 + </condition>
1.210 + <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
1.211 + <istrue value="${have-jdk-older-than-1.4}"/>
1.212 + </condition>
1.213 + </target>
1.214 + <target depends="-init-debug-args" name="-init-macrodef-debug">
1.215 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.216 - <attribute name="classname" default="${main.class}"/>
1.217 - <attribute name="classpath" default="${debug.classpath}"/>
1.218 + <attribute default="${main.class}" name="classname"/>
1.219 + <attribute default="${debug.classpath}" name="classpath"/>
1.220 <element name="customize" optional="true"/>
1.221 <sequential>
1.222 - <java fork="true" classname="@{classname}" dir="${work.dir}">
1.223 - <jvmarg value="-Xdebug"/>
1.224 - <jvmarg value="-Xnoagent"/>
1.225 - <jvmarg value="-Djava.compiler=none"/>
1.226 + <java classname="@{classname}" dir="${work.dir}" fork="true">
1.227 + <jvmarg line="${debug-args-line}"/>
1.228 <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
1.229 <jvmarg line="${run.jvmargs}"/>
1.230 <classpath>
1.231 @@ -195,7 +259,7 @@
1.232 </classpath>
1.233 <syspropertyset>
1.234 <propertyref prefix="run-sys-prop."/>
1.235 - <mapper type="glob" from="run-sys-prop.*" to="*"/>
1.236 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.237 </syspropertyset>
1.238 <customize/>
1.239 </java>
1.240 @@ -204,17 +268,17 @@
1.241 </target>
1.242 <target name="-init-macrodef-java">
1.243 <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
1.244 - <attribute name="classname" default="${main.class}"/>
1.245 + <attribute default="${main.class}" name="classname"/>
1.246 <element name="customize" optional="true"/>
1.247 <sequential>
1.248 - <java fork="true" classname="@{classname}" dir="${work.dir}">
1.249 + <java classname="@{classname}" dir="${work.dir}" fork="true">
1.250 <jvmarg line="${run.jvmargs}"/>
1.251 <classpath>
1.252 <path path="${run.classpath}"/>
1.253 </classpath>
1.254 <syspropertyset>
1.255 <propertyref prefix="run-sys-prop."/>
1.256 - <mapper type="glob" from="run-sys-prop.*" to="*"/>
1.257 + <mapper from="run-sys-prop.*" to="*" type="glob"/>
1.258 </syspropertyset>
1.259 <customize/>
1.260 </java>
1.261 @@ -223,102 +287,100 @@
1.262 </target>
1.263 <target name="-init-presetdef-jar">
1.264 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
1.265 - <jar jarfile="${dist.jar}" compress="${jar.compress}">
1.266 + <jar compress="${jar.compress}" jarfile="${dist.jar}">
1.267 <j2seproject1:fileset dir="${build.classes.dir}"/>
1.268 </jar>
1.269 </presetdef>
1.270 </target>
1.271 - <target name="init" 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"/>
1.272 + <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"/>
1.273 <!--
1.274 - ===================
1.275 - COMPILATION SECTION
1.276 - ===================
1.277 - -->
1.278 - <target name="deps-jar" depends="init" unless="no.deps"/>
1.279 - <target name="-pre-pre-compile" depends="init,deps-jar">
1.280 + ===================
1.281 + COMPILATION SECTION
1.282 + ===================
1.283 + -->
1.284 + <target depends="init" name="deps-jar" unless="no.deps"/>
1.285 + <target depends="init,deps-jar" name="-pre-pre-compile">
1.286 <mkdir dir="${build.classes.dir}"/>
1.287 </target>
1.288 <target name="-pre-compile">
1.289 <!-- Empty placeholder for easier customization. -->
1.290 <!-- You can override this target in the ../build.xml file. -->
1.291 </target>
1.292 - <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
1.293 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile">
1.294 + <j2seproject3:depend/>
1.295 <j2seproject3:javac/>
1.296 <copy todir="${build.classes.dir}">
1.297 - <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
1.298 + <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.299 </copy>
1.300 </target>
1.301 <target name="-post-compile">
1.302 <!-- Empty placeholder for easier customization. -->
1.303 <!-- You can override this target in the ../build.xml file. -->
1.304 </target>
1.305 - <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
1.306 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
1.307 <target name="-pre-compile-single">
1.308 <!-- Empty placeholder for easier customization. -->
1.309 <!-- You can override this target in the ../build.xml file. -->
1.310 </target>
1.311 - <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
1.312 + <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
1.313 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.314 - <j2seproject3:javac>
1.315 - <customize>
1.316 - <patternset includes="${javac.includes}"/>
1.317 - </customize>
1.318 - </j2seproject3:javac>
1.319 + <j2seproject3:force-recompile/>
1.320 + <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
1.321 </target>
1.322 <target name="-post-compile-single">
1.323 <!-- Empty placeholder for easier customization. -->
1.324 <!-- You can override this target in the ../build.xml file. -->
1.325 </target>
1.326 - <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
1.327 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
1.328 <!--
1.329 - ====================
1.330 - JAR BUILDING SECTION
1.331 - ====================
1.332 - -->
1.333 - <target name="-pre-pre-jar" depends="init">
1.334 - <dirname property="dist.jar.dir" file="${dist.jar}"/>
1.335 + ====================
1.336 + JAR BUILDING SECTION
1.337 + ====================
1.338 + -->
1.339 + <target depends="init" name="-pre-pre-jar">
1.340 + <dirname file="${dist.jar}" property="dist.jar.dir"/>
1.341 <mkdir dir="${dist.jar.dir}"/>
1.342 </target>
1.343 <target name="-pre-jar">
1.344 <!-- Empty placeholder for easier customization. -->
1.345 <!-- You can override this target in the ../build.xml file. -->
1.346 </target>
1.347 - <target name="-do-jar-without-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" unless="manifest.available">
1.348 + <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
1.349 <j2seproject1:jar/>
1.350 </target>
1.351 - <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
1.352 + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
1.353 <j2seproject1:jar manifest="${manifest.file}"/>
1.354 </target>
1.355 - <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" unless="manifest.available+main.class+mkdist.available">
1.356 + <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">
1.357 <j2seproject1:jar manifest="${manifest.file}">
1.358 <j2seproject1:manifest>
1.359 <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
1.360 </j2seproject1:manifest>
1.361 </j2seproject1:jar>
1.362 <echo>To run this application from the command line without Ant, try:</echo>
1.363 - <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
1.364 - <property name="dist.jar.resolved" location="${dist.jar}"/>
1.365 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.366 + <property location="${dist.jar}" name="dist.jar.resolved"/>
1.367 <pathconvert property="run.classpath.with.dist.jar">
1.368 <path path="${run.classpath}"/>
1.369 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.370 </pathconvert>
1.371 <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1.372 </target>
1.373 - <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
1.374 - <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
1.375 + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
1.376 + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.377 <pathconvert property="run.classpath.without.build.classes.dir">
1.378 <path path="${run.classpath}"/>
1.379 <map from="${build.classes.dir.resolved}" to=""/>
1.380 </pathconvert>
1.381 - <pathconvert property="jar.classpath" pathsep=" ">
1.382 + <pathconvert pathsep=" " property="jar.classpath">
1.383 <path path="${run.classpath.without.build.classes.dir}"/>
1.384 <chainedmapper>
1.385 <flattenmapper/>
1.386 <globmapper from="*" to="lib/*"/>
1.387 </chainedmapper>
1.388 </pathconvert>
1.389 - <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" name="copylibs" classpath="${libs.CopyLibs.classpath}"/>
1.390 - <copylibs manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}" jarfile="${dist.jar}" compress="${jar.compress}">
1.391 + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.392 + <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.393 <fileset dir="${build.classes.dir}"/>
1.394 <manifest>
1.395 <attribute name="Main-Class" value="${main.class}"/>
1.396 @@ -326,183 +388,189 @@
1.397 </manifest>
1.398 </copylibs>
1.399 <echo>To run this application from the command line without Ant, try:</echo>
1.400 - <property name="dist.jar.resolved" location="${dist.jar}"/>
1.401 + <property location="${dist.jar}" name="dist.jar.resolved"/>
1.402 <echo>java -jar "${dist.jar.resolved}"</echo>
1.403 </target>
1.404 <target name="-post-jar">
1.405 <!-- Empty placeholder for easier customization. -->
1.406 <!-- You can override this target in the ../build.xml file. -->
1.407 </target>
1.408 - <target name="jar" 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."/>
1.409 + <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.410 <!--
1.411 - =================
1.412 - EXECUTION SECTION
1.413 - =================
1.414 - -->
1.415 - <target name="run" depends="init,compile" description="Run a main class.">
1.416 + =================
1.417 + EXECUTION SECTION
1.418 + =================
1.419 + -->
1.420 + <target depends="init,compile" description="Run a main class." name="run">
1.421 <j2seproject1:java>
1.422 <customize>
1.423 <arg line="${application.args}"/>
1.424 </customize>
1.425 </j2seproject1:java>
1.426 </target>
1.427 - <target name="run-single" depends="init,compile-single">
1.428 + <target depends="init,compile" name="run-single">
1.429 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.430 <j2seproject1:java classname="${run.class}"/>
1.431 </target>
1.432 <!--
1.433 - =================
1.434 - DEBUGGING SECTION
1.435 - =================
1.436 - -->
1.437 - <target name="-debug-start-debugger" if="netbeans.home" depends="init">
1.438 + =================
1.439 + DEBUGGING SECTION
1.440 + =================
1.441 + -->
1.442 + <target depends="init" if="netbeans.home" name="-debug-start-debugger">
1.443 <j2seproject1:nbjpdastart name="${debug.class}"/>
1.444 </target>
1.445 - <target name="-debug-start-debuggee" depends="init,compile">
1.446 + <target depends="init,compile" name="-debug-start-debuggee">
1.447 <j2seproject3:debug>
1.448 <customize>
1.449 <arg line="${application.args}"/>
1.450 </customize>
1.451 </j2seproject3:debug>
1.452 </target>
1.453 - <target name="debug" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE."/>
1.454 - <target name="-debug-start-debugger-stepinto" if="netbeans.home" depends="init">
1.455 + <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
1.456 + <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
1.457 <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
1.458 </target>
1.459 - <target name="debug-stepinto" if="netbeans.home" depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee"/>
1.460 - <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
1.461 + <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
1.462 + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
1.463 <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
1.464 <j2seproject3:debug classname="${debug.class}"/>
1.465 </target>
1.466 - <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
1.467 - <target name="-pre-debug-fix" depends="init">
1.468 + <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
1.469 + <target depends="init" name="-pre-debug-fix">
1.470 <fail unless="fix.includes">Must set fix.includes</fail>
1.471 <property name="javac.includes" value="${fix.includes}.java"/>
1.472 </target>
1.473 - <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
1.474 + <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
1.475 <j2seproject1:nbjpdareload/>
1.476 </target>
1.477 - <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
1.478 + <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
1.479 <!--
1.480 - ===============
1.481 - JAVADOC SECTION
1.482 - ===============
1.483 - -->
1.484 - <target name="-javadoc-build" depends="init">
1.485 + ===============
1.486 + JAVADOC SECTION
1.487 + ===============
1.488 + -->
1.489 + <target depends="init" name="-javadoc-build">
1.490 <mkdir dir="${dist.javadoc.dir}"/>
1.491 - <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
1.492 + <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" destdir="${dist.javadoc.dir}" 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.493 <classpath>
1.494 <path path="${javac.classpath}"/>
1.495 </classpath>
1.496 - <sourcepath>
1.497 - <pathelement location="${src.dir}"/>
1.498 - </sourcepath>
1.499 - <packageset dir="${src.dir}" includes="*/**"/>
1.500 - <fileset dir="${src.dir}" includes="*.java"/>
1.501 + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.502 + <filename name="**/*.java"/>
1.503 + </fileset>
1.504 </javadoc>
1.505 </target>
1.506 - <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
1.507 + <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
1.508 <nbbrowse file="${dist.javadoc.dir}/index.html"/>
1.509 </target>
1.510 - <target name="javadoc" depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc."/>
1.511 + <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
1.512 <!--
1.513 - =========================
1.514 - JUNIT COMPILATION SECTION
1.515 - =========================
1.516 - -->
1.517 - <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
1.518 + =========================
1.519 + JUNIT COMPILATION SECTION
1.520 + =========================
1.521 + -->
1.522 + <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
1.523 <mkdir dir="${build.test.classes.dir}"/>
1.524 </target>
1.525 <target name="-pre-compile-test">
1.526 <!-- Empty placeholder for easier customization. -->
1.527 <!-- You can override this target in the ../build.xml file. -->
1.528 </target>
1.529 - <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
1.530 - <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
1.531 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
1.532 + <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.533 + <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.534 <copy todir="${build.test.classes.dir}">
1.535 - <fileset dir="${test.src.dir}" excludes="**/*.java"/>
1.536 + <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.537 </copy>
1.538 </target>
1.539 <target name="-post-compile-test">
1.540 <!-- Empty placeholder for easier customization. -->
1.541 <!-- You can override this target in the ../build.xml file. -->
1.542 </target>
1.543 - <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
1.544 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
1.545 <target name="-pre-compile-test-single">
1.546 <!-- Empty placeholder for easier customization. -->
1.547 <!-- You can override this target in the ../build.xml file. -->
1.548 </target>
1.549 - <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
1.550 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
1.551 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.552 - <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}">
1.553 - <customize>
1.554 - <patternset includes="${javac.includes}"/>
1.555 - </customize>
1.556 - </j2seproject3:javac>
1.557 + <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
1.558 + <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}"/>
1.559 <copy todir="${build.test.classes.dir}">
1.560 - <fileset dir="${test.src.dir}" excludes="**/*.java"/>
1.561 + <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.562 </copy>
1.563 </target>
1.564 <target name="-post-compile-test-single">
1.565 <!-- Empty placeholder for easier customization. -->
1.566 <!-- You can override this target in the ../build.xml file. -->
1.567 </target>
1.568 - <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
1.569 + <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.570 <!--
1.571 - =======================
1.572 - JUNIT EXECUTION SECTION
1.573 - =======================
1.574 - -->
1.575 - <target name="-pre-test-run" if="have.tests" depends="init">
1.576 + =======================
1.577 + JUNIT EXECUTION SECTION
1.578 + =======================
1.579 + -->
1.580 + <target depends="init" if="have.tests" name="-pre-test-run">
1.581 <mkdir dir="${build.test.results.dir}"/>
1.582 </target>
1.583 - <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
1.584 + <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.585 <j2seproject3:junit/>
1.586 </target>
1.587 - <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
1.588 + <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.589 <fail if="tests.failed">Some tests failed; see details above.</fail>
1.590 </target>
1.591 - <target name="test-report" if="have.tests" depends="init"/>
1.592 - <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
1.593 - <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
1.594 - <target name="-pre-test-run-single" if="have.tests" depends="init">
1.595 + <target depends="init" if="have.tests" name="test-report"/>
1.596 + <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
1.597 + <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
1.598 + <target depends="init" if="have.tests" name="-pre-test-run-single">
1.599 <mkdir dir="${build.test.results.dir}"/>
1.600 </target>
1.601 - <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
1.602 + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
1.603 <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
1.604 - <j2seproject3:junit includes="${test.includes}"/>
1.605 + <j2seproject3:junit excludes="" includes="${test.includes}"/>
1.606 </target>
1.607 - <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
1.608 + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
1.609 <fail if="tests.failed">Some tests failed; see details above.</fail>
1.610 </target>
1.611 - <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
1.612 + <target depends="init,compile-test,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
1.613 <!--
1.614 - =======================
1.615 - JUNIT DEBUGGING SECTION
1.616 - =======================
1.617 - -->
1.618 - <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
1.619 + =======================
1.620 + JUNIT DEBUGGING SECTION
1.621 + =======================
1.622 + -->
1.623 + <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
1.624 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1.625 - <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
1.626 + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
1.627 + <delete file="${test.report.file}"/>
1.628 + <mkdir dir="${build.test.results.dir}"/>
1.629 + <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.630 <customize>
1.631 - <arg line="${test.class}"/>
1.632 + <syspropertyset>
1.633 + <propertyref prefix="test-sys-prop."/>
1.634 + <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.635 + </syspropertyset>
1.636 + <arg value="${test.class}"/>
1.637 + <arg value="showoutput=true"/>
1.638 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
1.639 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
1.640 </customize>
1.641 </j2seproject3:debug>
1.642 </target>
1.643 - <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
1.644 - <j2seproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
1.645 + <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
1.646 + <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
1.647 </target>
1.648 - <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
1.649 - <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
1.650 + <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.651 + <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
1.652 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
1.653 </target>
1.654 - <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
1.655 + <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
1.656 <!--
1.657 - =========================
1.658 - APPLET EXECUTION SECTION
1.659 - =========================
1.660 - -->
1.661 - <target name="run-applet" depends="init,compile-single">
1.662 + =========================
1.663 + APPLET EXECUTION SECTION
1.664 + =========================
1.665 + -->
1.666 + <target depends="init,compile-single" name="run-applet">
1.667 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1.668 <j2seproject1:java classname="sun.applet.AppletViewer">
1.669 <customize>
1.670 @@ -511,11 +579,11 @@
1.671 </j2seproject1:java>
1.672 </target>
1.673 <!--
1.674 - =========================
1.675 - APPLET DEBUGGING SECTION
1.676 - =========================
1.677 - -->
1.678 - <target name="-debug-start-debuggee-applet" if="netbeans.home" depends="init,compile-single">
1.679 + =========================
1.680 + APPLET DEBUGGING SECTION
1.681 + =========================
1.682 + -->
1.683 + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
1.684 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
1.685 <j2seproject3:debug classname="sun.applet.AppletViewer">
1.686 <customize>
1.687 @@ -523,14 +591,14 @@
1.688 </customize>
1.689 </j2seproject3:debug>
1.690 </target>
1.691 - <target name="debug-applet" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet"/>
1.692 + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
1.693 <!--
1.694 - ===============
1.695 - CLEANUP SECTION
1.696 - ===============
1.697 - -->
1.698 - <target name="deps-clean" depends="init" unless="no.deps"/>
1.699 - <target name="-do-clean" depends="init">
1.700 + ===============
1.701 + CLEANUP SECTION
1.702 + ===============
1.703 + -->
1.704 + <target depends="init" name="deps-clean" unless="no.deps"/>
1.705 + <target depends="init" name="-do-clean">
1.706 <delete dir="${build.dir}"/>
1.707 <delete dir="${dist.dir}"/>
1.708 </target>
1.709 @@ -538,5 +606,5 @@
1.710 <!-- Empty placeholder for easier customization. -->
1.711 <!-- You can override this target in the ../build.xml file. -->
1.712 </target>
1.713 - <target name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
1.714 + <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
1.715 </project>
2.1 --- a/samples/friendpackage/nbproject/genfiles.properties Sat Jun 14 09:50:27 2008 +0200
2.2 +++ b/samples/friendpackage/nbproject/genfiles.properties Sat Jun 14 09:50:27 2008 +0200
2.3 @@ -1,8 +1,8 @@
2.4 build.xml.data.CRC32=b1c774b2
2.5 build.xml.script.CRC32=fa64c0b4
2.6 -build.xml.stylesheet.CRC32=d5b6853a
2.7 +build.xml.stylesheet.CRC32=a12b3d02
2.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.10 nbproject/build-impl.xml.data.CRC32=b1c774b2
2.11 -nbproject/build-impl.xml.script.CRC32=d7cec00a
2.12 -nbproject/build-impl.xml.stylesheet.CRC32=3a518818
2.13 +nbproject/build-impl.xml.script.CRC32=bfce654b
2.14 +nbproject/build-impl.xml.stylesheet.CRC32=33df9aac
3.1 --- a/samples/friendpackage/nbproject/project.properties Sat Jun 14 09:50:27 2008 +0200
3.2 +++ b/samples/friendpackage/nbproject/project.properties Sat Jun 14 09:50:27 2008 +0200
3.3 @@ -15,6 +15,8 @@
3.4 dist.dir=dist
3.5 dist.jar=${dist.dir}/friendpackage.jar
3.6 dist.javadoc.dir=${dist.dir}/javadoc
3.7 +excludes=
3.8 +includes=**
3.9 jar.compress=false
3.10 javac.classpath=
3.11 # Space-separated list of extra javac options