1.1 --- a/java/SuperDAO/nbproject/build-impl.xml Mon Oct 06 09:36:27 2008 +0200
1.2 +++ b/java/SuperDAO/nbproject/build-impl.xml Sun Nov 23 23:10:04 2008 +0100
1.3 @@ -218,13 +218,13 @@
1.4 </sequential>
1.5 </macrodef>
1.6 </target>
1.7 - <target name="-init-macrodef-nbjpda">
1.8 + <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
1.9 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
1.10 <attribute default="${main.class}" name="name"/>
1.11 <attribute default="${debug.classpath}" name="classpath"/>
1.12 <attribute default="" name="stopclassname"/>
1.13 <sequential>
1.14 - <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
1.15 + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
1.16 <classpath>
1.17 <path path="@{classpath}"/>
1.18 </classpath>
1.19 @@ -255,6 +255,12 @@
1.20 <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
1.21 <istrue value="${have-jdk-older-than-1.4}"/>
1.22 </condition>
1.23 + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
1.24 + <os family="windows"/>
1.25 + </condition>
1.26 + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
1.27 + <isset property="debug.transport"/>
1.28 + </condition>
1.29 </target>
1.30 <target depends="-init-debug-args" name="-init-macrodef-debug">
1.31 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
1.32 @@ -264,7 +270,7 @@
1.33 <sequential>
1.34 <java classname="@{classname}" dir="${work.dir}" fork="true">
1.35 <jvmarg line="${debug-args-line}"/>
1.36 - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
1.37 + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.38 <jvmarg line="${run.jvmargs}"/>
1.39 <classpath>
1.40 <path path="@{classpath}"/>
1.41 @@ -311,6 +317,13 @@
1.42 ===================
1.43 -->
1.44 <target depends="init" name="deps-jar" unless="no.deps"/>
1.45 + <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
1.46 + <target depends="init" name="-check-automatic-build">
1.47 + <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
1.48 + </target>
1.49 + <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
1.50 + <antcall target="clean"/>
1.51 + </target>
1.52 <target depends="init,deps-jar" name="-pre-pre-compile">
1.53 <mkdir dir="${build.classes.dir}"/>
1.54 </target>
1.55 @@ -331,7 +344,7 @@
1.56 <!-- Empty placeholder for easier customization. -->
1.57 <!-- You can override this target in the ../build.xml file. -->
1.58 </target>
1.59 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
1.60 + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
1.61 <target name="-pre-compile-single">
1.62 <!-- Empty placeholder for easier customization. -->
1.63 <!-- You can override this target in the ../build.xml file. -->
1.64 @@ -345,7 +358,7 @@
1.65 <!-- Empty placeholder for easier customization. -->
1.66 <!-- You can override this target in the ../build.xml file. -->
1.67 </target>
1.68 - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
1.69 + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
1.70 <!--
1.71 ====================
1.72 JAR BUILDING SECTION