diff options
| author | Sven Gothel <[email protected]> | 2015-02-03 03:06:57 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-02-03 03:06:57 +0100 |
| commit | d8dff4c9f2186749b167195eeb339c33f56864e8 (patch) | |
| tree | c98d5448c2ecc98e8541e0a328c684d276575096 | |
| parent | 1a80c33a16594e9a7182887a911ed44c9fbc9f79 (diff) | |
Add javadoc arg '-Xdoclint:none' if java >= 1.8 via property 'javadoc.xarg1' avoiding javadoc build failure
| -rw-r--r-- | make/build.xml | 1 | ||||
| -rwxr-xr-x | make/jogamp-env.xml | 21 |
2 files changed, 17 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml index 94bef07..aa3282b 100644 --- a/make/build.xml +++ b/make/build.xml @@ -1042,6 +1042,7 @@ stylesheetfile="doc/javadoc/stylesheet.css"> <classpath path="${classes}"/> <link offline="true" href="${javadoc.link}" packagelistLoc="142-packages" /> + <arg value="${javadoc.xarg1}"/> </javadoc> <copy todir="${javadoc.gluegen.path}/resources" overwrite="true"> <fileset dir="doc/javadoc/resources" includes="*" /> diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index ba3d01d..3a3cc53 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -49,11 +49,12 @@ <condition> <not> <or> - <contains string="${ant.java.version}" substring="1.6" casesensitive="false" /> - <contains string="${ant.java.version}" substring="1.7" casesensitive="false" /> - <contains string="${ant.java.version}" substring="1.8" casesensitive="false" /> - <contains string="${ant.java.version}" substring="1.9" casesensitive="false" /> - <contains string="${ant.java.version}" substring="2.0" casesensitive="false" /> + <equals arg1="${ant.java.version}" arg2="1.6"/> + <equals arg1="${ant.java.version}" arg2="1.7"/> + <equals arg1="${ant.java.version}" arg2="1.8"/> + <equals arg1="${ant.java.version}" arg2="1.9"/> + <equals arg1="${ant.java.version}" arg2="2.0"/> + <equals arg1="${ant.java.version}" arg2="2.1"/> </or> </not> </condition> @@ -68,6 +69,16 @@ <format property="version.timestamp" pattern="yyyyMMdd"/> </tstamp> + <condition property="javadoc.xarg1" value="-Xdoclint:none" else="-J-Ddummy=val"> + <or> + <equals arg1="${ant.java.version}" arg2="1.8"/> + <equals arg1="${ant.java.version}" arg2="1.9"/> + <equals arg1="${ant.java.version}" arg2="2.0"/> + <equals arg1="${ant.java.version}" arg2="2.1"/> + </or> + </condition> + <echo message="javadoc.xarg1 ${javadoc.xarg1}"/> + <condition property="jogamp.jar.codebase" value="${env.JOGAMP_JAR_CODEBASE}"> <not> <equals arg1="${env.JOGAMP_JAR_CODEBASE}" arg2="$${env.JOGAMP_JAR_CODEBASE}" casesensitive="true" /> |