You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2010/05/04 01:07:03 UTC
svn commit: r940666 - in /lucene/dev/trunk/solr: CHANGES.txt build.xml
common-build.xml
Author: markrmiller
Date: Mon May 3 23:07:02 2010
New Revision: 940666
URL: http://svn.apache.org/viewvc?rev=940666&view=rev
Log:
SOLR-1891: Make lucene-jars-to-solr fail if copying any of the jars fails, and update clean to remove the jars in that directory
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/common-build.xml
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=940666&r1=940665&r2=940666&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon May 3 23:07:02 2010
@@ -351,6 +351,9 @@ Build
* SOLR-1522: Automated release signing process. (gsingers)
+* SOLR-1891: Make lucene-jars-to-solr fail if copying any of the jars fails, and
+ update clean to remove the jars in that directory (Mark Miller)
+
Documentation
----------------------
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=940666&r1=940665&r2=940666&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Mon May 3 23:07:02 2010
@@ -72,6 +72,7 @@
<delete dir="${dest}" />
<delete dir="${dist}" />
<delete dir="example/solr/lib" />
+ <delete dir="${lucene-libs}" />
</target>
<target name="clean-dest"
@@ -565,7 +566,7 @@
<exclude name="*.template" />
</lib>
- <lib dir="lucene-libs"/>
+ <lib dir="${lucene-libs}"/>
<lib dir="${dist}">
<include name="${fullname}-solrj-${version}.jar" />
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=940666&r1=940665&r2=940666&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Mon May 3 23:07:02 2010
@@ -86,6 +86,9 @@
<!-- Destination for compiled classes and binaries -->
<property name="dest" value="build" />
+
+ <!-- Destination for Lucene jars -->
+ <property name="lucene-libs" location="lucene-libs" />
<!-- Javadoc properties -->
<property name="javadoc.years" value="2006 - ${year}" />
@@ -178,18 +181,32 @@
</target>
<target name="lucene-jars-to-solr" depends="prep-lucene-jars">
- <mkdir dir="lucene-libs"/>
- <copy todir="lucene-libs" preservelastmodified="true" flatten="true" failonerror="true">
- <resources>
- <file file="../lucene/build/lucene-core-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/analyzers/common/lucene-analyzers-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/highlighter/lucene-highlighter-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/memory/lucene-memory-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/misc/lucene-misc-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/queries/lucene-queries-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/spatial/lucene-spatial-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/spellchecker/lucene-spellchecker-${lucene_version}.jar" />
- </resources>
+ <mkdir dir="${lucene-libs}"/>
+ <copy todir="${lucene-libs}" preservelastmodified="true" flatten="true" failonerror="true" overwrite="true">
+ <fileset dir="../lucene/build/">
+ <include name="lucene-core-${lucene_version}.jar" />
+ </fileset>
+ <fileset dir="../lucene/build/contrib/analyzers/common">
+ <include name="lucene-analyzers-${lucene_version}.jar" />
+ </fileset>
+ <fileset dir="../lucene/build/contrib/highlighter">
+ <include name="lucene-highlighter-${lucene_version}.jar" />
+ </fileset>
+ <fileset dir="../lucene/build/contrib/memory">
+ <include name="lucene-memory-${lucene_version}.jar" />
+ </fileset>
+ <fileset dir="../lucene/build/contrib/misc">
+ <include name="lucene-misc-${lucene_version}.jar" />
+ </fileset>
+ <fileset dir="../lucene/build/contrib/queries">
+ <include name="lucene-queries-${lucene_version}.jar" />
+ </fileset>
+ <fileset dir="../lucene/build/contrib/spatial">
+ <include name="lucene-spatial-${lucene_version}.jar" />
+ </fileset>
+ <fileset dir="../lucene/build/contrib/spellchecker">
+ <include name="lucene-spellchecker-${lucene_version}.jar" />
+ </fileset>
</copy>
</target>