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.306 by jsr166, Sun Oct 6 18:23:18 2019 UTC

# Line 375 | Line 375
375      <delete dir="${docs.dir}"/>
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 401 | Line 408
408        <arg value="-XDignore.symbol.file=true"/>
409        <arg value="-html5"/>
410        <arg value="--patch-module=java.base=${src.dir}"/>
411 < <!-- old school frames via docs/index.html?overview-summary.html -->
405 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
406 <      <arg value="--frames"/>
411 >      <arg value="--frames" if:set="use-frames"/>
412        <arg value="--override-methods=summary"/>
413        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
414        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 497 | Line 502
502    </target>
503  
504    <target name="test11">
500    <antcall target="clean"/>
505      <antcall>
506        <param name="java.runtime.target" value="11"/>
507        <param name="build.main.javac" value="${javac11}"/>
508        <param name="build.main.javadoc" value="${javadoc12}"/>
509        <param name="build.main.javadoc.source" value="11"/>
510 +      <target name="clean"/>
511        <target name="test"/>
512        <target name="docs"/>
513      </antcall>
514    </target>
515  
516    <target name="test12">
512    <antcall target="clean"/>
517      <antcall>
518        <param name="java.runtime.target" value="12"/>
519        <param name="build.main.javac" value="${javac12}"/>
520        <param name="build.main.javadoc" value="${javadoc12}"/>
521        <param name="build.main.javadoc.source" value="12"/>
522 +      <target name="clean"/>
523        <target name="test"/>
524        <target name="docs"/>
525      </antcall>
526    </target>
527  
528    <target name="test13">
524    <antcall target="clean"/>
529      <antcall>
530        <param name="java.runtime.target" value="13"/>
531        <param name="build.main.javac" value="${javac13}"/>
532        <param name="build.main.javadoc" value="${javadoc13}"/>
533        <param name="build.main.javadoc.source" value="13"/>
534 +      <target name="clean"/>
535        <target name="test"/>
536        <target name="docs"/>
537      </antcall>
538    </target>
539  
540    <target name="test14">
536    <antcall target="clean"/>
541      <antcall>
542        <param name="java.runtime.target" value="14"/>
543        <param name="build.main.javac" value="${javac14}"/>
544        <param name="build.main.javadoc" value="${javadoc14}"/>
545        <param name="build.main.javadoc.source" value="14"/>
546 +      <target name="clean"/>
547        <target name="test"/>
548        <target name="docs"/>
549      </antcall>
550    </target>
551  
552    <target name="test11-12">
548    <antcall target="clean"/>
553      <antcall>
554        <param name="java.runtime.target" value="12"/>
555        <param name="build.main.javac" value="${javac11}"/>
556        <param name="build.main.javadoc" value="${javadoc12}"/>
557        <param name="build.main.javadoc.source" value="11"/>
558 +      <target name="clean"/>
559        <target name="test"/>
560        <target name="docs"/>
561      </antcall>
562    </target>
563  
564    <target name="test11-13">
560    <antcall target="clean"/>
565      <antcall>
566        <param name="java.runtime.target" value="13"/>
567        <param name="build.main.javac" value="${javac11}"/>
568        <param name="build.main.javadoc" value="${javadoc13}"/>
569        <param name="build.main.javadoc.source" value="11"/>
570 +      <target name="clean"/>
571        <target name="test"/>
572        <target name="docs"/>
573      </antcall>
574    </target>
575  
576    <target name="test11-14">
572    <antcall target="clean"/>
577      <antcall>
578        <param name="java.runtime.target" value="14"/>
579        <param name="build.main.javac" value="${javac11}"/>
580        <param name="build.main.javadoc" value="${javadoc14}"/>
581        <param name="build.main.javadoc.source" value="11"/>
582 +      <target name="clean"/>
583        <target name="test"/>
584        <target name="docs"/>
585      </antcall>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines