diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-10 07:45:55 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-10 08:10:10 +0200 |
| commit | 1e22aaf4df18413e537731f6b2bac249022cb72e (patch) | |
| tree | 37db19d7df18a4efd6ab7ee9c887aff81ec406bd /common.xml | |
| parent | 2d8ec53a4d494900962ca079dba4a7372207b7c2 (diff) | |
| download | vaadin-framework-1e22aaf4df18413e537731f6b2bac249022cb72e.tar.gz vaadin-framework-1e22aaf4df18413e537731f6b2bac249022cb72e.zip | |
Added nojavadoc parameter, test-server, test-tb2, test-tb3 targets.
Change-Id: I3b0f4ebc247d0cdbf5d8cdd78c3088207e2f8e45
Diffstat (limited to 'common.xml')
| -rw-r--r-- | common.xml | 50 |
1 files changed, 33 insertions, 17 deletions
diff --git a/common.xml b/common.xml index a1c086c57a..0c1581fbf3 100644 --- a/common.xml +++ b/common.xml @@ -151,28 +151,44 @@ </target> <target name="javadoc.jar" depends="dependencies, filter.webcontent"> - <fail unless="result.dir" message="No result.dir parameter given" /> + <fail unless="result.dir" message="No result.dir parameter given" /> <fail unless="module.name" message="No module.name parameter given" /> <property name="src" location="{$result.dir}/../src" /> <property name="javadoc.dir" value="${result.dir}/javadoc" /> <property name="javadoc.jar" location="${result.dir}/lib/${module.name}-${vaadin.version}-javadoc.jar" /> - <javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}"> - <packageset dir="${src}" excludes="${classes.exclude}" /> - <doctitle><h1>${module.name}</h1></doctitle> - <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> - <bottom>${javadoc.bottom}</bottom> - <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" /> - <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" /> - <classpath refid="classpath.compile.dependencies" /> - </javadoc> - - <!-- Create a javadoc jar --> - <jar file="${javadoc.jar}" compress="true"> - <fileset dir="${javadoc.dir}" /> - <fileset refid="common.files.for.all.jars" /> - </jar> - + <antcontrib:if> + <!-- + Most straight forward way to skip javadocs is to provide + an empty javadoc.jar. Ivy publish won't allow leaving the file + out without using conf attribute. Using conf would make internal + dependency resolution unnecessary complicated. + --> + <isset property="nojavadoc" /> + <then> + <jar file="${javadoc.jar}" compress="true"> + <fileset refid="common.files.for.all.jars" /> + </jar> + </then> + <else> + <javadoc destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="${module.name}"> + <packageset dir="${src}" excludes="${classes.exclude}" /> + + <doctitle><h1>${module.name}</h1></doctitle> + <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> + <bottom>${javadoc.bottom}</bottom> + <link offline="true" href="http://docs.oracle.com/javase/6/docs/api/" packagelistLoc="build/javadoc/j2se-1.6.0" /> + <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" /> + <classpath refid="classpath.compile.dependencies" /> + </javadoc> + + <!-- Create a javadoc jar --> + <jar file="${javadoc.jar}" compress="true"> + <fileset dir="${javadoc.dir}" /> + <fileset refid="common.files.for.all.jars" /> + </jar> + </else> + </antcontrib:if> </target> <target name="jar" depends="compile, pom.xml, filter.webcontent"> |