Changeset 12749 for trunk/abcl/nbproject


Ignore:
Timestamp:
06/09/10 11:27:42 (12 years ago)
Author:
Mark Evenson
Message:

Undo previous commmit.

Location:
trunk/abcl/nbproject
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/nbproject/build-impl.xml

    r12748 r12749  
    2121        -->
    2222<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="abcl-impl">
     23    <fail message="Please build using Ant 1.7.1 or higher.">
     24        <condition>
     25            <not>
     26                <antversion atleast="1.7.1"/>
     27            </not>
     28        </condition>
     29    </fail>
    2330    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
    2431    <!--
     
    4956    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
    5057        <available file="${manifest.file}" property="manifest.available"/>
    51         <condition property="manifest.available+main.class">
     58        <condition property="main.class.available">
    5259            <and>
    53                 <isset property="manifest.available"/>
    5460                <isset property="main.class"/>
    5561                <not>
     
    5864            </and>
    5965        </condition>
     66        <condition property="manifest.available+main.class">
     67            <and>
     68                <isset property="manifest.available"/>
     69                <isset property="main.class.available"/>
     70            </and>
     71        </condition>
     72        <condition property="do.mkdist">
     73            <and>
     74                <isset property="libs.CopyLibs.classpath"/>
     75                <not>
     76                    <istrue value="${mkdist.disabled}"/>
     77                </not>
     78            </and>
     79        </condition>
    6080        <condition property="manifest.available+main.class+mkdist.available">
    6181            <and>
    6282                <istrue value="${manifest.available+main.class}"/>
    63                 <isset property="libs.CopyLibs.classpath"/>
     83                <isset property="do.mkdist"/>
    6484            </and>
     85        </condition>
     86        <condition property="manifest.available+mkdist.available">
     87            <and>
     88                <istrue value="${manifest.available}"/>
     89                <isset property="do.mkdist"/>
     90            </and>
     91        </condition>
     92        <condition property="manifest.available-mkdist.available">
     93            <or>
     94                <istrue value="${manifest.available}"/>
     95                <isset property="do.mkdist"/>
     96            </or>
     97        </condition>
     98        <condition property="manifest.available+main.class-mkdist.available">
     99            <or>
     100                <istrue value="${manifest.available+main.class}"/>
     101                <isset property="do.mkdist"/>
     102            </or>
    65103        </condition>
    66104        <condition property="have.tests">
     
    98136        <property name="application.args" value=""/>
    99137        <property name="source.encoding" value="${file.encoding}"/>
     138        <property name="runtime.encoding" value="${source.encoding}"/>
    100139        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
    101140            <and>
     
    113152            <istrue value="${do.depend}"/>
    114153        </condition>
    115         <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
    116             <and>
    117                 <isset property="jaxws.endorsed.dir"/>
    118                 <available file="nbproject/jaxws-build.xml"/>
    119             </and>
    120         </condition>
     154        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
     155        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
     156            <length length="0" string="${endorsed.classpath}" when="greater"/>
     157        </condition>
     158        <property name="javac.fork" value="false"/>
    121159    </target>
    122160    <target name="-post-init">
     
    153191            <attribute default="${excludes}" name="excludes"/>
    154192            <attribute default="${javac.debug}" name="debug"/>
    155             <attribute default="/does/not/exist" name="sourcepath"/>
     193            <attribute default="${empty.dir}" name="sourcepath"/>
     194            <attribute default="${empty.dir}" name="gensrcdir"/>
    156195            <element name="customize" optional="true"/>
    157196            <sequential>
    158                 <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}">
     197                <property location="${build.dir}/empty" name="empty.dir"/>
     198                <mkdir dir="${empty.dir}"/>
     199                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
     200                    <src>
     201                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
     202                            <include name="*"/>
     203                        </dirset>
     204                    </src>
    159205                    <classpath>
    160206                        <path path="@{classpath}"/>
    161207                    </classpath>
    162                     <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
     208                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
     209                    <compilerarg line="${javac.compilerargs}"/>
    163210                    <customize/>
    164211                </javac>
     
    199246            <attribute default="**" name="testincludes"/>
    200247            <sequential>
    201                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
     248                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}">
    202249                    <batchtest todir="${build.test.results.dir}">
    203250                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
     
    214261                    <formatter type="brief" usefile="false"/>
    215262                    <formatter type="xml"/>
     263                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    216264                    <jvmarg line="${run.jvmargs}"/>
    217265                </junit>
     
    270318            <sequential>
    271319                <java classname="@{classname}" dir="${work.dir}" fork="true">
     320                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    272321                    <jvmarg line="${debug-args-line}"/>
    273322                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
     323                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
     324                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
    274325                    <jvmarg line="${run.jvmargs}"/>
    275326                    <classpath>
     
    288339        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
    289340            <attribute default="${main.class}" name="classname"/>
     341            <attribute default="${run.classpath}" name="classpath"/>
    290342            <element name="customize" optional="true"/>
    291343            <sequential>
    292344                <java classname="@{classname}" dir="${work.dir}" fork="true">
     345                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
     346                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
     347                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
    293348                    <jvmarg line="${run.jvmargs}"/>
    294349                    <classpath>
    295                         <path path="${run.classpath}"/>
     350                        <path path="@{classpath}"/>
    296351                    </classpath>
    297352                    <syspropertyset>
     
    317372                ===================
    318373            -->
    319     <target depends="init" name="deps-jar" unless="no.deps"/>
     374    <target name="-deps-jar-init" unless="built-jar.properties">
     375        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
     376        <delete file="${built-jar.properties}" quiet="true"/>
     377    </target>
     378    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
     379        <echo level="warn" message="Cycle detected: abcl was already built"/>
     380    </target>
     381    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
     382        <mkdir dir="${build.dir}"/>
     383        <touch file="${built-jar.properties}" verbose="false"/>
     384        <property file="${built-jar.properties}" prefix="already.built.jar."/>
     385        <antcall target="-warn-already-built-jar"/>
     386        <propertyfile file="${built-jar.properties}">
     387            <entry key="${basedir}" value=""/>
     388        </propertyfile>
     389    </target>
    320390    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
    321391    <target depends="init" name="-check-automatic-build">
     
    333403    </target>
    334404    <target if="do.depend.true" name="-compile-depend">
    335         <j2seproject3:depend/>
     405        <pathconvert property="build.generated.subdirs">
     406            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
     407                <include name="*"/>
     408            </dirset>
     409        </pathconvert>
     410        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
    336411    </target>
    337412    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
    338         <j2seproject3:javac/>
     413        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
    339414        <copy todir="${build.classes.dir}">
    340415            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
     
    353428        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    354429        <j2seproject3:force-recompile/>
    355         <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
     430        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
    356431    </target>
    357432    <target name="-post-compile-single">
     
    373448        <!-- You can override this target in the ../build.xml file. -->
    374449    </target>
    375     <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
     450    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
    376451        <j2seproject1:jar/>
    377452    </target>
    378     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
     453    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
    379454        <j2seproject1:jar manifest="${manifest.file}"/>
    380455    </target>
     
    419494        <echo>java -jar "${dist.jar.resolved}"</echo>
    420495    </target>
     496    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available">
     497        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
     498        <pathconvert property="run.classpath.without.build.classes.dir">
     499            <path path="${run.classpath}"/>
     500            <map from="${build.classes.dir.resolved}" to=""/>
     501        </pathconvert>
     502        <pathconvert pathsep=" " property="jar.classpath">
     503            <path path="${run.classpath.without.build.classes.dir}"/>
     504            <chainedmapper>
     505                <flattenmapper/>
     506                <globmapper from="*" to="lib/*"/>
     507            </chainedmapper>
     508        </pathconvert>
     509        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
     510        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
     511            <fileset dir="${build.classes.dir}"/>
     512            <manifest>
     513                <attribute name="Class-Path" value="${jar.classpath}"/>
     514            </manifest>
     515        </copylibs>
     516    </target>
     517    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available">
     518        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
     519        <pathconvert property="run.classpath.without.build.classes.dir">
     520            <path path="${run.classpath}"/>
     521            <map from="${build.classes.dir.resolved}" to=""/>
     522        </pathconvert>
     523        <pathconvert pathsep=" " property="jar.classpath">
     524            <path path="${run.classpath.without.build.classes.dir}"/>
     525            <chainedmapper>
     526                <flattenmapper/>
     527                <globmapper from="*" to="lib/*"/>
     528            </chainedmapper>
     529        </pathconvert>
     530        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
     531        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
     532            <fileset dir="${build.classes.dir}"/>
     533            <manifest>
     534                <attribute name="Class-Path" value="${jar.classpath}"/>
     535            </manifest>
     536        </copylibs>
     537    </target>
    421538    <target name="-post-jar">
    422539        <!-- Empty placeholder for easier customization. -->
    423540        <!-- You can override this target in the ../build.xml file. -->
    424541    </target>
    425     <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
     542    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/>
    426543    <!--
    427544                =================
     
    439556        <property name="javac.includes.binary" value=""/>
    440557    </target>
    441     <target depends="init,-do-not-recompile,compile-single" name="run-single">
     558    <target depends="init,compile-single" name="run-single">
    442559        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
    443560        <j2seproject1:java classname="${run.class}"/>
     561    </target>
     562    <target depends="init,compile-test-single" name="run-test-with-main">
     563        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
     564        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
    444565    </target>
    445566    <!--
     
    450571    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
    451572        <j2seproject1:nbjpdastart name="${debug.class}"/>
     573    </target>
     574    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
     575        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
    452576    </target>
    453577    <target depends="init,compile" name="-debug-start-debuggee">
     
    467591        <j2seproject3:debug classname="${debug.class}"/>
    468592    </target>
    469     <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
     593    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
     594    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
     595        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
     596        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
     597    </target>
     598    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
    470599    <target depends="init" name="-pre-debug-fix">
    471600        <fail unless="fix.includes">Must set fix.includes</fail>
     
    490619                <filename name="**/*.java"/>
    491620            </fileset>
     621            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
     622                <include name="**/*.java"/>
     623            </fileset>
    492624        </javadoc>
    493625    </target>
     
    551683    </target>
    552684    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
    553         <fail if="tests.failed">Some tests failed; see details above.</fail>
     685        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
    554686    </target>
    555687    <target depends="init" if="have.tests" name="test-report"/>
     
    564696    </target>
    565697    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
    566         <fail if="tests.failed">Some tests failed; see details above.</fail>
    567     </target>
    568     <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"/>
     698        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     699    </target>
     700    <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"/>
    569701    <!--
    570702                =======================
     
    593725        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
    594726    </target>
    595     <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
     727    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
    596728    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
    597729        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     
    630762                ===============
    631763            -->
    632     <target depends="init" name="deps-clean" unless="no.deps"/>
     764    <target name="-deps-clean-init" unless="built-clean.properties">
     765        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
     766        <delete file="${built-clean.properties}" quiet="true"/>
     767    </target>
     768    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
     769        <echo level="warn" message="Cycle detected: abcl was already built"/>
     770    </target>
     771    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
     772        <mkdir dir="${build.dir}"/>
     773        <touch file="${built-clean.properties}" verbose="false"/>
     774        <property file="${built-clean.properties}" prefix="already.built.clean."/>
     775        <antcall target="-warn-already-built-clean"/>
     776        <propertyfile file="${built-clean.properties}">
     777            <entry key="${basedir}" value=""/>
     778        </propertyfile>
     779    </target>
    633780    <target depends="init" name="-do-clean">
    634781        <delete dir="${build.dir}"/>
    635         <delete dir="${dist.dir}"/>
     782        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
    636783    </target>
    637784    <target name="-post-clean">
     
    640787    </target>
    641788    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
     789    <target name="-check-call-dep">
     790        <property file="${call.built.properties}" prefix="already.built."/>
     791        <condition property="should.call.dep">
     792            <not>
     793                <isset property="already.built.${call.subproject}"/>
     794            </not>
     795        </condition>
     796    </target>
     797    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
     798        <ant antfile="${call.script}" inheritall="false" target="${call.target}">
     799            <propertyset>
     800                <propertyref prefix="transfer."/>
     801                <mapper from="transfer.*" to="*" type="glob"/>
     802            </propertyset>
     803        </ant>
     804    </target>
    642805</project>
  • trunk/abcl/nbproject/genfiles.properties

    r12748 r12749  
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    66nbproject/build-impl.xml.data.CRC32=742204ce
    7 nbproject/build-impl.xml.script.CRC32=b7bf05a5
    8 nbproject/build-impl.xml.stylesheet.CRC32=65b8de21
     7nbproject/build-impl.xml.script.CRC32=29122cc4
     8nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45
    99nbproject/profiler-build-impl.xml.data.CRC32=71623fcd
    1010nbproject/profiler-build-impl.xml.script.CRC32=abda56ed
Note: See TracChangeset for help on using the changeset viewer.