Changeset 19


Ignore:
Timestamp:
Jun 16, 2010, 8:13:19 PM (15 years ago)
Author:
fmguler
Message:

Netbeans 6.9 Geçişi.

Location:
trunk/fmgVen/nbproject
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/fmgVen/nbproject/build-impl.xml

    r11 r19  
    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="fmgVen-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    <!--  
    … …  
    3643        <property file="nbproject/private/private.properties"/> 
    3744    </target> 
    38     <target depends="-pre-init,-init-private" name="-init-libraries"> 
    39         <property location=".\lib\nblibraries.properties" name="libraries.1.path"/> 
    40         <dirname file="${libraries.1.path}" property="libraries.1.dir.nativedirsep"/> 
    41         <pathconvert dirsep="/" property="libraries.1.dir"> 
    42             <path path="${libraries.1.dir.nativedirsep}"/> 
     45    <target name="-pre-init-libraries"> 
     46        <property location=".\lib\nblibraries.properties" name="libraries.path"/> 
     47        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/> 
     48        <pathconvert dirsep="/" property="libraries.dir"> 
     49            <path path="${libraries.dir.nativedirsep}"/> 
    4350        </pathconvert> 
    44         <basename file="${libraries.1.path}" property="libraries.1.basename" suffix=".properties"/> 
    45         <touch file="${libraries.1.dir}/${libraries.1.basename}-private.properties"/> 
    46         <loadproperties srcfile="${libraries.1.dir}/${libraries.1.basename}-private.properties"> 
     51        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/> 
     52        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/> 
     53    </target> 
     54    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries"> 
     55        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties"> 
    4756            <filterchain> 
    48                 <replacestring from="$${base}" to="${libraries.1.dir}"/> 
     57                <replacestring from="$${base}" to="${libraries.dir}"/> 
     58                <escapeunicode/> 
    4959            </filterchain> 
    5060        </loadproperties> 
    51         <loadproperties srcfile="${libraries.1.path}"> 
     61    </target> 
     62    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries"> 
     63        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}"> 
    5264            <filterchain> 
    53                 <replacestring from="$${base}" to="${libraries.1.dir}"/> 
     65                <replacestring from="$${base}" to="${libraries.dir}"/> 
     66                <escapeunicode/> 
    5467            </filterchain> 
    5568        </loadproperties> 
    … …  
    6881    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init"> 
    6982        <available file="${manifest.file}" property="manifest.available"/> 
    70         <condition property="manifest.available+main.class"> 
    71             <and> 
    72                 <isset property="manifest.available"/> 
     83        <available file="${application.splash}" property="splashscreen.available"/> 
     84        <condition property="main.class.available"> 
     85            <and> 
    7386                <isset property="main.class"/> 
    7487                <not> 
    … …  
    7790            </and> 
    7891        </condition> 
     92        <condition property="manifest.available+main.class"> 
     93            <and> 
     94                <isset property="manifest.available"/> 
     95                <isset property="main.class.available"/> 
     96            </and> 
     97        </condition> 
     98        <condition property="do.mkdist"> 
     99            <and> 
     100                <isset property="libs.CopyLibs.classpath"/> 
     101                <not> 
     102                    <istrue value="${mkdist.disabled}"/> 
     103                </not> 
     104            </and> 
     105        </condition> 
    79106        <condition property="manifest.available+main.class+mkdist.available"> 
    80107            <and> 
    81108                <istrue value="${manifest.available+main.class}"/> 
    82                 <isset property="libs.CopyLibs.classpath"/> 
     109                <isset property="do.mkdist"/> 
     110            </and> 
     111        </condition> 
     112        <condition property="manifest.available+main.class+mkdist.available+splashscreen.available"> 
     113            <and> 
     114                <istrue value="${manifest.available+main.class+mkdist.available}"/> 
     115                <istrue value="${splashscreen.available}"/> 
     116            </and> 
     117        </condition> 
     118        <condition property="do.archive"> 
     119            <not> 
     120                <istrue value="${jar.archive.disabled}"/> 
     121            </not> 
     122        </condition> 
     123        <condition property="do.archive+manifest.available"> 
     124            <and> 
     125                <isset property="manifest.available"/> 
     126                <istrue value="${do.archive}"/> 
     127            </and> 
     128        </condition> 
     129        <condition property="do.archive+manifest.available+main.class"> 
     130            <and> 
     131                <istrue value="${manifest.available+main.class}"/> 
     132                <istrue value="${do.archive}"/> 
     133            </and> 
     134        </condition> 
     135        <condition property="do.archive+manifest.available+main.class+mkdist.available"> 
     136            <and> 
     137                <istrue value="${manifest.available+main.class+mkdist.available}"/> 
     138                <istrue value="${do.archive}"/> 
     139            </and> 
     140        </condition> 
     141        <condition property="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available"> 
     142            <and> 
     143                <istrue value="${manifest.available+main.class+mkdist.available+splashscreen.available}"/> 
     144                <istrue value="${do.archive}"/> 
    83145            </and> 
    84146        </condition> 
    … …  
    117179        <property name="application.args" value=""/> 
    118180        <property name="source.encoding" value="${file.encoding}"/> 
     181        <property name="runtime.encoding" value="${source.encoding}"/> 
    119182        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
    120183            <and> 
    … …  
    132195            <istrue value="${do.depend}"/> 
    133196        </condition> 
    134         <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> 
    135             <and> 
    136                 <isset property="jaxws.endorsed.dir"/> 
    137                 <available file="nbproject/jaxws-build.xml"/> 
    138             </and> 
    139         </condition> 
     197        <path id="endorsed.classpath.path" path="${endorsed.classpath}"/> 
     198        <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'"> 
     199            <length length="0" string="${endorsed.classpath}" when="greater"/> 
     200        </condition> 
     201        <property name="javac.fork" value="false"/> 
     202        <property name="jar.index" value="false"/> 
     203        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> 
    140204    </target> 
    141205    <target name="-post-init"> 
    … …  
    164228        </macrodef> 
    165229    </target> 
    166     <target name="-init-macrodef-javac"> 
     230    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors"> 
    167231        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> 
    168232            <attribute default="${src.dir}" name="srcdir"/> 
    169233            <attribute default="${build.classes.dir}" name="destdir"/> 
    170234            <attribute default="${javac.classpath}" name="classpath"/> 
     235            <attribute default="${javac.processorpath}" name="processorpath"/> 
     236            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> 
    171237            <attribute default="${includes}" name="includes"/> 
    172238            <attribute default="${excludes}" name="excludes"/> 
    173239            <attribute default="${javac.debug}" name="debug"/> 
    174             <attribute default="" name="sourcepath"/> 
     240            <attribute default="${empty.dir}" name="sourcepath"/> 
     241            <attribute default="${empty.dir}" name="gensrcdir"/> 
    175242            <element name="customize" optional="true"/> 
    176243            <sequential> 
    177                 <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}"> 
     244                <property location="${build.dir}/empty" name="empty.dir"/> 
     245                <mkdir dir="${empty.dir}"/> 
     246                <mkdir dir="@{apgeneratedsrcdir}"/> 
     247                <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}"> 
     248                    <src> 
     249                        <dirset dir="@{gensrcdir}" erroronmissingdir="false"> 
     250                            <include name="*"/> 
     251                        </dirset> 
     252                    </src> 
    178253                    <classpath> 
    179254                        <path path="@{classpath}"/> 
    180255                    </classpath> 
    181                     <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> 
     256                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> 
     257                    <compilerarg line="${javac.compilerargs}"/> 
     258                    <compilerarg value="-processorpath"/> 
     259                    <compilerarg path="@{processorpath}:${empty.dir}"/> 
     260                    <compilerarg line="${ap.processors.internal}"/> 
     261                    <compilerarg line="${annotation.processing.processor.options}"/> 
     262                    <compilerarg value="-s"/> 
     263                    <compilerarg path="@{apgeneratedsrcdir}"/> 
     264                    <compilerarg line="${ap.proc.none.internal}"/> 
    182265                    <customize/> 
    183266                </javac> 
    184267            </sequential> 
    185268        </macrodef> 
     269    </target> 
     270    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal"> 
     271        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3"> 
     272            <attribute default="${src.dir}" name="srcdir"/> 
     273            <attribute default="${build.classes.dir}" name="destdir"/> 
     274            <attribute default="${javac.classpath}" name="classpath"/> 
     275            <attribute default="${javac.processorpath}" name="processorpath"/> 
     276            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/> 
     277            <attribute default="${includes}" name="includes"/> 
     278            <attribute default="${excludes}" name="excludes"/> 
     279            <attribute default="${javac.debug}" name="debug"/> 
     280            <attribute default="${empty.dir}" name="sourcepath"/> 
     281            <attribute default="${empty.dir}" name="gensrcdir"/> 
     282            <element name="customize" optional="true"/> 
     283            <sequential> 
     284                <property location="${build.dir}/empty" name="empty.dir"/> 
     285                <mkdir dir="${empty.dir}"/> 
     286                <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}"> 
     287                    <src> 
     288                        <dirset dir="@{gensrcdir}" erroronmissingdir="false"> 
     289                            <include name="*"/> 
     290                        </dirset> 
     291                    </src> 
     292                    <classpath> 
     293                        <path path="@{classpath}"/> 
     294                    </classpath> 
     295                    <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> 
     296                    <compilerarg line="${javac.compilerargs}"/> 
     297                    <customize/> 
     298                </javac> 
     299            </sequential> 
     300        </macrodef> 
     301    </target> 
     302    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac"> 
    186303        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3"> 
    187304            <attribute default="${src.dir}" name="srcdir"/> 
    … …  
    218335            <attribute default="**" name="testincludes"/> 
    219336            <sequential> 
    220                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> 
     337                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> 
    221338                    <batchtest todir="${build.test.results.dir}"> 
    222339                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
    … …  
    233350                    <formatter type="brief" usefile="false"/> 
    234351                    <formatter type="xml"/> 
     352                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    235353                    <jvmarg line="${run.jvmargs}"/> 
    236354                </junit> 
    … …  
    289407            <sequential> 
    290408                <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     409                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    291410                    <jvmarg line="${debug-args-line}"/> 
    292411                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> 
     412                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
     413                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> 
    293414                    <jvmarg line="${run.jvmargs}"/> 
    294415                    <classpath> 
    … …  
    307428        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    308429            <attribute default="${main.class}" name="classname"/> 
     430            <attribute default="${run.classpath}" name="classpath"/> 
    309431            <element name="customize" optional="true"/> 
    310432            <sequential> 
    311433                <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     434                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
     435                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
     436                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> 
    312437                    <jvmarg line="${run.jvmargs}"/> 
    313438                    <classpath> 
    314                         <path path="${run.classpath}"/> 
     439                        <path path="@{classpath}"/> 
    315440                    </classpath> 
    316441                    <syspropertyset> 
    … …  
    323448        </macrodef> 
    324449    </target> 
     450    <target name="-init-macrodef-copylibs"> 
     451        <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3"> 
     452            <element name="customize" optional="true"/> 
     453            <sequential> 
     454                <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> 
     455                <pathconvert property="run.classpath.without.build.classes.dir"> 
     456                    <path path="${run.classpath}"/> 
     457                    <map from="${build.classes.dir.resolved}" to=""/> 
     458                </pathconvert> 
     459                <pathconvert pathsep=" " property="jar.classpath"> 
     460                    <path path="${run.classpath.without.build.classes.dir}"/> 
     461                    <chainedmapper> 
     462                        <flattenmapper/> 
     463                        <globmapper from="*" to="lib/*"/> 
     464                    </chainedmapper> 
     465                </pathconvert> 
     466                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
     467                <copylibs compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
     468                    <fileset dir="${build.classes.dir}"/> 
     469                    <manifest> 
     470                        <attribute name="Class-Path" value="${jar.classpath}"/> 
     471                        <customize/> 
     472                    </manifest> 
     473                </copylibs> 
     474            </sequential> 
     475        </macrodef> 
     476    </target> 
    325477    <target name="-init-presetdef-jar"> 
    326478        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    327             <jar compress="${jar.compress}" jarfile="${dist.jar}"> 
     479            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> 
    328480                <j2seproject1:fileset dir="${build.classes.dir}"/> 
    329481            </jar> 
    330482        </presetdef> 
    331483    </target> 
    332     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/> 
     484    <target name="-init-ap-cmdline-properties"> 
     485        <property name="annotation.processing.enabled" value="true"/> 
     486        <property name="annotation.processing.processors.list" value=""/> 
     487        <property name="annotation.processing.processor.options" value=""/> 
     488        <property name="annotation.processing.run.all.processors" value="true"/> 
     489        <property name="javac.processorpath" value="${javac.classpath}"/> 
     490        <property name="javac.test.processorpath" value="${javac.test.classpath}"/> 
     491        <condition property="ap.supported.internal" value="true"> 
     492            <not> 
     493                <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/> 
     494            </not> 
     495        </condition> 
     496    </target> 
     497    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported"> 
     498        <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}"> 
     499            <isfalse value="${annotation.processing.run.all.processors}"/> 
     500        </condition> 
     501        <condition else="" property="ap.proc.none.internal" value="-proc:none"> 
     502            <isfalse value="${annotation.processing.enabled}"/> 
     503        </condition> 
     504    </target> 
     505    <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline"> 
     506        <property name="ap.cmd.line.internal" value=""/> 
     507    </target> 
     508    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/> 
    333509    <!-- 
    334510                =================== 
    … …  
    336512                =================== 
    337513            --> 
    338     <target depends="init" name="deps-jar" unless="no.deps"/> 
     514    <target name="-deps-jar-init" unless="built-jar.properties"> 
     515        <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/> 
     516        <delete file="${built-jar.properties}" quiet="true"/> 
     517    </target> 
     518    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> 
     519        <echo level="warn" message="Cycle detected: fmgVen was already built"/> 
     520    </target> 
     521    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> 
     522        <mkdir dir="${build.dir}"/> 
     523        <touch file="${built-jar.properties}" verbose="false"/> 
     524        <property file="${built-jar.properties}" prefix="already.built.jar."/> 
     525        <antcall target="-warn-already-built-jar"/> 
     526        <propertyfile file="${built-jar.properties}"> 
     527            <entry key="${basedir}" value=""/> 
     528        </propertyfile> 
     529    </target> 
    339530    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> 
    340531    <target depends="init" name="-check-automatic-build"> 
    … …  
    352543    </target> 
    353544    <target if="do.depend.true" name="-compile-depend"> 
    354         <j2seproject3:depend/> 
    355     </target> 
    356     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> 
    357         <j2seproject3:javac/> 
     545        <pathconvert property="build.generated.subdirs"> 
     546            <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false"> 
     547                <include name="*"/> 
     548            </dirset> 
     549        </pathconvert> 
     550        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/> 
     551    </target> 
     552    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile"> 
     553        <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> 
    358554        <copy todir="${build.classes.dir}"> 
    359555            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> 
    360556        </copy> 
    361557    </target> 
     558    <target if="has.persistence.xml" name="-copy-persistence-xml"> 
     559        <mkdir dir="${build.classes.dir}/META-INF"/> 
     560        <copy todir="${build.classes.dir}/META-INF"> 
     561            <fileset dir="${meta.inf.dir}" includes="persistence.xml"/> 
     562        </copy> 
     563    </target> 
    362564    <target name="-post-compile"> 
    363565        <!-- Empty placeholder for easier customization. --> 
    … …  
    372574        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 
    373575        <j2seproject3:force-recompile/> 
    374         <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/> 
     576        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/> 
    375577    </target> 
    376578    <target name="-post-compile-single"> 
    … …  
    392594        <!-- You can override this target in the ../build.xml file. --> 
    393595    </target> 
    394     <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available"> 
     596    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available"> 
    395597        <j2seproject1:jar/> 
    396598    </target> 
    397     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> 
     599    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> 
    398600        <j2seproject1:jar manifest="${manifest.file}"/> 
    399601    </target> 
    400     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> 
     602    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> 
    401603        <j2seproject1:jar manifest="${manifest.file}"> 
    402604            <j2seproject1:manifest> 
    … …  
    413615        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> 
    414616    </target> 
    415     <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries"> 
    416         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> 
    417         <pathconvert property="run.classpath.without.build.classes.dir"> 
    418             <path path="${run.classpath}"/> 
    419             <map from="${build.classes.dir.resolved}" to=""/> 
    420         </pathconvert> 
    421         <pathconvert pathsep=" " property="jar.classpath"> 
    422             <path path="${run.classpath.without.build.classes.dir}"/> 
    423             <chainedmapper> 
    424                 <flattenmapper/> 
    425                 <globmapper from="*" to="lib/*"/> 
    426             </chainedmapper> 
    427         </pathconvert> 
    428         <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    429         <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
    430             <fileset dir="${build.classes.dir}"/> 
    431             <manifest> 
     617    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available+splashscreen.available" name="-do-jar-with-libraries-and-splashscreen"> 
     618        <basename file="${application.splash}" property="splashscreen.basename"/> 
     619        <mkdir dir="${build.classes.dir}/META-INF"/> 
     620        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 
     621        <j2seproject3:copylibs> 
     622            <customize> 
    432623                <attribute name="Main-Class" value="${main.class}"/> 
    433                 <attribute name="Class-Path" value="${jar.classpath}"/> 
    434             </manifest> 
    435         </copylibs> 
     624                <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 
     625            </customize> 
     626        </j2seproject3:copylibs> 
    436627        <echo>To run this application from the command line without Ant, try:</echo> 
    437628        <property location="${dist.jar}" name="dist.jar.resolved"/> 
    438629        <echo>java -jar "${dist.jar.resolved}"</echo> 
    439630    </target> 
     631    <target depends="init,compile,-pre-pre-jar,-pre-jar,-init-macrodef-copylibs" if="do.archive+manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries" unless="splashscreen.available"> 
     632        <j2seproject3:copylibs> 
     633            <customize> 
     634                <attribute name="Main-Class" value="${main.class}"/> 
     635            </customize> 
     636        </j2seproject3:copylibs> 
     637        <echo>To run this application from the command line without Ant, try:</echo> 
     638        <property location="${dist.jar}" name="dist.jar.resolved"/> 
     639        <echo>java -jar "${dist.jar.resolved}"</echo> 
     640    </target> 
    440641    <target name="-post-jar"> 
    441642        <!-- Empty placeholder for easier customization. --> 
    442643        <!-- You can override this target in the ../build.xml file. --> 
    443644    </target> 
    444     <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"/> 
     645    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries-and-splashscreen,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/> 
    445646    <!-- 
    446647                ================= 
    … …  
    458659        <property name="javac.includes.binary" value=""/> 
    459660    </target> 
    460     <target depends="init,-do-not-recompile,compile-single" name="run-single"> 
     661    <target depends="init,compile-single" name="run-single"> 
    461662        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    462663        <j2seproject1:java classname="${run.class}"/> 
     664    </target> 
     665    <target depends="init,compile-test-single" name="run-test-with-main"> 
     666        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
     667        <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/> 
    463668    </target> 
    464669    <!-- 
    … …  
    469674    <target depends="init" if="netbeans.home" name="-debug-start-debugger"> 
    470675        <j2seproject1:nbjpdastart name="${debug.class}"/> 
     676    </target> 
     677    <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test"> 
     678        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/> 
    471679    </target> 
    472680    <target depends="init,compile" name="-debug-start-debuggee"> 
    … …  
    486694        <j2seproject3:debug classname="${debug.class}"/> 
    487695    </target> 
    488     <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> 
     696    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> 
     697    <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test"> 
     698        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> 
     699        <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/> 
     700    </target> 
     701    <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/> 
    489702    <target depends="init" name="-pre-debug-fix"> 
    490703        <fail unless="fix.includes">Must set fix.includes</fail> 
    … …  
    500713                =============== 
    501714            --> 
    502     <target depends="init" name="-javadoc-build"> 
     715    <target depends="init" if="have.sources" name="-javadoc-build"> 
    503716        <mkdir dir="${dist.javadoc.dir}"/> 
    504717        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> 
    … …  
    509722                <filename name="**/*.java"/> 
    510723            </fileset> 
     724            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> 
     725                <include name="**/*.java"/> 
     726            </fileset> 
    511727        </javadoc> 
    512728    </target> 
    … …  
    531747    </target> 
    532748    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test"> 
    533         <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> 
     749        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/> 
    534750        <copy todir="${build.test.classes.dir}"> 
    535751            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> 
    … …  
    548764        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> 
    549765        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/> 
    550         <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/> 
     766        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/> 
    551767        <copy todir="${build.test.classes.dir}"> 
    552768            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> 
    … …  
    570786    </target> 
    571787    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
    572         <fail if="tests.failed">Some tests failed; see details above.</fail> 
     788        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> 
    573789    </target> 
    574790    <target depends="init" if="have.tests" name="test-report"/> 
    … …  
    583799    </target> 
    584800    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> 
    585         <fail if="tests.failed">Some tests failed; see details above.</fail> 
    586     </target> 
    587     <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"/> 
     801        <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> 
     802    </target> 
     803    <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"/> 
    588804    <!-- 
    589805                ======================= 
    … …  
    612828        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> 
    613829    </target> 
    614     <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> 
     830    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> 
    615831    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> 
    616832        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> 
    … …  
    649865                =============== 
    650866            --> 
    651     <target depends="init" name="deps-clean" unless="no.deps"/> 
     867    <target name="-deps-clean-init" unless="built-clean.properties"> 
     868        <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/> 
     869        <delete file="${built-clean.properties}" quiet="true"/> 
     870    </target> 
     871    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> 
     872        <echo level="warn" message="Cycle detected: fmgVen was already built"/> 
     873    </target> 
     874    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> 
     875        <mkdir dir="${build.dir}"/> 
     876        <touch file="${built-clean.properties}" verbose="false"/> 
     877        <property file="${built-clean.properties}" prefix="already.built.clean."/> 
     878        <antcall target="-warn-already-built-clean"/> 
     879        <propertyfile file="${built-clean.properties}"> 
     880            <entry key="${basedir}" value=""/> 
     881        </propertyfile> 
     882    </target> 
    652883    <target depends="init" name="-do-clean"> 
    653884        <delete dir="${build.dir}"/> 
    654         <delete dir="${dist.dir}"/> 
     885        <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/> 
    655886    </target> 
    656887    <target name="-post-clean"> 
    … …  
    659890    </target> 
    660891    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/> 
     892    <target name="-check-call-dep"> 
     893        <property file="${call.built.properties}" prefix="already.built."/> 
     894        <condition property="should.call.dep"> 
     895            <not> 
     896                <isset property="already.built.${call.subproject}"/> 
     897            </not> 
     898        </condition> 
     899    </target> 
     900    <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep"> 
     901        <ant antfile="${call.script}" inheritall="false" target="${call.target}"> 
     902            <propertyset> 
     903                <propertyref prefix="transfer."/> 
     904                <mapper from="transfer.*" to="*" type="glob"/> 
     905            </propertyset> 
     906        </ant> 
     907    </target> 
    661908</project> 

  • trunk/fmgVen/nbproject/genfiles.properties

    r11 r19  
    11build.xml.data.CRC32=d00ffa57 
    22build.xml.script.CRC32=a9b2e5a3 
    3 build.xml.stylesheet.CRC32=958a1d3e 
     3build.xml.stylesheet.CRC32=28e38971@1.38.1.45 
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. 
    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=d00ffa57 
    7 nbproject/build-impl.xml.script.CRC32=bf6c66bc 
    8 nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5 
     7nbproject/build-impl.xml.script.CRC32=494c2ca4 
     8nbproject/build-impl.xml.stylesheet.CRC32=78c6a6ee@1.38.1.45 

  • trunk/fmgVen/nbproject/project.properties

    r11 r19  
    77build.dir=build 
    88build.generated.dir=${build.dir}/generated 
     9build.generated.sources.dir=${build.dir}/generated-sources 
    910# Only compile against the classpath explicitly listed here: 
    1011build.sysclasspath=ignore 
Note: See TracChangeset for help on using the changeset viewer.