Changeset 13560


Ignore:
Timestamp:
Sep 20, 2019 2:14:41 PM (3 months ago)
Author:
jkulla
Message:

#5841 Fix javadoc build issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.14.x/Compiler/build-base.xml

    r13489 r13560  
    636636            <isset property="javadoc.packages"/>
    637637            <then>
     638                <!-- We need to add this to builds with Java v9 or greater -->
     639                <condition property="javadoc_additional_params" value="" else="--no-module-directories">
     640                    <or>
     641                        <equals arg1="${ant.java.version}" arg2="1.7" />
     642                        <equals arg1="${ant.java.version}" arg2="1.8" />
     643                    </or>
     644                </condition>
     645
    638646                <!-- The javadoc directory is sometimes unusable, unclear why.
    639647                     It is recreated by the javadoc task. -->
     
    646654                    excludepackagenames="${test_helper_packages}"
    647655                    classpath="${thirdparty_jars_build}"
    648                     additionalparam="--no-module-directories"
    649                     failonerror="true" />
     656                    additionalparam="${javadoc_additional_params}" />
    650657            </then>
    651658        </if>
Note: See TracChangeset for help on using the changeset viewer.