Changeset 13524


Ignore:
Timestamp:
Sep 18, 2019 3:08:49 PM (3 months ago)
Author:
jkulla
Message:

#5841 Added additional param "--no-module-directories" to javadoc if java version >= 9

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-jku-2482/Compiler/build-base.xml

    r13488 r13524  
    636636            <isset property="javadoc.packages"/>
    637637            <then>
    638                 <!-- The javadoc directory is sometimes unusable, unclear why.
     638
     639                <!-- We need to add this to builds with Java v9 or greater -->
     640                <var name="javadoc_additional_params" value="--no-module-directories"/>
     641                <if>
     642                    <or>
     643                        <equals arg1="${ant.java.version}" arg2="1.7" />
     644                        <equals arg1="${ant.java.version}" arg2="1.8" />
     645                    </or>
     646                    <then>
     647                        <var name="javadoc_additional_params" value=""/>
     648                    </then>
     649                </if>
     650
     651                <echo message="ant.java.version = ${ant.java.version}" />
     652                <echo message="javadoc_additional_params = ${javadoc_additional_params}" />
     653
     654                <!-- The javadoc directory is sometimes unusable, unclear why.
    639655                     It is recreated by the javadoc task. -->
    640656                <delete dir="${javadoc_output}" />
     
    646662                    excludepackagenames="${test_helper_packages}"
    647663                    classpath="${thirdparty_jars_build}"
     664                    additionalparam="${javadoc_additional_params}"
    648665                    failonerror="true" />
    649666            </then>
Note: See TracChangeset for help on using the changeset viewer.