Changeset 7 in tmcsimulator-scriptbuilder for trunk/nbproject/build-impl.xml


Ignore:
Timestamp:
07/25/2017 11:16:45 AM (9 years ago)
Author:
bmcguffin
Message:

Renamed Interfaces in structures.events package from "*Interface" to "I_*"

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore set to
      build

  • trunk/nbproject/build-impl.xml

    r4 r7  
    2020 
    2121        --> 
    22 <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="ScriptBuilder-impl"> 
     22<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="ScriptBuilder_Repo-impl"> 
    2323    <fail message="Please build using Ant 1.8.0 or higher."> 
    2424        <condition> 
    … …  
    4747        <!-- The two properties below are usually overridden --> 
    4848        <!-- by the active platform. Just a fallback. --> 
    49         <property name="default.javac.source" value="1.6"/> 
    50         <property name="default.javac.target" value="1.6"/> 
     49        <property name="default.javac.source" value="1.4"/> 
     50        <property name="default.javac.target" value="1.4"/> 
    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])|9)(\..*)?" string="${javac.source}"/> 
     79                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/> 
    8080            </and> 
    8181        </condition> 
    8282        <condition property="do.archive"> 
    83             <or> 
    84                 <not> 
    85                     <istrue value="${jar.archive.disabled}"/> 
    86                 </not> 
    87                 <istrue value="${not.archive.disabled}"/> 
    88             </or> 
     83            <not> 
     84                <istrue value="${jar.archive.disabled}"/> 
     85            </not> 
    8986        </condition> 
    9087        <condition property="do.mkdist"> 
    … …  
    157154        <property name="source.encoding" value="${file.encoding}"/> 
    158155        <property name="runtime.encoding" value="${source.encoding}"/> 
    159         <property name="manifest.encoding" value="${source.encoding}"/> 
    160156        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
    161157            <and> 
    … …  
    193189            </and> 
    194190        </condition> 
    195         <condition else="false" property="javac.fork"> 
    196             <or> 
    197                 <istrue value="${jdkBug6558476}"/> 
    198                 <istrue value="${javac.external.vm}"/> 
    199             </or> 
    200         </condition> 
     191        <property name="javac.fork" value="${jdkBug6558476}"/> 
    201192        <property name="jar.index" value="false"/> 
    202193        <property name="jar.index.metainf" value="${jar.index}"/> 
    … …  
    224215            <istrue value="${junit+testng.available}"/> 
    225216        </condition> 
    226         <property name="java.failonerror" value="true"/> 
    227217    </target> 
    228218    <target name="-post-init"> 
    … …  
    451441                </union> 
    452442                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 
    453                 <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="ScriptBuilder" testname="TestNG tests" workingDir="${work.dir}"> 
     443                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="ScriptBuilder_Repo" testname="TestNG tests" workingDir="${work.dir}"> 
    454444                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 
    455445                    <propertyset> 
    … …  
    602592                    <isset property="test.method"/> 
    603593                </condition> 
    604                 <condition else="-suitename ScriptBuilder -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> 
     594                <condition else="-suitename ScriptBuilder_Repo -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}"> 
    605595                    <matches pattern=".*\.xml" string="@{testClass}"/> 
    606596                </condition> 
    … …  
    701691                <property environment="env"/> 
    702692                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    703                 <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}"> 
     693                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 
    704694                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    705695                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    … …  
    776766            <element name="customize" optional="true"/> 
    777767            <sequential> 
    778                 <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
     768                <java classname="@{classname}" dir="${work.dir}" fork="true"> 
    779769                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    780770                    <jvmarg line="${debug-args-line}"/> 
    … …  
    803793            <element name="customize" optional="true"/> 
    804794            <sequential> 
    805                 <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
     795                <java classname="@{classname}" dir="${work.dir}" fork="true"> 
    806796                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    807797                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
    … …  
    842832                </pathconvert> 
    843833                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    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}"> 
     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}"> 
    845835                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    846836                    <manifest> 
    … …  
    854844    <target name="-init-presetdef-jar"> 
    855845        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    856             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8"> 
     846            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> 
    857847                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    858848            </jar> 
    … …  
    894884    </target> 
    895885    <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> 
    896         <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/> 
     886        <echo level="warn" message="Cycle detected: ScriptBuilder_Repo was already built"/> 
    897887    </target> 
    898888    <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> 
    … …  
    977967    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> 
    978968        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 
    979         <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/> 
     969        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 
    980970    </target> 
    981971    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass"> 
    982         <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
     972        <manifest file="${tmp.manifest.file}" mode="update"> 
    983973            <attribute name="Main-Class" value="${main.class}"/> 
    984974        </manifest> 
    985975    </target> 
    986976    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile"> 
    987         <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
     977        <manifest file="${tmp.manifest.file}" mode="update"> 
    988978            <attribute name="Profile" value="${javac.profile}"/> 
    989979        </manifest> 
    … …  
    993983        <mkdir dir="${build.classes.dir}/META-INF"/> 
    994984        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 
    995         <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
     985        <manifest file="${tmp.manifest.file}" mode="update"> 
    996986            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 
    997987        </manifest> 
    … …  
    11881178        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    11891179        <startprofiler/> 
    1190         <antcall target="run-test-with-main"/> 
     1180        <antcal target="run-test-with-main"/> 
    11911181    </target> 
    11921182    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent"> 
    … …  
    12101200            </and> 
    12111201        </condition> 
    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}"> 
     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}"> 
    12161203            <classpath> 
    12171204                <path path="${javac.classpath}"/> 
    12181205            </classpath> 
    1219             <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> 
     1206            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}"> 
    12201207                <filename name="**/*.java"/> 
    12211208            </fileset> 
    … …  
    12911278    </target> 
    12921279    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    1293         <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/> 
     1280        <j2seproject3:test testincludes="**/*Test.java"/> 
    12941281    </target> 
    12951282    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
    … …  
    13791366    </target> 
    13801367    <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> 
    1381         <echo level="warn" message="Cycle detected: ScriptBuilder was already built"/> 
     1368        <echo level="warn" message="Cycle detected: ScriptBuilder_Repo was already built"/> 
    13821369    </target> 
    13831370    <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> 
Note: See TracChangeset for help on using the changeset viewer.