Changeset 15 in tmcsimulator-scriptbuilder for trunk/nbproject


Ignore:
Timestamp:
07/27/2017 09:36:33 AM (9 years ago)
Author:
jdalbey
Message:

Add Jar files for Junit 3.8.2 and Mockito 1.10.19. Update project properties file.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        11build 
         2dist 

  • trunk/nbproject/build-impl.xml

    r7 r15  
    4747        <!-- The two properties below are usually overridden --> 
    4848        <!-- by the active platform. Just a fallback. --> 
    49         <property name="default.javac.source" value="1.4"/> 
    50         <property name="default.javac.target" value="1.4"/> 
     49        <property name="default.javac.source" value="1.6"/> 
     50        <property name="default.javac.target" value="1.6"/> 
    5151    </target> 
    5252    <target depends="-pre-init,-init-private,-init-user" name="-init-project"> 
    … …  
    7777                <isset property="javac.profile"/> 
    7878                <length length="0" string="${javac.profile}" when="greater"/> 
    79                 <matches pattern="1\.[89](\..*)?" string="${javac.source}"/> 
     79                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/> 
    8080            </and> 
    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"> 
    … …  
    154157        <property name="source.encoding" value="${file.encoding}"/> 
    155158        <property name="runtime.encoding" value="${source.encoding}"/> 
     159        <property name="manifest.encoding" value="${source.encoding}"/> 
    156160        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
    157161            <and> 
    … …  
    189193            </and> 
    190194        </condition> 
    191         <property name="javac.fork" value="${jdkBug6558476}"/> 
     195        <condition else="false" property="javac.fork"> 
     196            <or> 
     197                <istrue value="${jdkBug6558476}"/> 
     198                <istrue value="${javac.external.vm}"/> 
     199            </or> 
     200        </condition> 
    192201        <property name="jar.index" value="false"/> 
    193202        <property name="jar.index.metainf" value="${jar.index}"/> 
    … …  
    215224            <istrue value="${junit+testng.available}"/> 
    216225        </condition> 
     226        <property name="java.failonerror" value="true"/> 
    217227    </target> 
    218228    <target name="-post-init"> 
    … …  
    691701                <property environment="env"/> 
    692702                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    693                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 
     703                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}"> 
    694704                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    695705                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    … …  
    766776            <element name="customize" optional="true"/> 
    767777            <sequential> 
    768                 <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     778                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    769779                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    770780                    <jvmarg line="${debug-args-line}"/> 
    … …  
    793803            <element name="customize" optional="true"/> 
    794804            <sequential> 
    795                 <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     805                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    796806                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    797807                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
    … …  
    832842                </pathconvert> 
    833843                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    834                 <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
     844                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
    835845                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    836846                    <manifest> 
    … …  
    844854    <target name="-init-presetdef-jar"> 
    845855        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    846             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> 
     856            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8"> 
    847857                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    848858            </jar> 
    … …  
    967977    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> 
    968978        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 
    969         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 
     979        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/> 
    970980    </target> 
    971981    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass"> 
    972         <manifest file="${tmp.manifest.file}" mode="update"> 
     982        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    973983            <attribute name="Main-Class" value="${main.class}"/> 
    974984        </manifest> 
    975985    </target> 
    976986    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile"> 
    977         <manifest file="${tmp.manifest.file}" mode="update"> 
     987        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    978988            <attribute name="Profile" value="${javac.profile}"/> 
    979989        </manifest> 
    … …  
    983993        <mkdir dir="${build.classes.dir}/META-INF"/> 
    984994        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 
    985         <manifest file="${tmp.manifest.file}" mode="update"> 
     995        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    986996            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 
    987997        </manifest> 
    … …  
    11781188        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    11791189        <startprofiler/> 
    1180         <antcal target="run-test-with-main"/> 
     1190        <antcall target="run-test-with-main"/> 
    11811191    </target> 
    11821192    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent"> 
    … …  
    12001210            </and> 
    12011211        </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}"> 
     1212        <condition else="" property="bug5101868workaround" value="*.java"> 
     1213            <matches pattern="1\.[56](\..*)?" string="${java.version}"/> 
     1214        </condition> 
     1215        <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}"> 
    12031216            <classpath> 
    12041217                <path path="${javac.classpath}"/> 
    12051218            </classpath> 
    1206             <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}"> 
     1219            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> 
    12071220                <filename name="**/*.java"/> 
    12081221            </fileset> 
    … …  
    12781291    </target> 
    12791292    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    1280         <j2seproject3:test testincludes="**/*Test.java"/> 
     1293        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/> 
    12811294    </target> 
    12821295    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 

  • trunk/nbproject/genfiles.properties

    r7 r15  
    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=66ccbf9e 
    7 nbproject/build-impl.xml.script.CRC32=d1923e08 
    8 nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46 
     7nbproject/build-impl.xml.script.CRC32=246c87ba 
     8nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 

  • trunk/nbproject/project.properties

    r14 r15  
    3030endorsed.classpath= 
    3131excludes= 
     32file.reference.junit-3.8.2.jar=lib/junit-3.8.2.jar 
    3233file.reference.mockito-1.10.19.jar=/Users/bryanmcguffin/Desktop/Work/NetBeans/mockito-1.10.19.jar 
    3334includes=** 
    3435jar.compress=false 
    3536javac.classpath=\ 
    36     ${libs.swing-layout.classpath} 
     37    ${libs.swing-layout.classpath}:\ 
     38    ${file.reference.junit-3.8.2.jar} 
    3739# Space-separated list of extra javac options 
    3840javac.compilerargs= 
    3941javac.deprecation=false 
     42javac.external.vm=false 
    4043javac.processorpath=\ 
    4144    ${javac.classpath} 
Note: See TracChangeset for help on using the changeset viewer.