Changeset 13563


Ignore:
Timestamp:
Sep 20, 2019 3:34:10 PM (3 months ago)
Author:
jkulla
Message:

#5841 Build correct JavaDoc for both Java 1.7 and Java 9+. Merged from branches/dev-jku-2482.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Compiler/build-base.xml

    r13488 r13563  
    636636            <isset property="javadoc.packages"/>
    637637            <then>
     638
     639                <!-- We need to add this to builds with Java v9 or greater -->
     640                <condition property="javadoc_additional_params" value="" else="--no-module-directories">
     641                    <or>
     642                        <equals arg1="${ant.java.version}" arg2="1.7" />
     643                        <equals arg1="${ant.java.version}" arg2="1.8" />
     644                    </or>
     645                </condition>
     646
    638647                <!-- The javadoc directory is sometimes unusable, unclear why.
    639648                     It is recreated by the javadoc task. -->
     
    646655                    excludepackagenames="${test_helper_packages}"
    647656                    classpath="${thirdparty_jars_build}"
     657                    additionalparam="${javadoc_additional_params}"
    648658                    failonerror="true" />
    649659            </then>
Note: See TracChangeset for help on using the changeset viewer.