/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.32 by tim, Thu May 29 04:35:42 2003 UTC revision 1.34 by tim, Thu May 29 14:56:37 2003 UTC
# Line 70  Line 70 
70    <!-- Main targets -->    <!-- Main targets -->
71    
72    <target name="compile"    <target name="compile"
73            depends="init, configure-compiler"            depends="init, configure-compiler, prepare-src"
74            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
75    
76        <property name="prepare.src.dir" value="${src.dir}"/>
77    
78      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
79    
80      <javac srcdir="${src.dir}"      <javac srcdir="${prepare.src.dir}"
81            destdir="${build.classes.dir}"            destdir="${build.classes.dir}"
82              debug="${build.debug}"              debug="${build.debug}"
83         debuglevel="${build.debuglevel}"         debuglevel="${build.debuglevel}"
# Line 447  Line 449 
449    <target name="configure-compiler">    <target name="configure-compiler">
450    
451      <property name="gjc.version"      <property name="gjc.version"
452               value="1.3"/>               value="2.0"/>
453    
454      <condition property="build.novariance" value="-novariance">      <condition property="build.novariance" value="-novariance">
455        <and>        <and>
# Line 478  Line 480 
480    
481      <property name="build.warnunchecked" value=""/>      <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.       ! Bootclasspath munging for source compilation.
# Line 510  Line 522 
522      <property name="build.javac.args"      <property name="build.javac.args"
523               value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>               value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
524    
525      <echo>javac ${build.javac.args}      <echo>javac ${build.javac.args}</echo>
526  bootclasspath is ${javac.bootclasspath}</echo>      <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>    </target>
543    

Legend:
Removed from v.1.32  
changed lines
  Added in v.1.34

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27