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.

File:
1 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"> 
Note: See TracChangeset for help on using the changeset viewer.