You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2012/03/28 23:50:28 UTC

svn commit: r1306613 - in /lucene/pylucene/branches/branch_3x: CHANGES Makefile

Author: vajda
Date: Wed Mar 28 21:50:28 2012
New Revision: 1306613

URL: http://svn.apache.org/viewvc?rev=1306613&view=rev
Log:
refreshed Linux build options, added an OpenJDK 7 example

Modified:
    lucene/pylucene/branches/branch_3x/CHANGES
    lucene/pylucene/branches/branch_3x/Makefile

Modified: lucene/pylucene/branches/branch_3x/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/CHANGES?rev=1306613&r1=1306612&r2=1306613&view=diff
==============================================================================
--- lucene/pylucene/branches/branch_3x/CHANGES (original)
+++ lucene/pylucene/branches/branch_3x/CHANGES Wed Mar 28 21:50:28 2012
@@ -1,6 +1,7 @@
 Version 3.5.0 ->
 ---------------------
  - renamed classes whose python name would not be unique in lucene module
+ - refreshed Linux build options, added an OpenJDK 7 example
  - 
 
 Version 3.4 -> 3.5.0

Modified: lucene/pylucene/branches/branch_3x/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/Makefile?rev=1306613&r1=1306612&r2=1306613&view=diff
==============================================================================
--- lucene/pylucene/branches/branch_3x/Makefile (original)
+++ lucene/pylucene/branches/branch_3x/Makefile Wed Mar 28 21:50:28 2012
@@ -94,11 +94,13 @@ LUCENE=$(LUCENE_SRC)/lucene
 #JCC=$(PYTHON) /System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/JCC-2.3-py2.3-macosx-10.4-ppc.egg/jcc/__init__.py
 #NUM_FILES=4
 
-# Linux     (Ubuntu 6.06, Python 2.4, Java 1.5, no setuptools)
+# Linux     (Ubuntu 11.10 64-bit, Python 2.7.2, OpenJDK 1.7, setuptools 0.6.16)
+# Be sure to also set JDK['linux2'] in jcc's setup.py to the JAVA_HOME value
+# used below for ANT (and rebuild jcc after changing it).
 #PREFIX_PYTHON=/usr
-#ANT=ant
+#ANT=JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 /usr/bin/ant
 #PYTHON=$(PREFIX_PYTHON)/bin/python
-#JCC=$(PYTHON) $(PREFIX_PYTHON)/lib/python2.4/site-packages/jcc/__init__.py
+#JCC=$(PYTHON) -m jcc --shared
 #NUM_FILES=4
 
 # Linux     (Ubuntu 8.10 64-bit, Python 2.5.2, OpenJDK 1.6, setuptools 0.6c9)
@@ -108,6 +110,13 @@ LUCENE=$(LUCENE_SRC)/lucene
 #JCC=$(PYTHON) -m jcc --shared
 #NUM_FILES=4
 
+# Linux     (Ubuntu 6.06, Python 2.4, Java 1.5, no setuptools)
+#PREFIX_PYTHON=/usr
+#ANT=ant
+#PYTHON=$(PREFIX_PYTHON)/bin/python
+#JCC=$(PYTHON) $(PREFIX_PYTHON)/lib/python2.4/site-packages/jcc/__init__.py
+#NUM_FILES=4
+
 # FreeBSD
 #PREFIX_PYTHON=/usr
 #ANT=ant