[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.30, Wed May 28 14:19:25 2003 UTC revision 1.31, Wed May 28 21:15:50 2003 UTC
# 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"/>
29      <property name="build.novariance.arg" value=""/>
30    
31    <!-- Build locations -->    <!-- Build locations -->
32    <property name="build.dir"            location="build"/>    <property name="build.dir"            location="build"/>
# Line 77  Line 78 
78    </path>    </path>
79    
80    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
81    <property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>    <property name="javac.bootclasspath.prefix"
82               refid="javac.bootclasspath.prefix"/>
83    
84    <!-- Turn the flattened bootclasspath prefix into a javac argument -->    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
85    <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>    <property name="build.bootclasspath.arg"
86               value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
87    
88    
89    <!--    <!--
# Line 99  Line 101 
101    <property name="test.classpath" refid="test.classpath"/>    <property name="test.classpath" refid="test.classpath"/>
102    
103    <!-- Turn the flattened test classpath into a javac argument -->    <!-- Turn the flattened test classpath into a javac argument -->
104    <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>    <property name="test.bootclasspath.arg"
105               value='-Xbootclasspath/p:${test.classpath}'/>
106    
107    
108    
# Line 128  Line 131 
131               fork="true">               fork="true">
132    
133        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
134        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <compilerarg line="${build.javac.args}"/>
135    
136      </javac>      </javac>
137    
# Line 200  Line 203 
203    </target>    </target>
204    
205    
206      <target name="strip"
207              depends="init"
208              description="Strip generics from java source (not working yet)">
209    
210        <mkdir dir="${build.stripped.dir}"/>
211    
212    <!--    <!--
213     # javac -s doesn't reliably generate compilable code. It generates     # javac -s doesn't reliably generate compilable code. It generates
214     # bridge methods (marked as "synthetic") that can have identical     # bridge methods (marked as "synthetic") that can have identical
215     # signatures to existing methods except for the return value.     # signatures to existing methods except for the return value.
216     -->     -->
   <target name="strip"  
           depends="init">  
   
     <mkdir dir="${build.stripped.dir}"/>  
   
217      <javac srcdir="${src.dir}"      <javac srcdir="${src.dir}"
218            destdir="${build.stripped.dir}"            destdir="${build.stripped.dir}"
219              debug="${build.debug}"              debug="${build.debug}"
# Line 219  Line 223 
223               fork="true">               fork="true">
224    
225        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
226        <compilerarg line="${javac.args} ${build.warnings.option} -s"/>        <compilerarg line="${build.javac.args} -s"/>
227    
228      </javac>      </javac>
229    
# Line 273  Line 277 
277    
278    <target name="set-warnings-if" if="build.warnings">    <target name="set-warnings-if" if="build.warnings">
279    
280      <property name="build.warnings.option" value="-warnunchecked"/>      <property name="build.warnings.arg" value="-warnunchecked"/>
281    
282    </target>    </target>
283    
284    
285    <target name="set-warnings-unless" unless="build.warnings">    <target name="set-warnings-unless" unless="build.warnings">
286    
287      <property name="build.warnings.option" value=""/>      <property name="build.warnings.arg" value=""/>
288    
289    </target>    </target>
290    
# Line 292  Line 296 
296      <loadfile property="version" srcFile="version.properties"/>      <loadfile property="version" srcFile="version.properties"/>
297      <echo>Building JSR-166 version ${version}</echo>      <echo>Building JSR-166 version ${version}</echo>
298    
299        <!-- Common options in javac invocations -->
300        <property name="build.javac.args"
301                 value="${build.bootclasspath.arg} ${build.warnings.arg} ${build.novariance.arg}"/>
302    
303    </target>    </target>
304    
305    
# Line 328  Line 336 
336               fork="true">               fork="true">
337    
338        <bootclasspath refid="javac.bootclasspath"/>        <bootclasspath refid="javac.bootclasspath"/>
339        <compilerarg line="${javac.args} ${build.warnings.option}"/>        <compilerarg line="${build.javac.args}"/>
340    
341      </javac>      </javac>
342    
# Line 378  Line 386 
386    
387      <copy todir="${build.filter.src.dir}">      <copy todir="${build.filter.src.dir}">
388        <fileset dir="${src.dir}">        <fileset dir="${src.dir}">
389            <include name="**/*.html"/>
390          </fileset>
391        </copy>
392    
393        <copy todir="${build.filter.src.dir}">
394          <fileset dir="${src.dir}">
395            <exclude name="**/*.html"/>
396          <patternset refid="emulation.excludes"/>          <patternset refid="emulation.excludes"/>
397        </fileset>        </fileset>
398        <filterchain>        <filterchain>
# Line 429  Line 444 
444             source="${build.sourcelevel}"             source="${build.sourcelevel}"
445               fork="true">               fork="true">
446    
       <bootclasspath refid="javac.bootclasspath"/>  
       <compilerarg line="${javac.args} ${build.warnings.option}"/>  
447        <classpath refid="test.classpath"/>        <classpath refid="test.classpath"/>
448          <bootclasspath refid="javac.bootclasspath"/>
449          <compilerarg line="${build.javac.args}"/>
450    
451      </javac>      </javac>
452    
# Line 453  Line 468 
468                      dir="${build.reports.dir}"                      dir="${build.reports.dir}"
469                     fork="true">                     fork="true">
470    
471        <jvmarg value="${test.javac.args}"/>        <jvmarg value="${test.bootclasspath.arg}"/>
472    
473        <formatter type="xml"/>        <formatter type="xml"/>
474    

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8