ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.60 by tim, Mon Dec 8 03:10:54 2003 UTC vs.
Revision 1.62 by tim, Wed Dec 10 01:51:11 2003 UTC

# Line 43 | Line 43
43    <property name="src.dir"              location="${basedir}/src/main"/>
44    <property name="test.src.dir"         location="${basedir}/src/test"/>
45    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
46 +  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
47    <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48    <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
49    <property name="lib.dir"              location="${basedir}/lib"/>
# Line 251 | Line 252
252      <echo>java.home is ${java.home}</echo>
253  
254    </target>
255 <
256 <
255 >  
256 >  
257    <target name="dist-jar"
258            depends="clean, jar">
259  
# Line 410 | Line 411
411  
412      </javac>
413  
414 + <!--
415 +    <javac srcdir="${jtreg.src.dir}"
416 +          destdir="${build.testcases.dir}"
417 +            debug="${build.debug}"
418 +       debuglevel="${build.debuglevel}"
419 +      deprecation="${build.deprecation}"
420 +           source="${build.sourcelevel}"
421 +             fork="true">
422 +
423 +      <compilerarg value="${bootclasspath.args}"/>
424 +      <compilerarg line="${build.args}"/>
425 +      
426 +      <classpath refid="test.classpath"/>
427 +
428 +    </javac>
429 + -->
430 +
431    </target>
432  
433  
# Line 434 | Line 452
452  
453        <formatter type="xml"/>
454  
455 <      <batchtest todir="${build.reports.dir}">
455 >      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
456          <fileset dir="${tck.src.dir}">
457            <include name="**/${testcase}Test.java"/>
458          </fileset>
459 +      </batchtest>
460 +      
461 +      <batchtest todir="${build.reports.dir}" if="do.test.old">
462          <fileset dir="${test.src.dir}">
463            <include name="jsr166/test/**/${testcase}Test.java"/>
464          </fileset>
465        </batchtest>
466  
467 + <!--      
468 +      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
469 +        <fileset dir="${jtreg.src.dir}">
470 +          <include name="**/${testcase}Test.java"/>
471 +        </fileset>
472 +      </batchtest>
473 + -->
474 +
475      </junit>
476  
477    </target>
# Line 562 | Line 591
591    </target>
592  
593  
594 <
595 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
596 <
568 <
569 <  <target name="compat" depends="jar">
594 >  <!-- Standalone sample program -->
595 >  
596 >  <target name="sample" depends="jar">
597    
598      <mkdir dir="${build.testcases.dir}"/>
599      
# Line 583 | Line 610
610        
611        <classpath refid="test.classpath"/>
612        
613 <      <include name="Compatibility.java"/>
613 >      <include name="jsr166/test/Sample.java"/>
614        
615      </javac>
616      
617              
618 <    <java classname="Compatibility" fork="true">
618 >    <java classname="jsr166.test.Sample" fork="true">
619        <jvmarg value="${bootclasspath.args}"/>
620        <classpath refid="test.classpath"/>
621      </java>
# Line 596 | Line 623
623  
624  
625  
626 +  <!-- Backward compatibility, work in progress (some files not checked in) -->
627 +
628 +
629 +
630    <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
631    <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
632    <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines