Changeset 14878


Ignore:
Timestamp:
09/29/16 21:39:01 (6 years ago)
Author:
Mark Evenson
Message:

netbeans: artifact adjustments from netbeans-8.1

Location:
trunk/abcl/nbproject
Files:
2 edited

Legend:

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

    r14658 r14878  
    192192            </and>
    193193        </condition>
    194         <property name="javac.fork" value="${jdkBug6558476}"/>
     194        <condition else="false" property="javac.fork">
     195            <or>
     196                <istrue value="${jdkBug6558476}"/>
     197                <istrue value="${javac.external.vm}"/>
     198            </or>
     199        </condition>
    195200        <property name="jar.index" value="false"/>
    196201        <property name="jar.index.metainf" value="${jar.index}"/>
     
    218223            <istrue value="${junit+testng.available}"/>
    219224        </condition>
     225        <property name="java.failonerror" value="true"/>
    220226    </target>
    221227    <target name="-post-init">
     
    694700                <property environment="env"/>
    695701                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
    696                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
     702                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
    697703                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    698704                    <jvmarg value="${profiler.info.jvmargs.agent}"/>
     
    769775            <element name="customize" optional="true"/>
    770776            <sequential>
    771                 <java classname="@{classname}" dir="${work.dir}" fork="true">
     777                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
    772778                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    773779                    <jvmarg line="${debug-args-line}"/>
     
    796802            <element name="customize" optional="true"/>
    797803            <sequential>
    798                 <java classname="@{classname}" dir="${work.dir}" fork="true">
     804                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
    799805                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
    800806                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
  • trunk/abcl/nbproject/genfiles.properties

    r14658 r14878  
    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=768003f6
    8 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
     7nbproject/build-impl.xml.script.CRC32=4c2b716d
     8nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
    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.