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.110 by jsr166, Sun Jan 20 01:09:12 2013 UTC vs.
Revision 1.113 by jsr166, Sun Jan 20 03:51:38 2013 UTC

# Line 49 | Line 49
49  
50    <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51    <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 <  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
52 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53    <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54  
55    <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
# Line 307 | Line 307
307      <mkdir dir="${build.testcases.dir}"/>
308  
309      <javac srcdir="${tck.src.dir}"
310 <          destdir="${build.testcases.dir}"
311 <            debug="${build.debug}"
312 <       debuglevel="${build.debuglevel}"
313 <      deprecation="${build.deprecation}"
314 <           source="${build.sourcelevel}"
315 <             fork="true">
310 >           destdir="${build.testcases.dir}"
311 >           debug="${build.debug}"
312 >           debuglevel="${build.debuglevel}"
313 >           deprecation="${build.deprecation}"
314 >           source="6"
315 >           classpath="${junit.jar}"
316 >           bootclasspath="${product.jar}:${bootclasspath6}"
317 >           includeAntRuntime="false"
318 >           includeJavaRuntime="false"
319 >           executable="${javac8}"
320 >           fork="true">
321  
322 <      <compilerarg value="${bootclasspath.args}"/>
322 >      <include name="**/*.java"/>
323        <compilerarg line="${build.args}"/>
324        <compilerarg value="-XDignore.symbol.file=true"/>
325 <
321 <      <classpath refid="test.classpath"/>
325 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326  
327      </javac>
328  
329      <javac srcdir="${test.src.dir}"
330 <          destdir="${build.testcases.dir}"
331 <            debug="${build.debug}"
332 <       debuglevel="${build.debuglevel}"
333 <      deprecation="${build.deprecation}"
334 <           source="${build.sourcelevel}"
335 <             fork="true">
330 >           destdir="${build.testcases.dir}"
331 >           debug="${build.debug}"
332 >           debuglevel="${build.debuglevel}"
333 >           deprecation="${build.deprecation}"
334 >           source="6"
335 >           classpath=""
336 >           bootclasspath="${product.jar}:${bootclasspath6}"
337 >           includeAntRuntime="false"
338 >           includeJavaRuntime="false"
339 >           executable="${javac8}"
340 >           fork="true">
341  
342 <      <include name="jsr166/test/**"/>
342 >      <include name="jsr166/test/**/*.java"/>
343  
335      <compilerarg value="${bootclasspath.args}"/>
344        <compilerarg line="${build.args}"/>
345        <compilerarg value="-XDignore.symbol.file=true"/>
346 <
339 <      <classpath refid="test.classpath"/>
346 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347  
348      </javac>
349  
# Line 353 | Line 360
360        <compilerarg line="${build.args}"/>
361        <compilerarg value="-XDignore.symbol.file=true"/>
362  
356      <classpath refid="test.classpath"/>
357
363      </javac>
364   -->
365  
# Line 374 | Line 379
379            errorProperty="junit.failed"
380          failureProperty="junit.failed"
381                      dir="${build.reports.dir}"
382 +                    jvm="${java8}"
383                     fork="true">
384  
385 <      <jvmarg value="${bootclasspath.args}"/>
385 >      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
386        <jvmarg value="-server"/>
387        <jvmarg value="-showversion"/>
388  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines