You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/07/26 21:29:49 UTC
svn commit: r1366165 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/build.xml solr/ solr/common-build.xml
Author: uschindler
Date: Thu Jul 26 19:29:49 2012
New Revision: 1366165
URL: http://svn.apache.org/viewvc?rev=1366165&view=rev
Log:
Merged revision(s) 1366164 from lucene/dev/trunk:
Simplier variant that also works with Java 5 for backport
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1366165&r1=1366164&r2=1366165&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Thu Jul 26 19:29:49 2012
@@ -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>
Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1366165&r1=1366164&r2=1366165&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Thu Jul 26 19:29:49 2012
@@ -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">