1.1 --- a/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:50:29 2008 +0200
1.2 +++ b/samples/friendpackage/nbproject/build-impl.xml Sat Jun 14 09:50:50 2008 +0200
1.3 @@ -108,6 +108,16 @@
1.4 <property name="javadoc.encoding.used" value="${source.encoding}"/>
1.5 <property name="includes" value="**"/>
1.6 <property name="excludes" value=""/>
1.7 + <property name="do.depend" value="false"/>
1.8 + <condition property="do.depend.true">
1.9 + <istrue value="${do.depend}"/>
1.10 + </condition>
1.11 + <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
1.12 + <and>
1.13 + <isset property="jaxws.endorsed.dir"/>
1.14 + <available file="nbproject/jaxws-build.xml"/>
1.15 + </and>
1.16 + </condition>
1.17 </target>
1.18 <target name="-post-init">
1.19 <!-- Empty placeholder for easier customization. -->
1.20 @@ -142,7 +152,6 @@
1.21 <attribute default="${includes}" name="includes"/>
1.22 <attribute default="${excludes}" name="excludes"/>
1.23 <attribute default="${javac.debug}" name="debug"/>
1.24 - <attribute default="" name="javac.compilerargs.jaxws"/>
1.25 <attribute default="" name="sourcepath"/>
1.26 <element name="customize" optional="true"/>
1.27 <sequential>
1.28 @@ -150,7 +159,7 @@
1.29 <classpath>
1.30 <path path="@{classpath}"/>
1.31 </classpath>
1.32 - <compilerarg line="${javac.compilerargs} @{javac.compilerargs.jaxws}"/>
1.33 + <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
1.34 <customize/>
1.35 </javac>
1.36 </sequential>
1.37 @@ -187,11 +196,12 @@
1.38 <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
1.39 <attribute default="${includes}" name="includes"/>
1.40 <attribute default="${excludes}" name="excludes"/>
1.41 + <attribute default="**" name="testincludes"/>
1.42 <sequential>
1.43 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
1.44 <batchtest todir="${build.test.results.dir}">
1.45 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.46 - <filename name="**/*Test.java"/>
1.47 + <filename name="@{testincludes}"/>
1.48 </fileset>
1.49 </batchtest>
1.50 <classpath>
1.51 @@ -306,8 +316,10 @@
1.52 <!-- Empty placeholder for easier customization. -->
1.53 <!-- You can override this target in the ../build.xml file. -->
1.54 </target>
1.55 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile">
1.56 + <target if="do.depend.true" name="-compile-depend">
1.57 <j2seproject3:depend/>
1.58 + </target>
1.59 + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
1.60 <j2seproject3:javac/>
1.61 <copy todir="${build.classes.dir}">
1.62 <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.63 @@ -455,7 +467,7 @@
1.64 -->
1.65 <target depends="init" name="-javadoc-build">
1.66 <mkdir dir="${dist.javadoc.dir}"/>
1.67 - <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.68 + <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.69 <classpath>
1.70 <path path="${javac.classpath}"/>
1.71 </classpath>
1.72 @@ -480,8 +492,10 @@
1.73 <!-- Empty placeholder for easier customization. -->
1.74 <!-- You can override this target in the ../build.xml file. -->
1.75 </target>
1.76 - <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
1.77 + <target if="do.depend.true" name="-compile-test-depend">
1.78 <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.79 + </target>
1.80 + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
1.81 <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
1.82 <copy todir="${build.test.classes.dir}">
1.83 <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
1.84 @@ -518,7 +532,7 @@
1.85 <mkdir dir="${build.test.results.dir}"/>
1.86 </target>
1.87 <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
1.88 - <j2seproject3:junit/>
1.89 + <j2seproject3:junit testincludes="**/*Test.java"/>
1.90 </target>
1.91 <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
1.92 <fail if="tests.failed">Some tests failed; see details above.</fail>