svn commit: r820473 - in /lucene/pylucene/trunk: CHANGES Makefile jcc/jcc/__main__.py

[va...@apache.org]

Author: vajda
Date: Wed Sep 30 22:11:28 2009
New Revision: 820473

URL: http://svn.apache.org/viewvc?rev=820473&view=rev
Log:
 - added 'memory' contrib module to default build

Modified:
    lucene/pylucene/trunk/CHANGES
    lucene/pylucene/trunk/Makefile
    lucene/pylucene/trunk/jcc/jcc/__main__.py

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=820473&r1=820472&r2=820473&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Wed Sep 30 22:11:28 2009
@@ -6,6 +6,7 @@
  - added Mac OS X 10.6 section to Makefile
  - added FieldCache.Parser Python extension classes
  - added FieldComparator and FieldComparatorSource Python extension classes
+ - added 'memory' contrib module to default build
  - 
 
 Version 2.4.0 -> 2.4.1

Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=820473&r1=820472&r2=820473&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Wed Sep 30 22:11:28 2009
@@ -48,6 +48,13 @@
 #JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64
 #NUM_FILES=2
 
+# Mac OS X 10.6 (64-bit and 32-bit Python 2.6 together, Java 1.6)
+#PREFIX_PYTHON=/usr
+#ANT=ant
+#PYTHON=$(PREFIX_PYTHON)/bin/python
+#JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386
+#NUM_FILES=2
+
 # Mac OS X 10.5 (32-bit Python 2.5, Java 1.5)
 #PREFIX_PYTHON=/usr
 #ANT=ant
@@ -116,8 +123,9 @@
 
 LUCENE_JAR=$(LUCENE)/build/lucene-core-$(LUCENE_VER).jar
 SNOWBALL_JAR=$(LUCENE)/build/contrib/snowball/lucene-snowball-$(LUCENE_VER).jar
-HIGHLIGHTER_JAR=$(LUCENE)/build/contrib/highlighter/lucene-highlighter-$(LUCENE_VER).jar
 ANALYZERS_JAR=$(LUCENE)/build/contrib/analyzers/common/lucene-analyzers-$(LUCENE_VER).jar
+HIGHLIGHTER_JAR=$(LUCENE)/build/contrib/highlighter/lucene-highlighter-$(LUCENE_VER).jar
+MEMORY_JAR=$(LUCENE)/build/contrib/memory/lucene-memory-$(LUCENE_VER).jar
 REGEX_JAR=$(LUCENE)/build/contrib/regex/lucene-regex-$(LUCENE_VER).jar
 QUERIES_JAR=$(LUCENE)/build/contrib/queries/lucene-queries-$(LUCENE_VER).jar
 INSTANTIATED_JAR=$(LUCENE)/build/contrib/instantiated/lucene-instantiated-$(LUCENE_VER).jar
@@ -152,11 +160,14 @@
 $(SNOWBALL_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/contrib/snowball; $(ANT) -Dversion=$(LUCENE_VER)
 
+$(ANALYZERS_JAR): $(LUCENE_JAR)
+	cd $(LUCENE)/contrib/analyzers/common; $(ANT) -Dversion=$(LUCENE_VER)
+
 $(HIGHLIGHTER_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/contrib/highlighter; $(ANT) -Dversion=$(LUCENE_VER)
 
-$(ANALYZERS_JAR): $(LUCENE_JAR)
-	cd $(LUCENE)/contrib/analyzers/common; $(ANT) -Dversion=$(LUCENE_VER)
+$(MEMORY_JAR): $(LUCENE_JAR)
+	cd $(LUCENE)/contrib/memory; $(ANT) -Dversion=$(LUCENE_VER)
 
 $(REGEX_JAR): $(LUCENE_JAR)
 	rm -f $(LUCENE)/contrib/regex/src/java/org/apache/lucene/search/regex/JakartaRegexpCapabilities.java
@@ -172,7 +183,8 @@
 $(EXTENSIONS_JAR): $(LUCENE_JAR)
 	$(ANT) -f extensions.xml -Dlucene.dir=$(LUCENE)
 
-JARS=$(LUCENE_JAR) $(SNOWBALL_JAR) $(HIGHLIGHTER_JAR) $(ANALYZERS_JAR) \
+JARS=$(LUCENE_JAR) $(SNOWBALL_JAR) $(ANALYZERS_JAR) \
+     $(HIGHLIGHTER_JAR) $(MEMORY_JAR) \
      $(REGEX_JAR) $(QUERIES_JAR) $(INSTANTIATED_JAR) $(EXTENSIONS_JAR)
 
 

Modified: lucene/pylucene/trunk/jcc/jcc/__main__.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/__main__.py?rev=820473&r1=820472&r2=820473&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/__main__.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/__main__.py Wed Sep 30 22:11:28 2009
@@ -60,7 +60,7 @@
     --files N               - split the generated wrapper file into at least
                               N files to workaround C++ compiler file size
                               limitations 
-    --arch                  - Mac OS X only: override the -arch parameters
+    --arch                  - Mac OS X only: filter the -arch parameters
                               Python was configured with to build leaner
                               binaries, faster