Drobné netbeansovské změny
authorFrantišek Kučera <franta-hg@frantovo.cz>
Sat, 28 Feb 2009 16:57:28 +0100
changeset 141e8def54cbd
parent 0 0359f2c3b3ba
child 2 29fb34084b12
Drobné netbeansovské změny
java/JFTable/nbproject/build-impl.xml
java/JFTable/nbproject/genfiles.properties
     1.1 --- a/java/JFTable/nbproject/build-impl.xml	Sat Feb 28 16:51:54 2009 +0100
     1.2 +++ b/java/JFTable/nbproject/build-impl.xml	Sat Feb 28 16:57:28 2009 +0100
     1.3 @@ -19,7 +19,7 @@
     1.4    - cleanup
     1.5  
     1.6          -->
     1.7 -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" 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="JFTable-impl">
     1.8 +<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="JFTable-impl">
     1.9      <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
    1.10      <!-- 
    1.11                  ======================
    1.12 @@ -152,7 +152,7 @@
    1.13              <attribute default="${includes}" name="includes"/>
    1.14              <attribute default="${excludes}" name="excludes"/>
    1.15              <attribute default="${javac.debug}" name="debug"/>
    1.16 -            <attribute default="" name="sourcepath"/>
    1.17 +            <attribute default="/does/not/exist" name="sourcepath"/>
    1.18              <element name="customize" optional="true"/>
    1.19              <sequential>
    1.20                  <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
    1.21 @@ -218,13 +218,13 @@
    1.22              </sequential>
    1.23          </macrodef>
    1.24      </target>
    1.25 -    <target name="-init-macrodef-nbjpda">
    1.26 +    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
    1.27          <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
    1.28              <attribute default="${main.class}" name="name"/>
    1.29              <attribute default="${debug.classpath}" name="classpath"/>
    1.30              <attribute default="" name="stopclassname"/>
    1.31              <sequential>
    1.32 -                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
    1.33 +                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
    1.34                      <classpath>
    1.35                          <path path="@{classpath}"/>
    1.36                      </classpath>
    1.37 @@ -235,7 +235,9 @@
    1.38              <attribute default="${build.classes.dir}" name="dir"/>
    1.39              <sequential>
    1.40                  <nbjpdareload>
    1.41 -                    <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
    1.42 +                    <fileset dir="@{dir}" includes="${fix.classes}">
    1.43 +                        <include name="${fix.includes}*.class"/>
    1.44 +                    </fileset>
    1.45                  </nbjpdareload>
    1.46              </sequential>
    1.47          </macrodef>
    1.48 @@ -253,6 +255,12 @@
    1.49          <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
    1.50              <istrue value="${have-jdk-older-than-1.4}"/>
    1.51          </condition>
    1.52 +        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
    1.53 +            <os family="windows"/>
    1.54 +        </condition>
    1.55 +        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
    1.56 +            <isset property="debug.transport"/>
    1.57 +        </condition>
    1.58      </target>
    1.59      <target depends="-init-debug-args" name="-init-macrodef-debug">
    1.60          <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
    1.61 @@ -262,7 +270,7 @@
    1.62              <sequential>
    1.63                  <java classname="@{classname}" dir="${work.dir}" fork="true">
    1.64                      <jvmarg line="${debug-args-line}"/>
    1.65 -                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
    1.66 +                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
    1.67                      <jvmarg line="${run.jvmargs}"/>
    1.68                      <classpath>
    1.69                          <path path="@{classpath}"/>
    1.70 @@ -309,6 +317,13 @@
    1.71                  ===================
    1.72              -->
    1.73      <target depends="init" name="deps-jar" unless="no.deps"/>
    1.74 +    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
    1.75 +    <target depends="init" name="-check-automatic-build">
    1.76 +        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
    1.77 +    </target>
    1.78 +    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
    1.79 +        <antcall target="clean"/>
    1.80 +    </target>
    1.81      <target depends="init,deps-jar" name="-pre-pre-compile">
    1.82          <mkdir dir="${build.classes.dir}"/>
    1.83      </target>
    1.84 @@ -329,7 +344,7 @@
    1.85          <!-- Empty placeholder for easier customization. -->
    1.86          <!-- You can override this target in the ../build.xml file. -->
    1.87      </target>
    1.88 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
    1.89 +    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
    1.90      <target name="-pre-compile-single">
    1.91          <!-- Empty placeholder for easier customization. -->
    1.92          <!-- You can override this target in the ../build.xml file. -->
    1.93 @@ -343,7 +358,7 @@
    1.94          <!-- Empty placeholder for easier customization. -->
    1.95          <!-- You can override this target in the ../build.xml file. -->
    1.96      </target>
    1.97 -    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
    1.98 +    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
    1.99      <!--
   1.100                  ====================
   1.101                  JAR BUILDING SECTION
     2.1 --- a/java/JFTable/nbproject/genfiles.properties	Sat Feb 28 16:51:54 2009 +0100
     2.2 +++ b/java/JFTable/nbproject/genfiles.properties	Sat Feb 28 16:57:28 2009 +0100
     2.3 @@ -1,8 +1,8 @@
     2.4  build.xml.data.CRC32=18ffd276
     2.5 -build.xml.script.CRC32=1966b3ef
     2.6 -build.xml.stylesheet.CRC32=be360661
     2.7 +build.xml.script.CRC32=eadcb4a1
     2.8 +build.xml.stylesheet.CRC32=958a1d3e
     2.9  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    2.10  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    2.11  nbproject/build-impl.xml.data.CRC32=18ffd276
    2.12 -nbproject/build-impl.xml.script.CRC32=44ad41ff
    2.13 -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
    2.14 +nbproject/build-impl.xml.script.CRC32=76766879
    2.15 +nbproject/build-impl.xml.stylesheet.CRC32=65b8de21