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.304 by jsr166, Sun Oct 6 17:34:58 2019 UTC vs.
Revision 1.307 by jsr166, Sun Oct 6 19:03:54 2019 UTC

# Line 372 | Line 372
372    <target name="docs"
373            description="Builds javadocs for src/main to dist dir">
374  
375 <    <delete dir="${docs.dir}"/>
375 >    <delete dir="${docs.dir}" quiet="true"/>
376      <mkdir dir="${docs.dir}"/>
377  
378 +    <!-- old school frames via docs/index.html?overview-summary.html -->
379 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
380 +    <local name="use-frames"/>
381 +    <condition property="use-frames">
382 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
383 +    </condition>
384 +
385      <!-- the packagenames="none" hack below prevents scanning the -->
386      <!-- sourcepath for packages -->
387  
# Line 398 | Line 405
405        </fileset>
406        <arg line="-Xdocrootparent ${java.docroot.url}"/>
407        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408 +      <arg value="-quiet"/>
409        <arg value="-XDignore.symbol.file=true"/>
410        <arg value="-html5"/>
411        <arg value="--patch-module=java.base=${src.dir}"/>
412 < <!-- old school frames via docs/index.html?overview-summary.html -->
405 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
406 <      <arg value="--frames"/>
412 >      <arg value="--frames" if:set="use-frames"/>
413        <arg value="--override-methods=summary"/>
414        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
415        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 497 | Line 503
503    </target>
504  
505    <target name="test11">
500    <antcall target="clean"/>
506      <antcall>
507        <param name="java.runtime.target" value="11"/>
508        <param name="build.main.javac" value="${javac11}"/>
509        <param name="build.main.javadoc" value="${javadoc12}"/>
510        <param name="build.main.javadoc.source" value="11"/>
511 +      <target name="clean"/>
512        <target name="test"/>
513        <target name="docs"/>
514      </antcall>
515    </target>
516  
517    <target name="test12">
512    <antcall target="clean"/>
518      <antcall>
519        <param name="java.runtime.target" value="12"/>
520        <param name="build.main.javac" value="${javac12}"/>
521        <param name="build.main.javadoc" value="${javadoc12}"/>
522        <param name="build.main.javadoc.source" value="12"/>
523 +      <target name="clean"/>
524        <target name="test"/>
525        <target name="docs"/>
526      </antcall>
527    </target>
528  
529    <target name="test13">
524    <antcall target="clean"/>
530      <antcall>
531        <param name="java.runtime.target" value="13"/>
532        <param name="build.main.javac" value="${javac13}"/>
533        <param name="build.main.javadoc" value="${javadoc13}"/>
534        <param name="build.main.javadoc.source" value="13"/>
535 +      <target name="clean"/>
536        <target name="test"/>
537        <target name="docs"/>
538      </antcall>
539    </target>
540  
541    <target name="test14">
536    <antcall target="clean"/>
542      <antcall>
543        <param name="java.runtime.target" value="14"/>
544        <param name="build.main.javac" value="${javac14}"/>
545        <param name="build.main.javadoc" value="${javadoc14}"/>
546        <param name="build.main.javadoc.source" value="14"/>
547 +      <target name="clean"/>
548        <target name="test"/>
549        <target name="docs"/>
550      </antcall>
551    </target>
552  
553    <target name="test11-12">
548    <antcall target="clean"/>
554      <antcall>
555        <param name="java.runtime.target" value="12"/>
556        <param name="build.main.javac" value="${javac11}"/>
557        <param name="build.main.javadoc" value="${javadoc12}"/>
558        <param name="build.main.javadoc.source" value="11"/>
559 +      <target name="clean"/>
560        <target name="test"/>
561        <target name="docs"/>
562      </antcall>
563    </target>
564  
565    <target name="test11-13">
560    <antcall target="clean"/>
566      <antcall>
567        <param name="java.runtime.target" value="13"/>
568        <param name="build.main.javac" value="${javac11}"/>
569        <param name="build.main.javadoc" value="${javadoc13}"/>
570        <param name="build.main.javadoc.source" value="11"/>
571 +      <target name="clean"/>
572        <target name="test"/>
573        <target name="docs"/>
574      </antcall>
575    </target>
576  
577    <target name="test11-14">
572    <antcall target="clean"/>
578      <antcall>
579        <param name="java.runtime.target" value="14"/>
580        <param name="build.main.javac" value="${javac11}"/>
581        <param name="build.main.javadoc" value="${javadoc14}"/>
582        <param name="build.main.javadoc.source" value="11"/>
583 +      <target name="clean"/>
584        <target name="test"/>
585        <target name="docs"/>
586      </antcall>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines