Changeset 59 in tmcsimulator for trunk/IDE_metadata/NetBeans/TMCSim


Ignore:
Timestamp:
03/15/2017 10:20:21 AM (9 years ago)
Author:
jdalbey
Message:

Merge CAD Client updates for multiple incident view windows.

Location:
trunk/IDE_metadata/NetBeans/TMCSim
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/IDE_metadata/NetBeans/TMCSim/build.xml

    r56 r59  
    1212    <import file="nbproject/build-impl.xml"/> 
    1313    <property name="workdir" value="../../.."/> 
     14<!--        SYSTEM TEST SECTION      --> 
     15    <target description="CAD Simulator" name="cadsimulator"> 
     16    <antcall target="run-single"> 
     17       <param name="javac.includes" value="tmcsim/cadsimulator/CADSimulator.java"/> 
     18       <param name="run.class" value="tmcsim/cadsimulator/CADSimulator"/> 
     19    </antcall> 
     20    </target> 
     21    <target description="Visible System Test of CADSimulator"  name="VisibleSystemTest"> 
     22    <antcall target="test-single"> 
     23       <param name="javac.includes" value="tmcsim/cadsimulator/VisibleSystemTest.java"/> 
     24       <param name="test.includes" value="tmcsim/cadsimulator/VisibleSystemTest.java"/> 
     25    </antcall> 
     26    </target> 
     27    <target description="CAD Simulator - console" name="cadconsole"> 
     28        <java jar="deploy/CADserver.jar" 
     29           fork="true"> 
     30         <classpath> 
     31           <pathelement location="deploy/CADserver.jar"/> 
     32         </classpath> 
     33       </java> 
     34    </target> 
     35    <target description="CAD Simulator - GUI" name="cadgui"> 
     36        <java jar="deploy/CADserver.jar" 
     37           fork="true"><jvmarg value="-version"/> 
     38         <classpath> 
     39           <pathelement location="deploy/CADserver.jar"/> 
     40         </classpath> 
     41       </java> 
     42    </target> 
     43    <target description="Run Paramics Communicator" name="pcomm"> 
     44    <antcall target="run-single"> 
     45       <param name="javac.includes" value="tmcsim/paramicscommunicator/PComm.java"/> 
     46       <param name="run.class" value="tmcsim/paramicscommunicator/PComm"/> 
     47    </antcall> 
     48    </target> 
     49    <target description="Run Simulation Manager" name="simmgr"> 
     50    <antcall target="run-single"> 
     51       <param name="javac.includes" value="tmcsim/simulationmanager/SimulationManager.java"/> 
     52       <param name="run.class" value="tmcsim/simulationmanager/SimulationManager"/> 
     53    </antcall> 
     54    </target> 
     55    <target description="Emulate Paramics Modeler" name="emulate"> 
     56        <echo file="${workdir}/paramics_status.xml" append="false"> 
     57            &lt;Paramics&gt; &lt;Network_Status&gt;WARMING&lt;/Network_Status&gt; &lt;Network_ID&gt;1&lt;/Network_ID&gt; &lt;/Paramics&gt; 
     58        </echo> 
     59        <sleep seconds="5"/> 
     60        <echo file="${workdir}/paramics_status.xml" append="false"> 
     61            &lt;Paramics&gt; &lt;Network_Status&gt;LOADED&lt;/Network_Status&gt; &lt;Network_ID&gt;1&lt;/Network_ID&gt; &lt;/Paramics&gt; 
     62        </echo> 
     63    </target> 
     64 
    1465<!--        STORE SUBVERSION BUILD STRING      --> 
    1566<target name="-post-init" description="Sets the buildversion for the current build"> 
    … …  
    60111            /> 
    61112</checkstyle> 
    62 </target>      
    63     
     113</target> 
     114<!-- 
     115                ================= 
     116                ZIP for Web-CAT SECTION for CPE 305 assignments 
     117                ================= 
     118Create a zip file of source to CADSimulator for submission to Web-CAT grader. 
     119--> 
     120<target name="webcat-zip" depends="jar"> 
     121 
     122    <zip destfile="${workdir}/webcatsubmit.zip"> 
     123        <fileset dir="${workdir}/src/"> 
     124                 <include name="tmcsim/cadsimulator/viewer/**/*.java" /> 
     125                 <include name="tmcsim/cadsimulator/viewer/model/**/*.java" /> 
     126                 <include name="tmcsim/cadsimulator/viewer/actions/**/*.java" /> 
     127                 <include name="tmcsim/cadsimulator/videocontrol/**/*.java" /> 
     128                 <exclude name="tmcsim/paramics*/**"/> 
     129                 <exclude name="tmcsim/simulationmanager/**"/> 
     130                 <exclude name="tmcsim/cadsimulator/MP3Driver.java"/> 
     131        </fileset> 
     132        <!-- 
     133        <fileset dir="${workdir}"  includes="scripts/Cardfile.xml"/> 
     134        --> 
     135        <fileset dir="${workdir}/test/"> 
     136                 <include name="tmcsim/cadsimulator/viewer/CADSimulatorViewModelTest.java" /> 
     137        </fileset> 
     138    </zip> 
     139</target> 
    64140<!-- 
    65141                ================= 
    … …  
    79155    <delete dir="${deploy.dir}"/> 
    80156    <mkdir dir="${deploy.dir}"/> 
    81  
     157    <tstamp> 
     158        <format property="TODAY" pattern="yyyy.MM.dd HH:mm" /> 
     159    </tstamp> 
    82160    <jar destfile="${deploy.dir}/temp_final.jar" filesetmanifest="skip"> 
    83161        <zipgroupfileset dir="dist" includes="*.jar"/> 
    … …  
    125203      <jar destfile="${deploy.dir}/CADClient.jar" 
    126204       basedir="${build.dir}/classes" 
    127        includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**,  
    128             tmcsim/cadmodels/**"> 
    129         <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/> 
     205       includes="tmcsim/client/**, tmcsim/common/**, tmcsim/interfaces/**, 
     206            tmcsim/cadmodels/**, tmcsim/simulationmanager/model/LogEntryCellRenderer.class"> 
     207      <zipgroupfileset dir="dist/lib" includes="xercesImpl.jar"/> 
    130208        <manifest> 
    131209            <attribute name="Main-Class" value="tmcsim.client.CADClient"/> 
     210            <attribute name="Implementation-Version" value="${TODAY}"/> 
    132211        </manifest> 
    133212      </jar> 

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

    r51 r59  
    2828endorsed.classpath= 
    2929excludes= 
     30file.reference.commons-lang-2.4.jar=../../../lib/commons-lang-2.4.jar 
    3031file.reference.jaco-mp3-player-0.9.3.jar=../../../lib/jaco-mp3-player-0.9.3.jar 
    3132file.reference.mockito-1.10.19.jar=../../../lib/mockito-1.10.19.jar 
    … …  
    3334file.reference.tmc-simulator-test=../../../test 
    3435file.reference.uispec4j-jdk17.jar=../../../lib/uispec4j-jdk17.jar 
    35 file.reference.xercesImpl.jar=../../../src/tmcsim/cadsimulator/CADSimulator_lib/xercesImpl.jar 
     36file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar 
    3637includes=** 
    3738jar.compress=false 
    3839javac.classpath=\ 
     40    ${file.reference.uispec4j-jdk17.jar}:\ 
    3941    ${file.reference.xercesImpl.jar}:\ 
    40     ${file.reference.uispec4j-jdk17.jar}:\ 
     42    ${file.reference.jaco-mp3-player-0.9.3.jar}:\ 
    4143    ${file.reference.mockito-1.10.19.jar}:\ 
    42     ${libs.junit_4.classpath}:\ 
    43     ${file.reference.jaco-mp3-player-0.9.3.jar} 
     44    ${file.reference.commons-lang-2.4.jar}:\ 
     45    ${libs.junit_4.classpath} 
    4446# Space-separated list of extra javac options 
    4547javac.compilerargs= 
    … …  
    5658    ${javac.test.classpath} 
    5759javadoc.additionalparam= 
    58 javadoc.author=false 
     60javadoc.author=true 
    5961javadoc.encoding=${source.encoding} 
    6062javadoc.noindex=false 
    … …  
    6466javadoc.splitindex=true 
    6567javadoc.use=true 
    66 javadoc.version=false 
     68javadoc.version=true 
    6769javadoc.windowtitle= 
    6870main.class=tmcsim.cadsimulator.CADSimulator 
Note: See TracChangeset for help on using the changeset viewer.