1.1 --- a/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:51:18 2008 +0200
1.2 +++ b/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:51:18 2008 +0200
1.3 @@ -80,7 +80,10 @@
1.4 </and>
1.5 </condition>
1.6 <condition property="no.javadoc.preview">
1.7 - <isfalse value="${javadoc.preview}"/>
1.8 + <and>
1.9 + <isset property="javadoc.preview"/>
1.10 + <isfalse value="${javadoc.preview}"/>
1.11 + </and>
1.12 </condition>
1.13 <property name="run.jvmargs" value=""/>
1.14 <property name="javac.compilerargs" value=""/>
1.15 @@ -94,8 +97,27 @@
1.16 <property name="javadoc.preview" value="true"/>
1.17 <property name="application.args" value=""/>
1.18 <property name="source.encoding" value="${file.encoding}"/>
1.19 + <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
1.20 + <and>
1.21 + <isset property="javadoc.encoding"/>
1.22 + <not>
1.23 + <equals arg1="${javadoc.encoding}" arg2=""/>
1.24 + </not>
1.25 + </and>
1.26 + </condition>
1.27 + <property name="javadoc.encoding.used" value="${source.encoding}"/>
1.28 <property name="includes" value="**"/>
1.29 <property name="excludes" value=""/>
1.30 + <property name="do.depend" value="false"/>
1.31 + <condition property="do.depend.true">
1.32 + <istrue value="${do.depend}"/>
1.33 + </condition>
1.34 + <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
1.35 + <and>
1.36 + <isset property="jaxws.endorsed.dir"/>
1.37 + <available file="nbproject/jaxws-build.xml"/>
1.38 + </and>
1.39 + </condition>
1.40 </target>
1.41 <target name="-post-init">
1.42 <!-- Empty placeholder for easier customization. -->
1.43 @@ -130,15 +152,14 @@
1.44 <attribute default="${includes}" name="includes"/>
1.45 <attribute default="${excludes}" name="excludes"/>
1.46 <attribute default="${javac.debug}" name="debug"/>
1.47 - <attribute default="${jaxws.endorsed.dir}" name="jaxwsendorsed"/>
1.48 + <attribute default="" name="sourcepath"/>
1.49 <element name="customize" optional="true"/>
1.50 <sequential>
1.51 - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="" srcdir="@{srcdir}" target="${javac.target}">
1.52 + <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.53 <classpath>
1.54 <path path="@{classpath}"/>
1.55 </classpath>
1.56 - <compilerarg line="-Djava.endorsed.dirs='@{jaxwsendorsed}'"/>
1.57 - <compilerarg line="${javac.compilerargs}"/>
1.58 + <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
1.59 <customize/>
1.60 </javac>
1.61 </sequential>
1.62 @@ -175,11 +196,12 @@
1.63 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.64 <attribute default="${includes}" name="includes"/>
1.65 <attribute default="${excludes}" name="excludes"/>
1.66 + <attribute default="**" name="testincludes"/>
1.67 <sequential>
1.68 - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
1.69 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
1.70 <batchtest todir="${build.test.results.dir}">
1.71 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.72 - <filename name="**/*Test.java"/>
1.73 + <filename name="@{testincludes}"/>
1.74 </fileset>
1.75 </batchtest>
1.76 <classpath>
1.77 @@ -294,8 +316,10 @@
1.78 <!-- Empty placeholder for easier customization. -->
1.79 <!-- You can override this target in the ../build.xml file. -->
1.80 </target>
1.81 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile">
1.82 + <target if="do.depend.true" name="-compile-depend">
1.83 <j2seproject3:depend/>
1.84 + </target>
1.85 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
1.86 <j2seproject3:javac/>
1.87 <copy todir="${build.classes.dir}">
1.88 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.89 @@ -313,7 +337,7 @@
1.90 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
1.91 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.92 <j2seproject3:force-recompile/>
1.93 - <j2seproject3:javac excludes="" includes="${javac.includes}"/>
1.94 + <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
1.95 </target>
1.96 <target name="-post-compile-single">
1.97 <!-- Empty placeholder for easier customization. -->
1.98 @@ -396,7 +420,10 @@
1.99 </customize>
1.100 </j2seproject1:java>
1.101 </target>
1.102 - <target depends="init,compile" name="run-single">
1.103 + <target name="-do-not-recompile">
1.104 + <property name="javac.includes.binary" value=""/>
1.105 + </target>
1.106 + <target depends="init,-do-not-recompile,compile-single" name="run-single">
1.107 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.108 <j2seproject1:java classname="${run.class}"/>
1.109 </target>
1.110 @@ -424,7 +451,7 @@
1.111 <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
1.112 <j2seproject3:debug classname="${debug.class}"/>
1.113 </target>
1.114 - <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
1.115 + <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
1.116 <target depends="init" name="-pre-debug-fix">
1.117 <fail unless="fix.includes">Must set fix.includes</fail>
1.118 <property name="javac.includes" value="${fix.includes}.java"/>
1.119 @@ -440,11 +467,10 @@
1.120 -->
1.121 <target depends="init" name="-javadoc-build">
1.122 <mkdir dir="${dist.javadoc.dir}"/>
1.123 - <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" destdir="${dist.javadoc.dir}" 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.124 + <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.125 <classpath>
1.126 <path path="${javac.classpath}"/>
1.127 </classpath>
1.128 - <packageset dir="${src.dir}" excludes="${excludes}" includes="${includes}"/>
1.129 <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
1.130 <filename name="**/*.java"/>
1.131 </fileset>
1.132 @@ -466,8 +492,10 @@
1.133 <!-- Empty placeholder for easier customization. -->
1.134 <!-- You can override this target in the ../build.xml file. -->
1.135 </target>
1.136 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
1.137 + <target if="do.depend.true" name="-compile-test-depend">
1.138 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.139 + </target>
1.140 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
1.141 <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.142 <copy todir="${build.test.classes.dir}">
1.143 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.144 @@ -485,7 +513,7 @@
1.145 <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
1.146 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
1.147 <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
1.148 - <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
1.149 + <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.150 <copy todir="${build.test.classes.dir}">
1.151 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.152 </copy>
1.153 @@ -504,7 +532,7 @@
1.154 <mkdir dir="${build.test.results.dir}"/>
1.155 </target>
1.156 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.157 - <j2seproject3:junit/>
1.158 + <j2seproject3:junit testincludes="**/*Test.java"/>
1.159 </target>
1.160 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.161 <fail if="tests.failed">Some tests failed; see details above.</fail>
1.162 @@ -522,7 +550,7 @@
1.163 <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
1.164 <fail if="tests.failed">Some tests failed; see details above.</fail>
1.165 </target>
1.166 - <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.167 + <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"/>
1.168 <!--
1.169 =======================
1.170 JUNIT DEBUGGING SECTION
1.171 @@ -530,20 +558,26 @@
1.172 -->
1.173 <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
1.174 <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
1.175 - <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
1.176 + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
1.177 + <delete file="${test.report.file}"/>
1.178 + <mkdir dir="${build.test.results.dir}"/>
1.179 + <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.180 <customize>
1.181 <syspropertyset>
1.182 <propertyref prefix="test-sys-prop."/>
1.183 <mapper from="test-sys-prop.*" to="*" type="glob"/>
1.184 </syspropertyset>
1.185 - <arg line="${test.class}"/>
1.186 + <arg value="${test.class}"/>
1.187 + <arg value="showoutput=true"/>
1.188 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
1.189 + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
1.190 </customize>
1.191 </j2seproject3:debug>
1.192 </target>
1.193 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
1.194 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
1.195 </target>
1.196 - <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.197 + <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
1.198 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
1.199 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
1.200 </target>