Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@940666 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2010-05-03 23:07:02 +00:00
parent 7949e3e218
commit a3da442120
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -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
----------------------

3
solr/build.xml
View File

@ -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" />

41
solr/common-build.xml
View File

@ -87,6 +87,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}" />
<property name="javadoc.access" value="protected"/>
@ -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>