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

Diff of /jsr166/build.xml

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

revision 1.31, Wed May 28 21:15:50 2003 UTC revision 1.32, Thu May 29 04:35:42 2003 UTC
# Line 7  Line 7 
7    Usage: ant [target]    Usage: ant [target]
8    
9    User-specific settings are read from user.properties.    User-specific settings are read from user.properties.
10    See user.properties.sample for examples.    See user.properties.sample for an explanation of some useful settings.
11  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
12    </description>    </description>
13    
# Line 26  Line 26 
26    <property name="build.debug"          value="true"/>    <property name="build.debug"          value="true"/>
27    <property name="build.debuglevel"     value="source,lines,vars"/>    <property name="build.debuglevel"     value="source,lines,vars"/>
28    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
   <property name="build.novariance.arg" value=""/>  
29    
30    <!-- Build locations -->    <!-- Build locations -->
31    <property name="build.dir"            location="build"/>    <property name="build.dir"            location="build"/>
# Line 55  Line 54 
54    
55    <!-- Jar locations -->    <!-- Jar locations -->
56    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>    <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
   <property name="javac.jar"            location="${lib.dir}/javac.jar"/>  
   <property name="collect.jar"          location="${lib.dir}/collect.jar"/>  
57    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>    <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>    <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59    
60    
61    
   <!--  
    ! Bootclasspath munging for source compilation.  
    -->  
   
   <path id="javac.bootclasspath.prefix">  
     <!-- <pathelement location="${src.dir}"/> -->  
     <pathelement location="${javac.jar}"/>  
   </path>  
   
   <path id="javac.bootclasspath">  
     <!-- <pathelement location="${src.dir}"/> -->  
     <pathelement location="${collect.jar}"/>  
     <pathelement location="${rt.jar}"/>  
   </path>  
   
   <!-- Flatten bootclasspath prefix into a platform-appropriate string -->  
   <property name="javac.bootclasspath.prefix"  
            refid="javac.bootclasspath.prefix"/>  
   
   <!-- Turn the flattened bootclasspath prefix into a javac argument -->  
   <property name="build.bootclasspath.arg"  
            value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>  
   
   
   <!--  
    ! Bootclasspath munging for testing, so JUnit can test our local  
    ! modifications to java.*.  
    -->  
   
   <path id="test.classpath">  
     <pathelement location="${product.jar}"/>  
     <pathelement location="${build.testcases.dir}"/>  
     <pathelement location="${junit.jar}"/>  
   </path>  
   
   <!-- Flatten test classpath into a platform-appropriate string -->  
   <property name="test.classpath" refid="test.classpath"/>  
   
   <!-- Turn the flattened test classpath into a javac argument -->  
   <property name="test.bootclasspath.arg"  
            value='-Xbootclasspath/p:${test.classpath}'/>  
   
   
   
62    <!-- Files excluded from emulation and dist-docs -->    <!-- Files excluded from emulation and dist-docs -->
63    <patternset id="emulation.excludes">    <patternset id="emulation.excludes">
64      <exclude name="java/util/Random.*"/>      <exclude name="java/util/Random.*"/>
# Line 117  Line 70 
70    <!-- Main targets -->    <!-- Main targets -->
71    
72    <target name="compile"    <target name="compile"
73            depends="init"            depends="init, configure-compiler"
74            description="Compiles main sources to build folder">            description="Compiles main sources to build folder">
75    
76      <mkdir dir="${build.classes.dir}"/>      <mkdir dir="${build.classes.dir}"/>
# Line 139  Line 92 
92    
93    
94    <target name="jar"    <target name="jar"
95            depends="check-emulation, init-jar, native-jar, emulation-jar"            depends="configure-emulation, init-jar, native-jar, emulation-jar"
96            description="Builds library jar from compiled sources"/>            description="Builds library jar from compiled sources"/>
97    
98    
99    <target name="test"    <target name="test"
100            depends="init, check-junit, report-tests"            depends="init, configure-tests, report-tests"
101            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />            description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
102    
103    
# Line 204  Line 157 
157    
158    
159    <target name="strip"    <target name="strip"
160            depends="init"            depends="init, configure-compiler"
161            description="Strip generics from java source (not working yet)">            description="Strip generics from java source (not working yet)">
162    
163      <mkdir dir="${build.stripped.dir}"/>      <mkdir dir="${build.stripped.dir}"/>
# Line 275  Line 228 
228    
229    <!-- Internal targets -->    <!-- Internal targets -->
230    
   <target name="set-warnings-if" if="build.warnings">  
   
     <property name="build.warnings.arg" value="-warnunchecked"/>  
   
   </target>  
   
   
   <target name="set-warnings-unless" unless="build.warnings">  
   
     <property name="build.warnings.arg" value=""/>  
   
   </target>  
   
