| @@ -558,7 +558,8 @@ |
| <formatter type="brief" usefile="false"/> |
| <formatter type="xml"/> |
| <jvmarg value="-ea"/> |
| - <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg line="${debug-args-line}"/> |
| + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| <customize/> |
| </junit> |
| </sequential> |
| @@ -590,7 +591,8 @@ |
| <formatter type="xml"/> |
| <jvmarg value="-ea"/> |
| <jvmarg line="${run.jvmargs.ide}"/> |
| - <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg line="${debug-args-line}"/> |
| + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| <customize/> |
| </junit> |
| </sequential> |
| @@ -748,6 +750,18 @@ |
| </macrodef> |
| </target> |
| <target name="-init-debug-args"> |
| + <property name="version-output" value="java version "${ant.java.version}"/> |
| + <condition property="have-jdk-older-than-1.4"> |
| + <or> |
| + <contains string="${version-output}" substring="java version "1.0"/> |
| + <contains string="${version-output}" substring="java version "1.1"/> |
| + <contains string="${version-output}" substring="java version "1.2"/> |
| + <contains string="${version-output}" substring="java version "1.3"/> |
| + </or> |
| + </condition> |
| + <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> |
| + <istrue value="${have-jdk-older-than-1.4}"/> |
| + </condition> |
| <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> |
| <os family="windows"/> |
| </condition> |
| @@ -764,7 +778,8 @@ |
| <sequential> |
| <java classname="@{classname}" fork="true"> |
| <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
| - <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg line="${debug-args-line}"/> |
| + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| <jvmarg line="${runmain.jvmargs}"/> |
| <classpath> |
| <path path="@{classpath}"/> |
| @@ -4,8 +4,8 @@ |
| # 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=776908d9 |
| -nbproject/build-impl.xml.script.CRC32=e76cd9d8 |
| -nbproject/build-impl.xml.stylesheet.CRC32=58472a1d@1.82.0.1 |
| +nbproject/build-impl.xml.script.CRC32=b9c746d1 |
| +nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 |
| nbproject/rest-build.xml.data.CRC32=bff4a8fe |
| nbproject/rest-build.xml.script.CRC32=4734534b |
| nbproject/rest-build.xml.stylesheet.CRC32=5f13befe@1.21 |