Changeset 132 in tmcsimulator for trunk/IDE_metadata/NetBeans/TMCSim/nbproject


Ignore:
Timestamp:
10/17/2017 01:20:01 PM (9 years ago)
Author:
jdalbey
Message:

project.properties, genfiles.properties, build-impl.xml: added custom settings.

Location:
trunk/IDE_metadata/NetBeans/TMCSim/nbproject
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/build-impl.xml

    r79 r132  
    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> 
    … …  
    157157        <property name="source.encoding" value="${file.encoding}"/> 
    158158        <property name="runtime.encoding" value="${source.encoding}"/> 
     159        <property name="manifest.encoding" value="${source.encoding}"/> 
    159160        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
    160161            <and> 
    … …  
    192193            </and> 
    193194        </condition> 
    194         <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> 
    195201        <property name="jar.index" value="false"/> 
    196202        <property name="jar.index.metainf" value="${jar.index}"/> 
    … …  
    218224            <istrue value="${junit+testng.available}"/> 
    219225        </condition> 
     226        <property name="java.failonerror" value="true"/> 
    220227    </target> 
    221228    <target name="-post-init"> 
    … …  
    694701                <property environment="env"/> 
    695702                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    696                 <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}"> 
    697704                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    698705                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    … …  
    769776            <element name="customize" optional="true"/> 
    770777            <sequential> 
    771                 <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     778                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    772779                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    773780                    <jvmarg line="${debug-args-line}"/> 
    … …  
    796803            <element name="customize" optional="true"/> 
    797804            <sequential> 
    798                 <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     805                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    799806                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    800807                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
    … …  
    835842                </pathconvert> 
    836843                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    837                 <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}"> 
    838845                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    839846                    <manifest> 
    … …  
    847854    <target name="-init-presetdef-jar"> 
    848855        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    849             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> 
     856            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8"> 
    850857                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    851858            </jar> 
    … …  
    970977    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> 
    971978        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 
    972         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 
     979        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/> 
    973980    </target> 
    974981    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass"> 
    975         <manifest file="${tmp.manifest.file}" mode="update"> 
     982        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    976983            <attribute name="Main-Class" value="${main.class}"/> 
    977984        </manifest> 
    978985    </target> 
    979986    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile"> 
    980         <manifest file="${tmp.manifest.file}" mode="update"> 
     987        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    981988            <attribute name="Profile" value="${javac.profile}"/> 
    982989        </manifest> 
    … …  
    986993        <mkdir dir="${build.classes.dir}/META-INF"/> 
    987994        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 
    988         <manifest file="${tmp.manifest.file}" mode="update"> 
     995        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    989996            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 
    990997        </manifest> 
    … …  
    11811188        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    11821189        <startprofiler/> 
    1183         <antcal target="run-test-with-main"/> 
     1190        <antcall target="run-test-with-main"/> 
    11841191    </target> 
    11851192    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent"> 

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/genfiles.properties

    r79 r132  
    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=6c7221c6 
    7 nbproject/build-impl.xml.script.CRC32=5cb245d6 
    8 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48 
     7nbproject/build-impl.xml.script.CRC32=249c9218 
     8nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 

  • trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

    r79 r132  
     1#Wed Oct 11 09:26:31 PDT 2017 
     2excludes= 
     3file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar 
     4javac.deprecation=false 
     5file.reference.jaco-mp3-player-0.9.3.jar=../../../lib/jaco-mp3-player-0.9.3.jar 
     6build.test.results.dir=${build.dir}/test/results 
     7javac.external.vm=false 
     8run.classpath=\ 
     9    ${javac.classpath}:\ 
     10    ${build.classes.dir} 
     11javadoc.nonavbar=false 
     12run.test.classpath=\ 
     13    ${javac.test.classpath}:\ 
     14    ${build.test.classes.dir} 
     15annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output 
     16javac.processorpath=\ 
     17    ${javac.classpath} 
     18javac.target=1.7 
     19annotation.processing.processors.list= 
     20javadoc.noindex=false 
     21file.reference.uispec4j-jdk17.jar=../../../lib/uispec4j-jdk17.jar 
     22javadoc.additionalparam= 
     23includes=** 
     24build.classes.dir=${build.dir}/classes 
     25source.encoding=UTF-8 
     26javadoc.author=true 
     27test.src.dir=${file.reference.tmc-simulator-test} 
     28build.dir=build 
     29file.reference.mockito-1.10.19.jar=../../../lib/mockito-1.10.19.jar 
     30build.test.classes.dir=${build.dir}/test/classes 
     31platform.active=default_platform 
     32javac.compilerargs= 
     33main.class=tmcsim.cadsimulator.CADServer 
     34dist.jar=${dist.dir}/TMCSim.jar 
     35javac.test.processorpath=${javac.test.classpath} 
     36javadoc.use=true 
     37build.sysclasspath=ignore 
     38debug.test.classpath=${run.test.classpath} 
     39dist.dir=dist 
     40build.classes.excludes=**/*.java,**/*.form 
     41javadoc.splitindex=true 
     42javadoc.encoding=${source.encoding} 
     43javac.source=1.7 
     44application.vendor=jdalbey 
     45junit.selected.version=3 
     46debug.classpath=${run.classpath} 
     47file.reference.commons-lang-2.4.jar=../../../lib/commons-lang-2.4.jar 
     48run.jvmargs=-DCONFIG_DIR\=config/testConfig 
     49javac.test.classpath=\ 
     50    ${javac.classpath}:\ 
     51    ${build.classes.dir}:\ 
     52    ${libs.junit_4.classpath}:\ 
     53    ${libs.hamcrest.classpath} 
     54build.generated.dir=${build.dir}/generated 
     55jar.compress=false 
     56javadoc.private=false 
     57file.reference.tmc-simulator-test=../../../test 
     58annotation.processing.run.all.processors=true 
     59application.title=TMCSim 
     60meta.inf.dir=${src.dir}/META-INF 
     61manifest.file=manifest.mf 
    162annotation.processing.enabled=true 
    2 annotation.processing.enabled.in.editor=false 
    3 annotation.processing.processors.list= 
    4 annotation.processing.run.all.processors=true 
    5 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output 
    6 application.title=TMCSim 
    7 application.vendor=jdalbey 
    8 build.classes.dir=${build.dir}/classes 
    9 build.classes.excludes=**/*.java,**/*.form 
    10 # This directory is removed when the project is cleaned: 
    11 build.dir=build 
    12 build.generated.dir=${build.dir}/generated 
    13 build.generated.sources.dir=${build.dir}/generated-sources 
    14 # Only compile against the classpath explicitly listed here: 
    15 build.sysclasspath=ignore 
    16 build.test.classes.dir=${build.dir}/test/classes 
    17 build.test.results.dir=${build.dir}/test/results 
    18 # Uncomment to specify the preferred debugger connection transport: 
    19 #debug.transport=dt_socket 
    20 debug.classpath=\ 
    21     ${run.classpath} 
    22 debug.test.classpath=\ 
    23     ${run.test.classpath} 
    24 # This directory is removed when the project is cleaned: 
    25 dist.dir=dist 
    26 dist.jar=${dist.dir}/TMCSim.jar 
    2763dist.javadoc.dir=${dist.dir}/javadoc 
     64src.dir=${file.reference.tmc-simulator-src} 
     65mkdist.disabled=false 
    2866endorsed.classpath= 
    29 excludes= 
    30 file.reference.commons-lang-2.4.jar=../../../lib/commons-lang-2.4.jar 
    31 file.reference.jaco-mp3-player-0.9.3.jar=../../../lib/jaco-mp3-player-0.9.3.jar 
    32 file.reference.mockito-1.10.19.jar=../../../lib/mockito-1.10.19.jar 
    33 file.reference.tmc-simulator-src=../../../src 
    34 file.reference.tmc-simulator-test=../../../test 
    35 file.reference.uispec4j-jdk17.jar=../../../lib/uispec4j-jdk17.jar 
    36 file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar 
    37 includes=** 
    38 jar.compress=false 
    3967javac.classpath=\ 
    4068    ${file.reference.uispec4j-jdk17.jar}:\ 
    … …  
    4472    ${file.reference.commons-lang-2.4.jar}:\ 
    4573    ${libs.junit_4.classpath} 
    46 # Space-separated list of extra javac options 
    47 javac.compilerargs= 
    48 javac.deprecation=false 
    49 javac.processorpath=\ 
    50     ${javac.classpath} 
    51 javac.source=1.7 
    52 javac.target=1.7 
    53 javac.test.classpath=\ 
    54     ${javac.classpath}:\ 
    55     ${build.classes.dir}:\ 
    56     ${libs.junit.classpath} 
    57 javac.test.processorpath=\ 
    58     ${javac.test.classpath} 
    59 javadoc.additionalparam= 
    60 javadoc.author=true 
    61 javadoc.encoding=${source.encoding} 
    62 javadoc.noindex=false 
    63 javadoc.nonavbar=false 
    64 javadoc.notree=false 
    65 javadoc.private=false 
    66 javadoc.splitindex=true 
    67 javadoc.use=true 
     74annotation.processing.enabled.in.editor=false 
     75build.generated.sources.dir=${build.dir}/generated-sources 
    6876javadoc.version=true 
    6977javadoc.windowtitle= 
    70 main.class=tmcsim.cadsimulator.CADSimulator 
    71 manifest.file=manifest.mf 
    72 meta.inf.dir=${src.dir}/META-INF 
    73 mkdist.disabled=false 
    74 platform.active=default_platform 
    75 run.classpath=\ 
    76     ${javac.classpath}:\ 
    77     ${build.classes.dir} 
    78 # Space-separated list of JVM arguments used when running the project. 
    79 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. 
    80 # To set system properties for unit tests define test-sys-prop.name=value: 
    81 run.jvmargs=-DCONFIG_DIR=config/testConfig 
    82 run.test.classpath=\ 
    83     ${javac.test.classpath}:\ 
    84     ${build.test.classes.dir} 
    85 source.encoding=UTF-8 
    86 src.dir=${file.reference.tmc-simulator-src} 
    87 test.src.dir=${file.reference.tmc-simulator-test} 
     78javadoc.notree=false 
     79file.reference.tmc-simulator-src=../../../src 
    8880work.dir=../../.. 
Note: See TracChangeset for help on using the changeset viewer.