231    
232    <target name="init"    <target name="init">
           depends="set-warnings-if, set-warnings-unless">  
233    
234      <!-- Version is kept in a separate file -->      <!-- Version is kept in a separate file -->
235      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
236      <echo>Building JSR-166 version ${version}</echo>      <echo>Building JSR-166 version ${version}</echo>
237    
     <!-- Common options in javac invocations -->  
     <property name="build.javac.args"  
              value="${build.bootclasspath.arg} ${build.warnings.arg} ${build.novariance.arg}"/>  
   
238    </target>    </target>
239    
240    
# Line 322  Line 257 
257    
258    
259    <target name="compile-emulation"    <target name="compile-emulation"
260            depends="init"            depends="init, configure-compiler"
261            if="build.emulation.true">            if="build.emulation.true">
262    
263      <mkdir dir="${build.emulation.dir}"/>      <mkdir dir="${build.emulation.dir}"/>
# Line 509  Line 444 
444    </target>    </target>
445    
446    
447    <target name="check-junit">    <target name="configure-compiler">
448    
449      <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->      <property name="gjc.version"
450      <available property="junit.available"               value="1.3"/>
                classname="junit.framework.Protectable"/>  
451    
452      <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"      <condition property="build.novariance" value="-novariance">
453            unless="junit.available"/>        <and>
454            <equals arg1="${gjc.version}" arg2="2.0"/>
455            <or>
456              <not><isset property="gjc.novariance"/></not>
457              <istrue value="${gjc.novariance}"/>
458            </or>
459          </and>
460        </condition>
461    
462        <property name="build.novariance"
463                 value=""/>
464    
465        <property name="gjc.dir"
466                 value="${lib.dir}/gjc"/>
467    
468        <property name="javac.jar"
469              location="${gjc.dir}/${gjc.version}/javac.jar"/>
470    
471        <property name="collect.jar"
472              location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
473    
474    
475        <condition property="build.warnunchecked" value="-warnunchecked">
476          <istrue value="${gjc.warnunchecked}"/>
477        </condition>
478    
479        <property name="build.warnunchecked" value=""/>
480    
481    
482        <!--
483         ! Bootclasspath munging for source compilation.
484         -->
485    
486        <path id="javac.bootclasspath.prefix">
487          <!-- <pathelement location="${src.dir}"/> -->
488          <pathelement location="${javac.jar}"/>
489        </path>
490    
491        <path id="javac.bootclasspath">
492          <!-- <pathelement location="${src.dir}"/> -->
493          <pathelement location="${collect.jar}"/>
494          <pathelement location="${rt.jar}"/>
495        </path>
496    
497        <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
498        <property name="javac.bootclasspath.prefix"
499                 refid="javac.bootclasspath.prefix"/>
500    
501        <!-- Turn the flattened bootclasspath prefix into a javac argument -->
502        <property name="build.bootclasspath.arg"
503                 value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
504    
505        <!-- Flatten bootclasspath for trace message -->
506        <property name="javac.bootclasspath"
507                 refid="javac.bootclasspath"/>
508    
509        <!-- Common options in javac invocations -->
510        <property name="build.javac.args"
511                 value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
512    
513        <echo>javac ${build.javac.args}
514    bootclasspath is ${javac.bootclasspath}</echo>
515    
516    </target>    </target>
517    
518    
519    <target name="check-emulation">    <target name="configure-emulation">
520    
521      <condition property="build.emulation.true">      <condition property="build.emulation.true">
522        <or>        <or>
523          <isset property="build.emulation"/>          <and>
524          <os family="windows"/>          <os family="windows"/>
525              <not>
526                <isset property="build.emulation"/>
527              </not>
528            </and>
529            <istrue value="${build.emulation}"/>
530        </or>        </or>
531      </condition>      </condition>
532    
533      </target>
534    
535    
536      <target name="configure-tests">
537    
538        <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
539        <available property="junit.available"
540                   classname="junit.framework.Protectable"/>
541    
542        <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
543              unless="junit.available"/>
544    
545    
546        <!--
547         ! Bootclasspath munging for testing, so JUnit can test our local
548         ! modifications to java.*.
549         -->
550    
551        <path id="test.classpath">
552          <pathelement location="${product.jar}"/>
553          <pathelement location="${build.testcases.dir}"/>
554          <pathelement location="${junit.jar}"/>
555        </path>
556    
557        <!-- Flatten test classpath into a platform-appropriate string -->
558        <property name="test.classpath" refid="test.classpath"/>
559    
560        <!-- Turn the flattened test classpath into a javac argument -->
561        <property name="test.bootclasspath.arg"
562                 value='-Xbootclasspath/p:${test.classpath}'/>
563    
564    </target>    </target>
565    
566    
Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32
Doug Lea
 ViewVC Help
Powered by ViewVC 1.0.8