Project

General

Profile

« Previous | Next » 

Revision 2135

Added by Duane Costa over 20 years ago

Remove Harvester code from compile and jar targets.
Add testharvester target for independently testing Harvester code.

View differences:

build.xml
307 307
              destdir="${build.dest}"
308 308
              classpath="${cpath}"
309 309
              debug="${debug}"
310
              excludes="**/*.sql **/stringclient/** **/client/*.java"/>
310
              excludes="**/*.sql **/stringclient/** **/client/*.java **/harvesterClient/*.java"/>
311 311
   </target>
312 312

  
313 313
   <target name="jar" depends="compile"
......
315 315

  
316 316
       <delete file="${build.dir}/${name}.jar" />
317 317
       <jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}"
318
            excludes="**/protocols/" />
318
            excludes="**/protocols/ **/harvesterClient/" />
319 319
   </target>
320 320

  
321 321
   <target name="protocol" depends="compile"
......
637 637
          dest="${build.tmp}" />
638 638
   </target>
639 639

  
640
   <target name="testprep" depends="jar,clientjar">
640
   <target name="testprep" depends="jar,clientjar,harvesterjar">
641 641
      <mkdir dir="${build.tests}"/>
642 642
      <copy todir="${build.tests}" filtering="yes">
643 643
        <fileset dir="${testdir}">
......
647 647
      <!-- copy and compile the tests into a jar file -->
648 648
      <javac srcdir="${build.tests}"
649 649
             destdir="${build.tests}"
650
             classpath="${cpath}:${build.dir}/${name}.jar:${build.dir}/${name}-client.jar"
650
             classpath="${cpath}:${build.dir}/${name}.jar:${build.dir}/${name}-client.jar:${build.dir}/harvester.jar"
651 651
             debug="on"
652 652
       includes="**/*.java" />
653 653

  
......
700 700
     </junit>
701 701
   </target>
702 702

  
703
   <target name="testharvester" 
704
           depends="testprep"
705
           description="Uses the ant junit task to test only the Harvester code">
706
     <junit printsummary="yes" 
707
            haltonfailure="off" 
708
            fork="yes"
709
            haltonerror="off">
710
       <classpath>
711
         <pathelement path="${cpath}:${build.dir}/${name}.jar:${build.dir}/${name}-client.jar:${build.dir}/harvester.jar:${build.dir}/${name}-junittests.jar" />
712
       </classpath>
713
       <formatter type="plain" />
714
       <batchtest fork="yes" todir="${build.dir}">
715
         <fileset dir="${build.tests}">
716
           <include name="**/harvesterClient/*.class" />
717
         </fileset>
718
       </batchtest>
719
     </junit>
720
   </target>
721

  
703 722
  <target name="gethttpclient" depends="prepare"
704 723
            description="checks out and compiles morpho httpclient code">
705 724
  <!--mkdir dir="${morphosourcedir}" -->

Also available in: Unified diff