Simplier variant that also works with Java 5 for backport

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1366164 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-07-26 19:28:43 +00:00
parent eee56c65d5
commit af95ff1ca4
2 changed files with 4 additions and 16 deletions

View File

@ -275,14 +275,9 @@
</target>
<target name="process-webpages" depends="resolve-pegdown">
<pathconvert pathsep="|" property="buildfiles">
<makeurl property="process-webpages.buildfiles" separator="|">
<fileset dir="." includes="**/build.xml" excludes="build.xml,analysis/*,build/**,tools/**,backwards/**,site/**"/>
<mapper>
<scriptmapper language="javascript">
self.addMappedName((new java.io.File(source)).toURI());
</scriptmapper>
</mapper>
</pathconvert>
</makeurl>
<!--
The XSL input file is ignored completely, but XSL expects one to be given,
so we pass ourself (${ant.file}) here. The list of module build.xmls is given
@ -293,7 +288,7 @@
<outputproperty name="version" value="4.0"/>
<outputproperty name="encoding" value="UTF-8"/>
<outputproperty name="indent" value="yes"/>
<param name="buildfiles" expression="${buildfiles}"/>
<param name="buildfiles" expression="${process-webpages.buildfiles}"/>
<param name="version" expression="${version}"/>
</xslt>

View File

@ -248,14 +248,7 @@
depends="define-lucene-javadoc-url-SNAPSHOT,define-lucene-javadoc-url-release"/>
<target name="define-lucene-javadoc-url-SNAPSHOT" if="version.contains.SNAPSHOT">
<pathconvert property="lucene.javadoc.url">
<dirset dir="${common.dir}" includes="build/docs"/>
<mapper>
<scriptmapper language="javascript">
self.addMappedName((new java.io.File(source)).toURI());
</scriptmapper>
</mapper>
</pathconvert>
<makeurl file="${common.dir}/build/docs" validate="false" property="lucene.javadoc.url"/>
</target>
<target name="define-lucene-javadoc-url-release" unless="version.contains.SNAPSHOT">