commit ac10cec5a86dbbfd821bb6572636fe4cb23cbdde Author: Karsten Loesing karsten.loesing@gmx.net Date: Wed Mar 28 16:41:19 2018 +0200

Make generate-specs target optional.

Without this change, `ant war` would not succeed, because it finds the spec JSP files in two places with the same name, and that is not allowed. --- build.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/build.xml b/build.xml index 0e05d12..3b4222e 100644 --- a/build.xml +++ b/build.xml @@ -151,7 +151,6 @@ </jar>

<antcall target="generate-ml-javadoc" /> - <antcall target="generate-specs" />

<war destfile="${dist}/${warfile}" duplicate="fail" @@ -186,9 +185,6 @@ <zipfileset dir="${resources}/web/jsps" prefix="WEB-INF" includes="*.jsp"/> - <zipfileset dir="${specdir}" - prefix="WEB-INF" - includes="*.jsp"/> <zipfileset dir="${resources}" includes="*.properties" /> <fileset dir="${resources}" includes="jetty.xml" /> @@ -287,7 +283,7 @@ <exec executable="awk" dir="${specdir}" logError="true" - output="${specdir}/${specfile}.jsp" + output="${resources}/web/jsps/${specfile}.jsp" failonerror="true" > <arg value="-f" /> <arg value="${basedir}/${resources}/spec/convert.awk" />