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.32 by tim, Thu May 29 04:35:42 2003 UTC vs.
Revision 1.34 by tim, Thu May 29 14:56:37 2003 UTC

# Line 70 | Line 70
70    <!-- Main targets -->
71  
72    <target name="compile"
73 <          depends="init, configure-compiler"
73 >          depends="init, configure-compiler, prepare-src"
74            description="Compiles main sources to build folder">
75  
76 +    <property name="prepare.src.dir" value="${src.dir}"/>
77 +
78      <mkdir dir="${build.classes.dir}"/>
79  
80 <    <javac srcdir="${src.dir}"
80 >    <javac srcdir="${prepare.src.dir}"
81            destdir="${build.classes.dir}"
82              debug="${build.debug}"
83         debuglevel="${build.debuglevel}"
# Line 447 | Line 449
449    <target name="configure-compiler">
450  
451      <property name="gjc.version"
452 <             value="1.3"/>
452 >             value="2.0"/>
453  
454      <condition property="build.novariance" value="-novariance">
455        <and>
# Line 478 | Line 480
480  
481      <property name="build.warnunchecked" value=""/>
482  
483 +    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
484 +      <or>
485 +        <and>
486 +          <not><isset property="build.nothreads"/></not>
487 +          <equals arg1="${gjc.version}" arg2="2.0"/>
488 +        </and>
489 +        <istrue value="${build.nothreads}"/>
490 +      </or>
491 +    </condition>
492 +
493  
494      <!--
495       ! Bootclasspath munging for source compilation.
# Line 510 | Line 522
522      <property name="build.javac.args"
523               value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
524  
525 <    <echo>javac ${build.javac.args}
526 < bootclasspath is ${javac.bootclasspath}</echo>
525 >    <echo>javac ${build.javac.args}</echo>
526 >    <echo>bootclasspath=${javac.bootclasspath}</echo>
527 >
528 >  </target>
529 >
530 >
531 >  <target name="prepare-src"
532 >          depends="configure-compiler"
533 >          if="prepare.src.dir">
534 >
535 >    <mkdir dir="${prepare.src.dir}"/>
536 >    <copy todir="${prepare.src.dir}">
537 >      <fileset dir="${src.dir}">
538 >        <exclude name="java/lang/**"/>
539 >      </fileset>
540 >    </copy>
541  
542    </target>
543  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines