Revision: 5929
http://jnode.svn.sourceforge.net/jnode/?rev=5929&view=rev
Author: lsantha
Date: 2012-08-19 14:01:57 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Updated Netbeans project files.
Modified Paths:
--------------
classlib6/netbeans/nbproject/build-impl.xml
classlib6/netbeans/nbproject/genfiles.properties
Modified: classlib6/netbeans/nbproject/build-impl.xml
===================================================================
--- classlib6/netbeans/nbproject/build-impl.xml 2012-08-19 13:34:02 UTC (rev
5928)
+++ classlib6/netbeans/nbproject/build-impl.xml 2012-08-19 14:01:57 UTC (rev
5929)
@@ -12,18 +12,18 @@
- execution
- debugging
- javadoc
- - junit compilation
- - junit execution
- - junit debugging
+ - test compilation
+ - test execution
+ - test debugging
- applet
- cleanup
-->
<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="JNode_Classlib6-impl">
- <fail message="Please build using Ant 1.7.1 or higher.">
+ <fail message="Please build using Ant 1.8.0 or higher.">
<condition>
<not>
- <antversion atleast="1.7.1"/>
+ <antversion atleast="1.8.0"/>
</not>
</condition>
</fail>
@@ -196,6 +196,7 @@
</and>
</condition>
<property name="run.jvmargs" value=""/>
+ <property name="run.jvmargs.ide" value=""/>
<property name="javac.compilerargs" value=""/>
<property name="work.dir" value="${basedir}"/>
<condition property="no.deps">
@@ -238,7 +239,29 @@
<property name="javac.fork" value="${jdkBug6558476}"/>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
+ <property name="copylibs.rebase" value="true"/>
<available file="${meta.inf.dir}/persistence.xml"
property="has.persistence.xml"/>
+ <condition property="junit.available">
+ <or>
+ <available classname="org.junit.Test"
classpath="${run.test.classpath}"/>
+ <available classname="junit.framework.Test"
classpath="${run.test.classpath}"/>
+ </or>
+ </condition>
+ <condition property="testng.available">
+ <available classname="org.testng.annotations.Test"
classpath="${run.test.classpath}"/>
+ </condition>
+ <condition property="junit+testng.available">
+ <and>
+ <istrue value="${junit.available}"/>
+ <istrue value="${testng.available}"/>
+ </and>
+ </condition>
+ <condition else="testng" property="testng.mode" value="mixed">
+ <istrue value="${junit+testng.available}"/>
+ </condition>
+ <condition else="" property="testng.debug.mode" value="-mixed">
+ <istrue value="${junit+testng.available}"/>
+ </condition>
</target>
<target name="-post-init">
<!-- Empty placeholder for easier customization. -->
@@ -412,41 +435,312 @@
</sequential>
</macrodef>
</target>
- <target name="-init-macrodef-junit">
+ <target if="${junit.available}" name="-init-macrodef-junit-init">
+ <condition else="false" property="nb.junit.batch" value="true">
+ <and>
+ <istrue value="${junit.available}"/>
+ <not>
+ <isset property="test.method"/>
+ </not>
+ </and>
+ </condition>
+ <condition else="false" property="nb.junit.single" value="true">
+ <and>
+ <istrue value="${junit.available}"/>
+ <isset property="test.method"/>
+ </and>
+ </condition>
+ </target>
+ <target if="${nb.junit.single}" name="-init-macrodef-junit-single"
unless="${nb.junit.batch}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";>
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
<attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed"
failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}"
showoutput="true" tempdir="${build.dir}">
+ <test methods="@{testmethods}" name="@{testincludes}"
todir="${build.test.results.dir}"/>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg value="-ea"/>
+ <customize/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch"
unless="${nb.junit.single}">
+ <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property name="junit.forkmode" value="perTest"/>
+ <junit dir="${work.dir}" errorproperty="tests.failed"
failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}"
showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}"/>
- <classpath>
- <path path="${run.test.classpath}"/>
- </classpath>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
</syspropertyset>
<formatter type="brief" usefile="false"/>
<formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-ea"/>
- <jvmarg line="${run.jvmargs}"/>
+ <customize/>
</junit>
</sequential>
</macrodef>
</target>
- <target depends="-profile-pre-init, init, -profile-post-init,
-profile-init-macrodef-profile, -profile-init-check" name="profile-init"/>
- <target name="-profile-pre-init">
+ <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single,
-init-macrodef-junit-batch" if="${junit.available}"
name="-init-macrodef-junit"/>
+ <target if="${testng.available}" name="-init-macrodef-testng">
+ <macrodef name="testng"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <condition else="" property="testng.methods.arg"
value="@{testincludes}.@{testmethods}">
+ <isset property="test.method"/>
+ </condition>
+ <union id="test.set"/>
+ <taskdef classname="org.testng.TestNGAntTask"
classpath="${run.test.classpath}" name="testng"/>
+ <testng classfilesetref="test.set"
failureProperty="tests.failed" methods="${testng.methods.arg}"
mode="${testng.mode}" outputdir="${build.test.results.dir}"
suitename="JNode_Classlib6" testname="TestNG tests" workingDir="${work.dir}">
+ <xmlfileset dir="${build.test.classes.dir}"
includes="@{testincludes}"/>
+ <propertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </propertyset>
+ <customize/>
+ </testng>
+ </sequential>
+ </macrodef>
+ </target>
+ <target name="-init-macrodef-test-impl">
+ <macrodef name="test-impl"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <echo>No tests executed.</echo>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-junit" if="${junit.available}"
name="-init-macrodef-junit-impl">
+ <macrodef name="test-impl"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <j2seproject3:junit excludes="@{excludes}"
includes="@{includes}" testincludes="@{testincludes}"
testmethods="@{testmethods}">
+ <customize/>
+ </j2seproject3:junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-testng" if="${testng.available}"
name="-init-macrodef-testng-impl">
+ <macrodef name="test-impl"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <j2seproject3:testng excludes="@{excludes}"
includes="@{includes}" testincludes="@{testincludes}"
testmethods="@{testmethods}">
+ <customize/>
+ </j2seproject3:testng>
+ </sequential>
+ </macrodef>
+ </target>
+ <target
depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl"
name="-init-macrodef-test">
+ <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <sequential>
+ <j2seproject3:test-impl excludes="@{excludes}"
includes="@{includes}" testincludes="@{testincludes}"
testmethods="@{testmethods}">
+ <customize>
+ <classpath>
+ <path path="${run.test.classpath}"/>
+ </classpath>
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <jvmarg line="${run.jvmargs}"/>
+ <jvmarg line="${run.jvmargs.ide}"/>
+ </customize>
+ </j2seproject3:test-impl>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${junit.available}" name="-init-macrodef-junit-debug"
unless="${nb.junit.batch}">
+ <macrodef name="junit-debug"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property name="junit.forkmode" value="perTest"/>
+ <junit dir="${work.dir}" errorproperty="tests.failed"
failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}"
showoutput="true" tempdir="${build.dir}">
+ <test methods="@{testmethods}" name="@{testincludes}"
todir="${build.test.results.dir}"/>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg value="-ea"/>
+ <jvmarg line="${debug-args-line}"/>
+ <jvmarg
value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+ <customize/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+ <macrodef name="junit-debug"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element name="customize" optional="true"/>
+ <sequential>
+ <property name="junit.forkmode" value="perTest"/>
+ <junit dir="${work.dir}" errorproperty="tests.failed"
failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}"
showoutput="true" tempdir="${build.dir}">
+ <batchtest todir="${build.test.results.dir}"/>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="xml"/>
+ <jvmarg value="-ea"/>
+ <jvmarg line="${debug-args-line}"/>
+ <jvmarg
value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+ <customize/>
+ </junit>
+ </sequential>
+ </macrodef>
+ </target>
+ <target
depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch"
if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+ <macrodef name="test-debug-impl"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <element implicit="true" name="customize" optional="true"/>
+ <sequential>
+ <j2seproject3:junit-debug excludes="@{excludes}"
includes="@{includes}" testincludes="@{testincludes}"
testmethods="@{testmethods}">
+ <customize/>
+ </j2seproject3:junit-debug>
+ </sequential>
+ </macrodef>
+ </target>
+ <target if="${testng.available}" name="-init-macrodef-testng-debug">
+ <macrodef name="testng-debug"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <element name="customize2" optional="true"/>
+ <sequential>
+ <condition else="-testclass @{testClass}"
property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+ <isset property="test.method"/>
+ </condition>
+ <condition else="-suitename JNode_Classlib6 -testname
@{testClass} ${test.class.or.method}" property="testng.cmd.args"
value="@{testClass}">
+ <matches pattern=".*\.xml" string="@{testClass}"/>
+ </condition>
+ <delete dir="${build.test.results.dir}" quiet="true"/>
+ <mkdir dir="${build.test.results.dir}"/>
+ <j2seproject3:debug classname="org.testng.TestNG"
classpath="${debug.test.classpath}">
+ <customize>
+ <customize2/>
+ <jvmarg value="-ea"/>
+ <arg line="${testng.debug.mode}"/>
+ <arg line="-d ${build.test.results.dir}"/>
+ <arg line="-listener
org.testng.reporters.VerboseReporter"/>
+ <arg line="${testng.cmd.args}"/>
+ </customize>
+ </j2seproject3:debug>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-testng-debug" if="${testng.available}"
name="-init-macrodef-testng-debug-impl">
+ <macrodef name="testng-debug-impl"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <element implicit="true" name="customize2" optional="true"/>
+ <sequential>
+ <j2seproject3:testng-debug testClass="@{testClass}"
testMethod="@{testMethod}">
+ <customize2/>
+ </j2seproject3:testng-debug>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}"
name="-init-macrodef-test-debug-junit">
+ <macrodef name="test-debug"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <sequential>
+ <j2seproject3:test-debug-impl excludes="@{excludes}"
includes="@{includes}" testincludes="@{testincludes}"
testmethods="@{testmethods}">
+ <customize>
+ <classpath>
+ <path path="${run.test.classpath}"/>
+ </classpath>
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+ <jvmarg line="${run.jvmargs}"/>
+ <jvmarg line="${run.jvmargs.ide}"/>
+ </customize>
+ </j2seproject3:test-debug-impl>
+ </sequential>
+ </macrodef>
+ </target>
+ <target depends="-init-macrodef-testng-debug-impl"
if="${testng.available}" name="-init-macrodef-test-debug-testng">
+ <macrodef name="test-debug"
uri="http://www.netbeans.org/ns/j2se-project/3";>
+ <attribute default="${includes}" name="includes"/>
+ <attribute default="${excludes}" name="excludes"/>
+ <attribute default="**" name="testincludes"/>
+ <attribute default="" name="testmethods"/>
+ <attribute default="${main.class}" name="testClass"/>
+ <attribute default="" name="testMethod"/>
+ <sequential>
+ <j2seproject3:testng-debug-impl testClass="@{testClass}"
testMethod="@{testMethod}">
+ <customize2>
+ <syspropertyset>
+ <propertyref prefix="test-sys-prop."/>
+ <mapper from="test-sys-prop.*" to="*" type="glob"/>
+ </syspropertyset>
+ </customize2>
+ </j2seproject3:testng-debug-impl>
+ </sequential>
+ </macrodef>
+ </target>
+ <target
depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng"
name="-init-macrodef-test-debug"/>
+ <!--
+ pre NB7.2 profiling section; consider it deprecated
+ -->
+ <target depends="-profile-pre-init, init, -profile-post-init,
-profile-init-macrodef-profile, -profile-init-check"
if="profiler.info.jvmargs.agent" name="profile-init"/>
+ <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
- <target name="-profile-post-init">
+ <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
<!-- Empty placeholder for easier customization. -->
<!-- You can override this target in the ../build.xml file. -->
</target>
- <target name="-profile-init-macrodef-profile">
+ <target if="profiler.info.jvmargs.agent"
name="-profile-init-macrodef-profile">
<macrodef name="resolve">
<attribute name="name"/>
<attribute name="value"/>
@@ -461,6 +755,7 @@
<property environment="env"/>
<resolve name="profiler.current.path"
value="${profiler.info.pathvar}"/>
<java classname="@{classname}" dir="${profiler.info.dir}"
fork="true" jvm="${profiler.info.jvm}">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg line="${profiler.info.jvmargs}"/>
<env key="${profiler.info.pathvar}"
path="${profiler.info.agentpath}:${profiler.current.path}"/>
@@ -477,10 +772,13 @@
</sequential>
</macrodef>
</target>
- <target depends="-profile-pre-init, init, -profile-post-init,
-profile-init-macrodef-profile" name="-profile-init-check">
+ <target depends="-profile-pre-init, init, -profile-post-init,
-profile-init-macrodef-profile" if="profiler.info.jvmargs.agent"
name="-profile-init-check">
<fail unless="profiler.info.jvm">Must set JVM to use for profiling in
profiler.info.jvm</fail>
<fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM
arguments in profiler.info.jvmargs.agent</fail>
</target>
+ <!--
+ end of pre NB7.2 profiling section
+ -->
<target depends="-init-debug-args" name="-init-macrodef-nbjpda">
<macrodef name="nbjpdastart"
uri="http://www.netbeans.org/ns/j2se-project/1";>
<attribute default="${main.class}" name="name"/>
@@ -538,6 +836,7 @@
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}"
inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
<jvmarg line="${run.jvmargs}"/>
+ <jvmarg line="${run.jvmargs.ide}"/>
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -554,6 +853,7 @@
<macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1";>
<attribute default="${main.class}" name="classname"/>
<attribute default="${run.classpath}" name="classpath"/>
+ <attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" dir="${work.dir}" fork="true">
@@ -561,6 +861,7 @@
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}"
inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
<jvmarg line="${run.jvmargs}"/>
+ <jvmarg line="${run.jvmargs.ide}"/>
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -587,11 +888,14 @@
<path path="${run.classpath.without.build.classes.dir}"/>
<chainedmapper>
<flattenmapper/>
+ <filtermapper>
+ <replacestring from=" " to="%20"/>
+ </filtermapper>
<globmapper from="*" to="lib/*"/>
</chainedmapper>
</pathconvert>
<taskdef
classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs"
classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" index="${jar.index}"
indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}"
manifest="@{manifest}"
runtimeclasspath="${run.classpath.without.build.classes.dir}">
+ <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}">
<fileset dir="${build.classes.dir}"/>
<manifest>
<attribute name="Class-Path" value="${jar.classpath}"/>
@@ -632,7 +936,7 @@
<target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported"
name="-init-ap-cmdline">
<property name="ap.cmd.line.internal" value=""/>
</target>
- <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"/>
+ <target
depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline"
name="init"/>
<!--
===================
COMPILATION SECTION
@@ -890,7 +1194,11 @@
PROFILING SECTION
=================
-->
- <target depends="profile-init,compile" description="Profile a project in
the IDE." if="netbeans.home" name="profile">
+ <!--
+ pre NB7.2 profiler integration
+ -->
+ <target depends="profile-init,compile" description="Profile a project in
the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+ <fail unless="netbeans.home">This target only works when run from
inside the NetBeans IDE.</fail>
<nbprofiledirect>
<classpath>
<path path="${run.classpath}"/>
@@ -898,8 +1206,9 @@
</nbprofiledirect>
<profile/>
</target>
- <target depends="profile-init,compile-single" description="Profile a
selected class in the IDE." if="netbeans.home" name="profile-single">
+ <target depends="profile-init,compile-single" description="Profile a
selected class in the IDE." if="profiler.info.jvmargs.agent"
name="-profile-single-pre72">
<fail unless="profile.class">Must select one file in the IDE or set
profile.class</fail>
+ <fail unless="netbeans.home">This target only works when run from
inside the NetBeans IDE.</fail>
<nbprofiledirect>
<classpath>
<path path="${run.classpath}"/>
@@ -907,12 +1216,8 @@
</nbprofiledirect>
<profile classname="${profile.class}"/>
</target>
- <!--
- =========================
- APPLET PROFILING SECTION
- =========================
- -->
- <target depends="profile-init,compile-single" if="netbeans.home"
name="profile-applet">
+ <target depends="profile-init,compile-single"
if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
+ <fail unless="netbeans.home">This target only works when run from
inside the NetBeans IDE.</fail>
<nbprofiledirect>
<classpath>
<path path="${run.classpath}"/>
@@ -924,12 +1229,8 @@
</customize>
</profile>
</target>
- <!--
- =========================
- TESTS PROFILING SECTION
- =========================
- -->
- <target depends="profile-init,compile-test-single" if="netbeans.home"
name="profile-test-single">
+ <target depends="profile-init,compile-test-single"
if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+ <fail unless="netbeans.home">This target only works when run from
inside the NetBeans IDE.</fail>
<nbprofiledirect>
<classpath>
<path path="${run.test.classpath}"/>
@@ -952,148 +1253,194 @@
</junit>
</target>
<!--
+ end of pre NB72 profiling section
+ -->
+ <target if="netbeans.home" name="-profile-check">
+ <condition property="profiler.configured">
+ <or>
+ <contains casesensitive="true" string="${run.jvmargs.ide}"
substring="-agentpath:"/>
+ <contains casesensitive="true" string="${run.jvmargs.ide}"
substring="-javaagent:"/>
+ </or>
+ </condition>
+ </target>
+ <target depends="-profile-check,-profile-pre72" description="Profile a
project in the IDE." if="profiler.configured" name="profile"
unless="profiler.info.jvmargs.agent">
+ <startprofiler/>
+ <antcall target="run"/>
+ </target>
+ <target depends="-profile-check,-profile-single-pre72"
description="Profile a selected class in the IDE." if="profiler.configured"
name="profile-single" unless="profiler.info.jvmargs.agent">
+ <fail unless="run.class">Must select one file in the IDE or set
run.class</fail>
+ <startprofiler/>
+ <antcall target="run-single"/>
+ </target>
+ <target depends="-profile-test-single-pre72" description="Profile a
selected test in the IDE." name="profile-test-single"/>
+ <target depends="-profile-check" description="Profile a selected test in
the IDE." if="profiler.configured" name="profile-test"
unless="profiler.info.jvmargs">
+ <fail unless="test.includes">Must select some files in the IDE or set
test.includes</fail>
+ <startprofiler/>
+ <antcall target="test-single"/>
+ </target>
+ <target depends="-profile-check" description="Profile a selected class in
the IDE." if="profiler.configured" name="profile-test-with-main">
+ <fail unless="run.class">Must select one file in the IDE or set
run.class</fail>
+ <startprofiler/>
+ <antcal target="run-test-with-main"/>
+ </target>
+ <target depends="-profile-check,-profile-applet-pre72"
if="profiler.configured" name="profile-applet"
unless="profiler.info.jvmargs.agent">
+ <fail unless="applet.url">Must select one file in the IDE or set
applet.url</fail>
+ <startprofiler/>
+ <antcall target="run-applet"/>
+ </target>
+ <!--
===============
JAVADOC SECTION
===============
-->
<target depends="init" if="have.sources" name="-javadoc-build">
<mkdir dir="${dist.javadoc.dir}"/>
+ <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg"
value="-J${endorsed.classpath.cmd.line.arg}">
+ <and>
+ <isset property="endorsed.classpath.cmd.line.arg"/>
+ <not>
+ <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+ </not>
+ </and>
+ </condition>
<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}">
<classpath>
<path path="${javac.classpath}"/>
</classpath>
- <fileset dir="${src.core.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.core.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.apps.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.apps.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.emu.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.emu.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.install.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.install.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.test.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.test.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.driver.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.driver.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.fs.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.fs.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.test2.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.test2.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.awt.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.awt.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.desktop.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.desktop.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.driver2.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.driver2.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.font.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.font.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.test3.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.test3.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.thinlet.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.thinlet.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.driver3.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.driver3.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.net.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.net.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.test4.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.test4.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.shell.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.shell.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.test5.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.test5.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.driver4.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.driver4.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.sound.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.sound.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.test6.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.test6.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.textui.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.textui.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.driver5.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.driver5.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.nanoxml.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.nanoxml.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.icedtea.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.icedtea.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.mmtk-vm.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.mmtk-vm.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.com.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.com.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.java.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.java.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.javax.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.javax.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.org.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.org.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.sun.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.sun.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.vm.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.vm.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.test7.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.test7.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.vmmagic.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.vmmagic.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${src.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${configure.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${configure.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${ext.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${ext.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${gnu.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${gnu.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${java.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${java.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${javax.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${javax.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${tools.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${tools.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${vm.dir}" excludes="${excludes}"
includes="${includes}">
+ <fileset dir="${vm.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
<fileset dir="${build.generated.sources.dir}"
erroronmissingdir="false">
<include name="**/*.java"/>
+ <exclude name="*.java"/>
</fileset>
+ <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
<fileset dir="${src.core.dir}" excludes="${excludes}"
includes="${includes}">
@@ -1236,7 +1583,7 @@
<target depends="init,-javadoc-build,-javadoc-browse" description="Build
Javadoc." name="javadoc"/>
<!--
=========================
- JUNIT COMPILATION SECTION
+ TEST COMPILATION SECTION
=========================
-->
<target depends="init,compile" if="have.tests"
name="-pre-pre-compile-test">
@@ -1275,14 +1622,14 @@
<target
depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"
name="compile-test-single"/>
<!--
=======================
- JUNIT EXECUTION SECTION
+ TEST EXECUTION SECTION
=======================
-->
<target depends="init" if="have.tests" name="-pre-test-run">
<mkdir dir="${build.test.results.dir}"/>
</target>
<target depends="init,compile-test,-pre-test-run" if="have.tests"
name="-do-test-run">
- <j2seproject3:junit testincludes="**/*Test.java"/>
+ <j2seproject3:test testincludes="**/*Test.java"/>
</target>
<target depends="init,compile-test,-pre-test-run,-do-test-run"
if="have.tests" name="-post-test-run">
<fail if="tests.failed" unless="ignore.failing.tests">Some tests
failed; see details above.</fail>
@@ -1295,39 +1642,40 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single"
if="have.tests" name="-do-test-run-single">
<fail unless="test.includes">Must select some files in the IDE or set
test.includes</fail>
- <j2seproject3:junit excludes="" includes="${test.includes}"/>
+ <j2seproject3:test excludes="" includes="${test.includes}"
testincludes="${test.includes}"/>
</target>
<target
depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single"
if="have.tests" name="-post-test-run-single">
<fail if="tests.failed" unless="ignore.failing.tests">Some tests
failed; see details above.</fail>
</target>
<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"/>
+ <target depends="init,compile-test-single,-pre-test-run-single"
if="have.tests" name="-do-test-run-single-method">
+ <fail unless="test.class">Must select some files in the IDE or set
test.class</fail>
+ <fail unless="test.method">Must select some method in the IDE or set
test.method</fail>
+ <j2seproject3:test excludes="" includes="${javac.includes}"
testincludes="${test.class}" testmethods="${test.method}"/>
+ </target>
+ <target
depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method"
if="have.tests" name="-post-test-run-single-method">
+ <fail if="tests.failed" unless="ignore.failing.tests">Some tests
failed; see details above.</fail>
+ </target>
+ <target
depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method"
description="Run single unit test." name="test-single-method"/>
<!--
=======================
- JUNIT DEBUGGING SECTION
+ TEST DEBUGGING SECTION
=======================
-->
- <target depends="init,compile-test" if="have.tests"
name="-debug-start-debuggee-test">
+ <target depends="init,compile-test-single,-pre-test-run-single"
if="have.tests" name="-debug-start-debuggee-test">
<fail unless="test.class">Must select one file in the IDE or set
test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml"
name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <mkdir dir="${build.test.results.dir}"/>
- <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}">
- <customize>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg value="${test.class}"/>
- <arg value="showoutput=true"/>
- <arg
value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg
value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </j2seproject3:debug>
+ <j2seproject3:test-debug excludes="" includes="${javac.includes}"
testClass="${test.class}" testincludes="${javac.includes}"/>
</target>
+ <target depends="init,compile-test-single,-pre-test-run-single"
if="have.tests" name="-debug-start-debuggee-test-method">
+ <fail unless="test.class">Must select one file in the IDE or set
test.class</fail>
+ <fail unless="test.method">Must select some method in the IDE or set
test.method</fail>
+ <j2seproject3:test-debug excludes="" includes="${javac.includes}"
testClass="${test.class}" testMethod="${test.method}"
testincludes="${test.class}" testmethods="${test.method}"/>
+ </target>
<target depends="init,compile-test" if="netbeans.home+have.tests"
name="-debug-start-debugger-test">
<j2seproject1:nbjpdastart classpath="${debug.test.classpath}"
name="${test.class}"/>
</target>
<target
depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test"
name="debug-test"/>
+ <target
depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method"
name="debug-test-method"/>
<target depends="init,-pre-debug-fix,compile-test-single"
if="netbeans.home" name="-do-debug-fix-test">
<j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
</target>
@@ -1392,9 +1740,12 @@
<target name="-check-call-dep">
<property file="${call.built.properties}" prefix="already.built."/>
<condition property="should.call.dep">
- <not>
- <isset property="already.built.${call.subproject}"/>
- </not>
+ <and>
+ <not>
+ <isset property="already.built.${call.subproject}"/>
+ </not>
+ <available file="${call.script}"/>
+ </and>
</condition>
</target>
<target depends="-check-call-dep" if="should.call.dep"
name="-maybe-call-dep">
Modified: classlib6/netbeans/nbproject/genfiles.properties
===================================================================
--- classlib6/netbeans/nbproject/genfiles.properties 2012-08-19 13:34:02 UTC
(rev 5928)
+++ classlib6/netbeans/nbproject/genfiles.properties 2012-08-19 14:01:57 UTC
(rev 5929)
@@ -4,5 +4,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=bac8544f
-nbproject/build-impl.xml.script.CRC32=0b5a17db
-nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+nbproject/build-impl.xml.script.CRC32=c95597a5
+nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Jnode-svn-commits mailing list
Jnode-svn-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits
