[lucene2] 06/104: Updated README; try to build only the contribs we support; fixed building of benchmark
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Mar 23 16:27:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository lucene2.
commit 1cedc3f62ea0934168d71038b02c687680689305
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date: Wed Aug 1 20:29:43 2007 +0000
Updated README; try to build only the contribs we support; fixed building of benchmark
---
debian/README.Debian | 7 +-
debian/control | 6 +-
debian/patches/00list | 4 +-
debian/patches/01_remove_all_jarfiles.dpatch | 33 ++++++
debian/patches/01full | 116 ---------------------
debian/patches/{01_full.dpatch => 02_full.dpatch} | 5 +-
.../patches/03_fix-benchmark-jar-locations.dpatch | 35 +++++++
debian/rules | 14 ++-
8 files changed, 92 insertions(+), 128 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 0f8e258..43a9aab 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,8 +11,11 @@ There are two binary packages:
docs, and example applications
Not all contrib libraries are included:
-- ant does not build
-- db/bdb-je, db/bdb and gdata-server need external libraries
+- ant depends on jtidy, which is not (yet) in Debian
+- db/bdb-je depends on je-2.0.90 from www.sleepycat.com, not
+ in Debian
+- gdata-server depends on many libraries, of which at least the
+ Google Data API (com.google.gdata) packages are not in Debian
The Javadoc(TM) for Lucene are included in the liblucene2-java-doc
package, in /usr/share/doc/liblucene2-java-doc/docs/api FIXME
diff --git a/debian/control b/debian/control
index b2329bf..64c61bb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,16 @@ Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>, Barry Hawkins <barry at all
Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), sun-java5-jre, sun-java5-jdk, ant,
ant-optional, javacc, junit, libxalan2-java
Build-Depends-Indep: libjline-java, libcommons-digester-java, libregexp-java,
- libdb4.3-java, libdb4.3-java-dev
+ libdb4.3-java, libdb4.3-java-dev,
+ libcommons-collections3-java, libcommons-logging-java, libcommons-beanutils-java
Standards-Version: 3.7.2
Package: liblucene2-java
Architecture: all
Depends: ${misc:Depends},
sun-java5-jre | sun-java6-jre,
- libjline-java, libcommons-digester-java, libregexp-java, libdb4.3-java
+ libjline-java, libcommons-digester-java, libregexp-java, libdb4.3-java,
+ libcommons-collections3-java, libcommons-logging-java, libcommons-beanutils-java
Description: Full-text search engine library for Java(TM)
Lucene is a full-text search engine for the Java(TM) programming language.
Lucene is not a complete application, but rather a code library and API
diff --git a/debian/patches/00list b/debian/patches/00list
index d216d56..55894dc 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,3 @@
-01_full.dpatch
+01_remove_all_jarfiles.dpatch
+02_full.dpatch
+03_fix-benchmark-jar-locations.dpatch
diff --git a/debian/patches/01_remove_all_jarfiles.dpatch b/debian/patches/01_remove_all_jarfiles.dpatch
new file mode 100755
index 0000000..9519714
--- /dev/null
+++ b/debian/patches/01_remove_all_jarfiles.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh
+## 01_remove_all_jarfiles.dpatch -- Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## DP: We want to be use we do not build using jar files contained
+## DP: in the Lucene distribution tarball, so we start by removing
+## DP: all jar files.
+
+OPERATION="$1"
+DIRECTORY="$2"
+
+if [ -z "$OPERATION" ]; then
+ echo "Illegal arguments"
+ exit 1
+fi
+
+if [ -z "$DIRECTORY" ]; then
+ DIRECTORY="."
+fi
+
+case "$OPERATION" in
+ -patch)
+ echo "Removing all jar files under $DIRECTORY"
+ find $DIRECTORY -name \*.jar -exec rm {} \;
+ ;;
+ -unpatch)
+ echo "Unable to magic back jar files..."
+ ;;
+ *)
+ echo "Illegal command line $1 $2"
+ exit 1
+ ;;
+esac
+
diff --git a/debian/patches/01full b/debian/patches/01full
deleted file mode 100644
index 0b081c5..0000000
--- a/debian/patches/01full
+++ /dev/null
@@ -1,116 +0,0 @@
---- lucene2-2.1.0.orig/contrib/db/bdb/build.xml
-+++ lucene2-2.1.0/contrib/db/bdb/build.xml
-@@ -8,7 +8,7 @@
- <property name="db.version" value="4.3.29" />
-
- <path id="db.jar">
-- <pathelement location="lib/db-${db.version}.jar" />
-+ <pathelement location="/usr/share/java/libdb4.3-java.jar" />
- </path>
-
- <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
-@@ -19,6 +19,7 @@
-
- <property name="build.dir" location="../../../build/contrib/db/bdb" />
- <property name="dist.dir" location="../../../dist/contrib/db/bdb" />
-+ <property name="java.library.path" location="/usr/lib/libdb_java.so" />
-
- <import file="../../contrib-build.xml" />
-
---- lucene2-2.1.0.orig/contrib/lucli/build.xml
-+++ lucene2-2.1.0/contrib/lucli/build.xml
-@@ -8,7 +8,7 @@
-
-
- <path id="additional.dependencies">
-- <pathelement location="lib/jline.jar"/>
-+ <pathelement location="/usr/share/java/jline.jar"/>
- </path>
-
- <pathconvert property="project.classpath"
---- lucene2-2.1.0.orig/contrib/regex/build.xml
-+++ lucene2-2.1.0/contrib/regex/build.xml
-@@ -7,7 +7,8 @@
- </description>
-
- <path id="additional.dependencies">
-- <fileset dir="lib" includes="*-oro-*.jar,*-regexp-*.jar"/>
-+ <fileset dir="/usr/share/java" includes="regexp-*.jar"/>
-+ <!--<fileset dir="/usr/share/java" includes="*-oro-*.jar,*-regexp-*.jar"/> -->
- </path>
-
- <pathconvert property="project.classpath"
---- lucene2-2.1.0.orig/contrib/contrib-build.xml
-+++ lucene2-2.1.0/contrib/contrib-build.xml
-@@ -19,6 +19,7 @@
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="${junit.jar}"/>
-+ <pathelement location="../../build/classes/test"/>
- <pathelement location="${build.dir}/classes/java"/>
- </path>
-
---- lucene2-2.1.0.orig/build.xml
-+++ lucene2-2.1.0/build.xml
-@@ -386,7 +386,7 @@
- <packageset dir="src/demo"/>
-
- <packageset dir="contrib/analyzers/src/java"/>
-- <packageset dir="contrib/ant/src/java"/>
-+ <!-- debian-ignore <packageset dir="contrib/ant/src/java"/> -->
- <packageset dir="contrib/highlighter/src/java"/>
- <packageset dir="contrib/lucli/src/java"/>
- <packageset dir="contrib/memory/src/java"/>
-@@ -400,9 +400,9 @@
- <packageset dir="contrib/wordnet/src/java"/>
- <packageset dir="contrib/benchmark/src/java"/>
-
-- <packageset refid="gdata-server-core" />
-- <packageset refid="gdata-server-gom" />
-- <packageset refid="gdata-server-hivemind" />
-+ <!-- debian-ignore <packageset refid="gdata-server-core" /> -->
-+ <!-- debian-ignore <packageset refid="gdata-server-gom" /> -->
-+ <!-- debian-ignore <packageset refid="gdata-server-hivemind" /> -->
-
- <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
-
-@@ -425,6 +425,9 @@
- <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
- <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
-
-+ <link href="http://jline.sourceforge.net/apidocs/"/>
-+ <link href="http://jakarta.apache.org/regexp/apidocs/"/>
-+ <link href="http://jakarta.apache.org/commons/digester/commons-digester-1.7/docs/api/"/>
-
- </javadoc>
- </sequential>
---- lucene2-2.1.0.orig/common-build.xml
-+++ lucene2-2.1.0/common-build.xml
-@@ -22,7 +22,7 @@
-
- <property name="name" value="${ant.project.name}"/>
- <property name="Name" value="Lucene"/>
-- <property name="version" value="2.1.1-dev"/>
-+ <property name="version" value="2.1.0"/>
- <property name="year" value="2000-${current.year}"/>
- <property name="final.name" value="lucene-${name}-${version}"/>
-
-@@ -38,7 +38,8 @@
- <property name="build.dir" location="build"/>
- <property name="dist.dir" location="dist"/>
-
-- <property name="javacc.home" location="${common.dir}"/>
-+ <property name="javacc.home" location="/usr/share/java"/>
-+ <property name="javacc.jar" location="/usr/share/java/javacc.jar"/>
-
- <property name="junit.output.dir" location="${build.dir}/test"/>
- <property name="junit.reports" location="${build.dir}/test/reports"/>
-@@ -64,7 +65,7 @@
- <available
- property="javacc.present"
- classname="org.javacc.parser.Main"
-- classpath="${javacc.home}/bin/lib/javacc.jar"
-+ classpath="/usr/share/java/javacc.jar"
- />
-
- <available
diff --git a/debian/patches/01_full.dpatch b/debian/patches/02_full.dpatch
similarity index 95%
rename from debian/patches/01_full.dpatch
rename to debian/patches/02_full.dpatch
index 341793d..4da3636 100755
--- a/debian/patches/01_full.dpatch
+++ b/debian/patches/02_full.dpatch
@@ -1,8 +1,9 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_full.dpatch by <janpascal at vanbest.org>
+## 02_full.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: This patch file contains various patches to get Lucene to work
+## DP: nicely with Debian. Needs to be split up in separate patches.
@DPATCH@
diff --git a/debian/patches/03_fix-benchmark-jar-locations.dpatch b/debian/patches/03_fix-benchmark-jar-locations.dpatch
new file mode 100755
index 0000000..1a6c152
--- /dev/null
+++ b/debian/patches/03_fix-benchmark-jar-locations.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix-benchmark-jar-locations.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build.xml of contrib/benchmark so that it uses the jar files
+## DP: in /usr/share/java instead of those in the Lucene source tarball
+
+ at DPATCH@
+
+diff -u -r lucene-2.1.0/contrib/benchmark/build.xml lucene-2.1.0-new/contrib/benchmark/build.xml
+--- lucene-2.1.0/contrib/benchmark/build.xml 2007-02-14 17:46:14.000000000 +0100
++++ lucene-2.1.0-new/contrib/benchmark/build.xml 2007-04-15 17:51:11.000000000 +0200
+@@ -82,17 +82,17 @@
+ <antcall target="extract-reuters"/>
+ </target>
+ <property name="digester.jar" value="commons-digester-1.7.jar"/>
+- <property name="collections.jar" value="commons-collections-3.1.jar"/>
++ <property name="collections.jar" value="commons-collections3.jar"/>
+ <property name="logging.jar" value="commons-logging-1.0.4.jar"/>
+ <property name="bean-utils.jar" value="commons-beanutils-1.7.0.jar"/>
+
+ <path id="classpath">
+ <pathelement path="${common.dir}/build/classes/java"/>
+ <pathelement path="${common.dir}/build/classes/demo"/>
+- <pathelement path="${basedir}/lib/${digester.jar}"/>
+- <pathelement path="${basedir}/lib/${collections.jar}"/>
+- <pathelement path="${basedir}/lib/${logging.jar}"/>
+- <pathelement path="${basedir}/lib/${bean-utils.jar}"/>
++ <pathelement path="/usr/share/java/${digester.jar}"/>
++ <pathelement path="/usr/share/java/${collections.jar}"/>
++ <pathelement path="/usr/share/java/${logging.jar}"/>
++ <pathelement path="/usr/share/java/${bean-utils.jar}"/>
+ </path>
+ <path id="run.classpath">
+ <path refid="classpath"/>
diff --git a/debian/rules b/debian/rules
index c732eca..04bbcf1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,11 +21,11 @@ LUCENE_VERSION = 2.1.0
# Stuff from contrib we include
# We do not include:
-# - ant does not build
-# - benchmark does not build
-# - db/bdb-je, db/bdb and gdata-server need external libraries
+# - ant depends on JTidy
+# - db/bdb-je depends on je
+# - gdata-server depends on Google Data API
# - contrib/javascript, is installed under doc
-LUCENE_CONTRIBS = analyzers db/bdb highlighter memory lucli misc queries regex similarity snowball spellchecker surround swing wordnet xml-query-parser
+LUCENE_CONTRIBS = analyzers benchmark db/bdb highlighter memory lucli miscellaneous queries regex similarity snowball spellchecker surround swing wordnet xml-query-parser
# Explicitly build with sun-java5-jdk
export JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
@@ -76,7 +76,11 @@ build-indep-stamp: configure-stamp
$(ANT) javacc
$(ANT) jar-core
- $(ANT) build-contrib
+ # $(ANT) build-contrib
+ for contrib in $(LUCENE_CONTRIBS); do \
+ cd $(CURDIR)/contrib/$$contrib ; \
+ $(ANT) jar ; \
+ done
$(ANT) war-demo
$(ANT) test
export LD_LIBRARY_PATH=/usr/lib ; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git
More information about the pkg-java-commits
mailing list