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 2011/11/05 21:02:00 UTC
svn commit: r1198039 - in /lucene/dev/trunk/lucene: BUILD.txt CHANGES.txt
build.xml common-build.xml
Author: uschindler
Date: Sat Nov 5 20:02:00 2011
New Revision: 1198039
URL: http://svn.apache.org/viewvc?rev=1198039&view=rev
Log:
LUCENE-3561: Fix maven xxx-src.jar files that were missing resources
Modified:
lucene/dev/trunk/lucene/BUILD.txt
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/common-build.xml
Modified: lucene/dev/trunk/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/BUILD.txt?rev=1198039&r1=1198038&r2=1198039&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/BUILD.txt (original)
+++ lucene/dev/trunk/lucene/BUILD.txt Sat Nov 5 20:02:00 2011
@@ -1,22 +1,22 @@
Lucene Build Instructions
Basic steps:
- 0) Install JDK 1.5 (or greater), Ant 1.7.x (not 1.6.x, not 1.8.x)
+ 0) Install JDK 1.6 (or greater), Ant 1.7.1+ (not 1.6.x, not 1.8.x)
1) Download Lucene from Apache and unpack it
2) Connect to the top-level of your Lucene installation
3) Install JavaCC (optional)
4) Run ant
-Step 0) Set up your development environment (JDK 1.5 or greater,
-Ant 1.7.x)
+Step 0) Set up your development environment (JDK 1.6 or greater,
+Ant 1.7.1+)
We'll assume that you know how to get and set up the JDK - if you
don't, then we suggest starting at http://java.sun.com and learning
more about Java, before returning to this README. Lucene runs with
-JDK 1.5 and later.
+JDK 1.6 and later.
Like many Open Source java projects, Lucene uses Apache Ant for build
-control. Specifically, you MUST use Ant version 1.7.x
+control. Specifically, you MUST use Ant version 1.7.1+
Ant is "kind of like make without make's wrinkles". Ant is
implemented in java and uses XML-based configuration files. You can
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1198039&r1=1198038&r2=1198039&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sat Nov 5 20:02:00 2011
@@ -759,6 +759,9 @@ Build
* SOLR-2849: Fix dependencies in Maven POMs. (David Smiley via Steve Rowe)
+* LUCENE-3561: Fix maven xxx-src.jar files that were missing resources.
+ (Uwe Schindler)
+
======================= Lucene 3.4.0 =======================
Bug fixes
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1198039&r1=1198038&r2=1198039&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Sat Nov 5 20:02:00 2011
@@ -571,7 +571,9 @@
<target name="jar-test-framework-src" depends="init">
<jarify basedir="${tests-framework.src.dir}" destfile="${build.dir}/lucene-test-framework-${version}-src.jar"
- title="Lucene Search Engine: Test Framework" />
+ title="Lucene Search Engine: Test Framework">
+ <fileset dir="${tests-framework.src.dir}/../resources" erroronmissingdir="no"/>
+ </jarify>
</target>
<!-- Override common-build.xml definition to check for the jar already being up-to-date -->
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1198039&r1=1198038&r2=1198039&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Sat Nov 5 20:02:00 2011
@@ -321,9 +321,8 @@
</compile>
<!-- Copy the resources folder (if existent) -->
- <copy todir="${build.dir}/classes/java" includeEmptyDirs="false">
- <globmapper from="resources/*" to="*" handledirsep="yes"/>
- <fileset dir="${src.dir}/.." includes="resources/**"/>
+ <copy todir="${build.dir}/classes/java">
+ <fileset dir="${src.dir}/../resources" erroronmissingdir="no"/>
</copy>
</target>
@@ -474,10 +473,9 @@
<target name="compile-test-framework" depends="compile-core">
<compile-test-macro srcdir="${tests-framework.src.dir}" destdir="${common.dir}/build/classes/test-framework"
test.classpath="test-framework.classpath"/>
- <!-- Copy the resources folder (if existent) -->
- <copy todir="${build.dir}/classes/test-framework" includeEmptyDirs="false">
- <globmapper from="resources/*" to="*" handledirsep="yes"/>
- <fileset dir="${tests-framework.src.dir}/.." includes="resources/**"/>
+ <!-- Copy the resources folder (if existent) -->
+ <copy todir="${build.dir}/classes/test-framework">
+ <fileset dir="${src.dir}/../resources" erroronmissingdir="no"/>
</copy>
</target>
@@ -754,7 +752,9 @@
</target>
<target name="jar-src" depends="init">
- <jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar"/>
+ <jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
+ <fileset dir="${src.dir}/../resources" erroronmissingdir="no"/>
+ </jarify>
</target>
<target name="default" depends="jar-core"/>