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.305 by jsr166, Sun Oct 6 17:51:03 2019 UTC vs.
Revision 1.309 by jsr166, Mon Dec 16 22:12:32 2019 UTC

# Line 271 | Line 271
271        <patternset refid="jdk@{target}.jtreg.tests"/>
272        <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273        <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
274 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
275        <arg value="-agentvm"/>
276        <arg value="-noreport"/>
277        <arg value="-verbose:@{verbose}"/>
# Line 372 | Line 373
373    <target name="docs"
374            description="Builds javadocs for src/main to dist dir">
375  
376 <    <delete dir="${docs.dir}"/>
376 >    <delete dir="${docs.dir}" quiet="true"/>
377      <mkdir dir="${docs.dir}"/>
378  
379      <!-- old school frames via docs/index.html?overview-summary.html -->
# Line 405 | Line 406
406        </fileset>
407        <arg line="-Xdocrootparent ${java.docroot.url}"/>
408        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
409 +      <arg value="-quiet"/>
410        <arg value="-XDignore.symbol.file=true"/>
411        <arg value="-html5"/>
412        <arg value="--patch-module=java.base=${src.dir}"/>
# Line 502 | Line 504
504    </target>
505  
506    <target name="test11">
505    <antcall target="clean"/>
507      <antcall>
508        <param name="java.runtime.target" value="11"/>
509        <param name="build.main.javac" value="${javac11}"/>
510        <param name="build.main.javadoc" value="${javadoc12}"/>
511        <param name="build.main.javadoc.source" value="11"/>
512 +      <target name="clean"/>
513        <target name="test"/>
514        <target name="docs"/>
515      </antcall>
516    </target>
517  
518    <target name="test12">
517    <antcall target="clean"/>
519      <antcall>
520        <param name="java.runtime.target" value="12"/>
521        <param name="build.main.javac" value="${javac12}"/>
522        <param name="build.main.javadoc" value="${javadoc12}"/>
523        <param name="build.main.javadoc.source" value="12"/>
524 +      <target name="clean"/>
525        <target name="test"/>
526        <target name="docs"/>
527      </antcall>
528    </target>
529  
530    <target name="test13">
529    <antcall target="clean"/>
531      <antcall>
532        <param name="java.runtime.target" value="13"/>
533        <param name="build.main.javac" value="${javac13}"/>
534        <param name="build.main.javadoc" value="${javadoc13}"/>
535        <param name="build.main.javadoc.source" value="13"/>
536 +      <target name="clean"/>
537        <target name="test"/>
538        <target name="docs"/>
539      </antcall>
540    </target>
541  
542    <target name="test14">
541    <antcall target="clean"/>
543      <antcall>
544        <param name="java.runtime.target" value="14"/>
545        <param name="build.main.javac" value="${javac14}"/>
546        <param name="build.main.javadoc" value="${javadoc14}"/>
547        <param name="build.main.javadoc.source" value="14"/>
548 +      <target name="clean"/>
549        <target name="test"/>
550        <target name="docs"/>
551      </antcall>
552    </target>
553  
554    <target name="test11-12">
553    <antcall target="clean"/>
555      <antcall>
556        <param name="java.runtime.target" value="12"/>
557        <param name="build.main.javac" value="${javac11}"/>
558        <param name="build.main.javadoc" value="${javadoc12}"/>
559        <param name="build.main.javadoc.source" value="11"/>
560 +      <target name="clean"/>
561        <target name="test"/>
562        <target name="docs"/>
563      </antcall>
564    </target>
565  
566    <target name="test11-13">
565    <antcall target="clean"/>
567      <antcall>
568        <param name="java.runtime.target" value="13"/>
569        <param name="build.main.javac" value="${javac11}"/>
570        <param name="build.main.javadoc" value="${javadoc13}"/>
571        <param name="build.main.javadoc.source" value="11"/>
572 +      <target name="clean"/>
573        <target name="test"/>
574        <target name="docs"/>
575      </antcall>
576    </target>
577  
578    <target name="test11-14">
577    <antcall target="clean"/>
579      <antcall>
580        <param name="java.runtime.target" value="14"/>
581        <param name="build.main.javac" value="${javac11}"/>
582        <param name="build.main.javadoc" value="${javadoc14}"/>
583        <param name="build.main.javadoc.source" value="11"/>
584 +      <target name="clean"/>
585        <target name="test"/>
586        <target name="docs"/>
587      </antcall>
# Line 662 | Line 664
664    https://github.com/google/error-prone/issues/1143
665   =================================================================== -->
666    <path id="errorprone.processorpath.path">
667 <    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
667 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
668      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
669      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
670      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
671 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
672    </path>
673    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
674    <property name="errorprone.jsr166.user.flags" value=""/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines