Changeset 16:290074b53aca

Show
Ignore:
Timestamp:
03/30/12 15:35:26 (10 years ago)
Author:
František Kučera <franta-hg@…>
Branch:
default
Message:

netbeans, ant

Location:
java
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • java/Postak/nbproject/build-impl.xml

    r13 r16  
    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="Postak-impl"> 
    23     <fail message="Please build using Ant 1.7.1 or higher."> 
     23    <fail message="Please build using Ant 1.8.0 or higher."> 
    2424        <condition> 
    2525            <not> 
    26                 <antversion atleast="1.7.1"/> 
     26                <antversion atleast="1.8.0"/> 
    2727            </not> 
    2828        </condition> 
     
    199199        <property name="jar.index" value="false"/> 
    200200        <property name="jar.index.metainf" value="${jar.index}"/> 
     201        <property name="copylibs.rebase" value="true"/> 
    201202        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> 
    202203    </target> 
     
    385386                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    386387                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 
     388                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    387389                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    388390                    <jvmarg line="${profiler.info.jvmargs}"/> 
     
    515517                </pathconvert> 
    516518                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    517                 <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
     519                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
    518520                    <fileset dir="${build.classes.dir}"/> 
    519521                    <manifest> 
     
    840842    <target depends="init" if="have.sources" name="-javadoc-build"> 
    841843        <mkdir dir="${dist.javadoc.dir}"/> 
     844        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}"> 
     845            <and> 
     846                <isset property="endorsed.classpath.cmd.line.arg"/> 
     847                <not> 
     848                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/> 
     849                </not> 
     850            </and> 
     851        </condition> 
    842852        <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}"> 
    843853            <classpath> 
     
    851861                <exclude name="*.java"/> 
    852862            </fileset> 
     863            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/> 
    853864        </javadoc> 
    854865        <copy todir="${dist.javadoc.dir}"> 
  • java/Postak/nbproject/genfiles.properties

    r13 r16  
    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=ecce8ba0 
    7 nbproject/build-impl.xml.script.CRC32=c4083fc9 
    8 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 
     7nbproject/build-impl.xml.script.CRC32=8750d9a8 
     8nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46 
  • java/SuperPostak/nbproject/build-impl.xml

    r13 r16  
    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="SuperPostak-impl"> 
    2323    <import file="jnlp-impl.xml"/> 
    24     <fail message="Please build using Ant 1.7.1 or higher."> 
     24    <fail message="Please build using Ant 1.8.0 or higher."> 
    2525        <condition> 
    2626            <not> 
    27                 <antversion atleast="1.7.1"/> 
     27                <antversion atleast="1.8.0"/> 
    2828            </not> 
    2929        </condition> 
     
    200200        <property name="jar.index" value="false"/> 
    201201        <property name="jar.index.metainf" value="${jar.index}"/> 
     202        <property name="copylibs.rebase" value="true"/> 
    202203        <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> 
    203204    </target> 
     
    386387                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    387388                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 
     389                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    388390                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    389391                    <jvmarg line="${profiler.info.jvmargs}"/> 
     
    516518                </pathconvert> 
    517519                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    518                 <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
     520                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
    519521                    <fileset dir="${build.classes.dir}"/> 
    520522                    <manifest> 
     
    855857    <target depends="init" if="have.sources" name="-javadoc-build"> 
    856858        <mkdir dir="${dist.javadoc.dir}"/> 
     859        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}"> 
     860            <and> 
     861                <isset property="endorsed.classpath.cmd.line.arg"/> 
     862                <not> 
     863                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/> 
     864                </not> 
     865            </and> 
     866        </condition> 
    857867        <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}"> 
    858868            <classpath> 
     
    866876                <exclude name="*.java"/> 
    867877            </fileset> 
     878            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/> 
    868879        </javadoc> 
    869880        <copy todir="${dist.javadoc.dir}"> 
  • java/SuperPostak/nbproject/genfiles.properties

    r13 r16  
    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=d917048a 
    7 nbproject/build-impl.xml.script.CRC32=ccb272cf 
    8 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 
     7nbproject/build-impl.xml.script.CRC32=c275334b 
     8nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46