Changeset 350 in tmcsimulator for branches/ExtendLDS/nbproject


Ignore:
Timestamp:
03/31/2019 10:18:07 AM (7 years ago)
Author:
jdalbey
Message:

Add a branch EInotebook for Electronic Instructor Notebook prototype

Location:
branches/ExtendLDS/nbproject
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/ExtendLDS/nbproject/build-impl.xml

    r169 r350  
    7272        <!-- The two properties below are usually overridden --> 
    7373        <!-- by the active platform. Just a fallback. --> 
    74         <property name="default.javac.source" value="1.4"/> 
    75         <property name="default.javac.target" value="1.4"/> 
     74        <property name="default.javac.source" value="1.6"/> 
     75        <property name="default.javac.target" value="1.6"/> 
    7676    </target> 
    7777    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project"> 
    … …  
    102102                <isset property="javac.profile"/> 
    103103                <length length="0" string="${javac.profile}" when="greater"/> 
    104                 <matches pattern="1\.[89](\..*)?" string="${javac.source}"/> 
     104                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/> 
    105105            </and> 
    106106        </condition> 
    … …  
    182182        <property name="source.encoding" value="${file.encoding}"/> 
    183183        <property name="runtime.encoding" value="${source.encoding}"/> 
     184        <property name="manifest.encoding" value="${source.encoding}"/> 
    184185        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
    185186            <and> 
    … …  
    217218            </and> 
    218219        </condition> 
    219         <property name="javac.fork" value="${jdkBug6558476}"/> 
     220        <condition else="false" property="javac.fork"> 
     221            <or> 
     222                <istrue value="${jdkBug6558476}"/> 
     223                <istrue value="${javac.external.vm}"/> 
     224            </or> 
     225        </condition> 
    220226        <property name="jar.index" value="false"/> 
    221227        <property name="jar.index.metainf" value="${jar.index}"/> 
    … …  
    243249            <istrue value="${junit+testng.available}"/> 
    244250        </condition> 
     251        <property name="java.failonerror" value="true"/> 
    245252    </target> 
    246253    <target name="-post-init"> 
    … …  
    719726                <property environment="env"/> 
    720727                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    721                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 
     728                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}"> 
    722729                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    723730                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    … …  
    794801            <element name="customize" optional="true"/> 
    795802            <sequential> 
    796                 <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     803                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    797804                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    798805                    <jvmarg line="${debug-args-line}"/> 
    … …  
    821828            <element name="customize" optional="true"/> 
    822829            <sequential> 
    823                 <java classname="@{classname}" dir="${work.dir}" fork="true"> 
     830                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    824831                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    825832                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
    … …  
    860867                </pathconvert> 
    861868                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    862                 <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}"> 
     869                <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}"> 
    863870                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    864871                    <manifest> 
    … …  
    872879    <target name="-init-presetdef-jar"> 
    873880        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    874             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> 
     881            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8"> 
    875882                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    876883            </jar> 
    … …  
    9951002    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> 
    9961003        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 
    997         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 
     1004        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/> 
    9981005    </target> 
    9991006    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass"> 
    1000         <manifest file="${tmp.manifest.file}" mode="update"> 
     1007        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    10011008            <attribute name="Main-Class" value="${main.class}"/> 
    10021009        </manifest> 
    10031010    </target> 
    10041011    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile"> 
    1005         <manifest file="${tmp.manifest.file}" mode="update"> 
     1012        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    10061013            <attribute name="Profile" value="${javac.profile}"/> 
    10071014        </manifest> 
    … …  
    10111018        <mkdir dir="${build.classes.dir}/META-INF"/> 
    10121019        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 
    1013         <manifest file="${tmp.manifest.file}" mode="update"> 
     1020        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    10141021            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 
    10151022        </manifest> 
    … …  
    12061213        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    12071214        <startprofiler/> 
    1208         <antcal target="run-test-with-main"/> 
     1215        <antcall target="run-test-with-main"/> 
    12091216    </target> 
    12101217    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent"> 

  • branches/ExtendLDS/nbproject/genfiles.properties

    r169 r350  
    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=62085c2a 
    7 nbproject/build-impl.xml.script.CRC32=61c942f9 
    8 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48 
     7nbproject/build-impl.xml.script.CRC32=3f9ca593 
     8nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 

  • branches/ExtendLDS/nbproject/private/private.properties

    r169 r350  
    11compile.on.save=true 
    2 user.properties.file=/Users/jtorres/Library/Application Support/NetBeans/8.0.2/build.properties 
     2user.properties.file=/home/jdalbey/.netbeans/8.2/build.properties 
Note: See TracChangeset for help on using the changeset viewer.