Merge
authorJaroslav Tulach <jtulach@netbeans.org>
Sat, 14 Jun 2008 09:50:29 +0200
changeset 4eafdd59d4ae0
parent 3 b44baa125b38
child 5 d7c5ff8acd72
Merge
samples/friendpackage/nbproject/build-impl.xml
     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:29 2008 +0200
     1.3 @@ -408,7 +408,10 @@
     1.4              </customize>
     1.5          </j2seproject1:java>
     1.6      </target>
     1.7 -    <target depends="init,compile" name="run-single">
     1.8 +    <target name="-do-not-recompile">
     1.9 +        <property name="javac.includes.binary" value=""/>
    1.10 +    </target>
    1.11 +    <target depends="init,-do-not-recompile,compile-single" name="run-single">
    1.12          <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
    1.13          <j2seproject1:java classname="${run.class}"/>
    1.14      </target>
    1.15 @@ -436,7 +439,7 @@
    1.16          <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
    1.17          <j2seproject3:debug classname="${debug.class}"/>
    1.18      </target>
    1.19 -    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
    1.20 +    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
    1.21      <target depends="init" name="-pre-debug-fix">
    1.22          <fail unless="fix.includes">Must set fix.includes</fail>
    1.23          <property name="javac.includes" value="${fix.includes}.java"/>
    1.24 @@ -533,7 +536,7 @@
    1.25      <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
    1.26          <fail if="tests.failed">Some tests failed; see details above.</fail>
    1.27      </target>
    1.28 -    <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.29 +    <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.30      <!--
    1.31                  =======================
    1.32                  JUNIT DEBUGGING SECTION
    1.33 @@ -560,7 +563,7 @@
    1.34      <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
    1.35          <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
    1.36      </target>
    1.37 -    <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
    1.38 +    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
    1.39      <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
    1.40          <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
    1.41      </target>