Changeset 14658


Ignore:
Timestamp:
03/24/14 11:46:02 (3 years ago)
Author:
mevenson
Message:

Update build artifact for NetBeans? 8.0

Location:
trunk/abcl/nbproject
Files:
2 edited

Legend:

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

    r14592 r14658  
    8181        </condition>
    8282        <condition property="do.archive">
    83             <not>
    84                 <istrue value="${jar.archive.disabled}"/>
    85             </not>
     83            <or>
     84                <not>
     85                    <istrue value="${jar.archive.disabled}"/>
     86                </not>
     87                <istrue value="${not.archive.disabled}"/>
     88            </or>
    8689        </condition>
    8790        <condition property="do.mkdist">
     
    12001203            </and>
    12011204        </condition>
    1202         <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}">
     1205        <condition else="" property="bug5101868workaround" value="*.java">
     1206            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
     1207        </condition>
     1208        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${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}">
    12031209            <classpath>
    12041210                <path path="${javac.classpath}"/>
    12051211            </classpath>
    1206             <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
     1212            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
    12071213                <filename name="**/*.java"/>
    12081214            </fileset>
     
    12781284    </target>
    12791285    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
    1280         <j2seproject3:test testincludes="**/*Test.java"/>
     1286        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
    12811287    </target>
    12821288    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
  • trunk/abcl/nbproject/genfiles.properties

    r14592 r14658  
    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=364c80b9
    8 nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
     7nbproject/build-impl.xml.script.CRC32=768003f6
     8nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.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.