[Commits] (vajda) fixed bug 1659

[commits at osafoundation.org]

Commit by: vajda
Modified files:
external/PyLucene/Makefile 1.5 1.6
external/PyLucene/patches-0.5.1 1.3 1.4

Log message:
fixed bug 1659

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/PyLucene/Makefile.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/external/PyLucene/patches-0.5.1.diff?r1=text&tr1=1.3&r2=text&tr2=1.4

Index: external/PyLucene/Makefile
diff -u external/PyLucene/Makefile:1.5 external/PyLucene/Makefile:1.6
--- external/PyLucene/Makefile:1.5	Tue Aug 31 14:29:36 2004
+++ external/PyLucene/Makefile	Tue Sep 14 19:16:21 2004
@@ -18,6 +18,8 @@
 PREFIX_DB=$(BUILD_ROOT)/persistence/db/db-4.2.52
 MANIFEST=$(SNAP)/$(SITE)/PyLucene.py \
          $(SNAP)/$(SITE)/_PyLucene$(_SUFFIX).pyd \
+         $(SNAP)/$(SITE)/security/classpath.security \
+         $(SNAP)/$(SITE)/security/libgcj.security \
          $(SNAP)/bin/libdb_java42$(SUFFIX).dll
 else
 
@@ -26,6 +28,8 @@
 PREFIX_DB=$(PREFIX)/db
 MANIFEST=$(SNAP)/$(SITE)/PyLucene.py \
          $(SNAP)/$(SITE)/_PyLucene.so \
+         $(SNAP)/$(SITE)/security/classpath.security \
+         $(SNAP)/$(SITE)/security/libgcj.security \
          $(SNAP)/db/lib/libdb_java-4.2.jnilib \
          $(SNAP)/db/lib/libdb_java-4.2.la \
          $(SNAP)/lib/libgcc_s.1.0.dylib \
@@ -38,6 +42,8 @@
 PREFIX_DB=$(PREFIX)/db
 MANIFEST=$(SNAP)/$(SITE)/PyLucene.py \
          $(SNAP)/$(SITE)/_PyLucene.so \
+         $(SNAP)/$(SITE)/security/classpath.security \
+         $(SNAP)/$(SITE)/security/libgcj.security \
          $(SNAP)/db/lib/libdb_java-4.2.so \
          $(SNAP)/lib/libgcc_s.so.1 \
          $(SNAP)/lib/libgcj.so.5 \

Index: external/PyLucene/patches-0.5.1
diff -u external/PyLucene/patches-0.5.1:1.3 external/PyLucene/patches-0.5.1:1.4
--- external/PyLucene/patches-0.5.1:1.3	Mon Aug 23 17:03:39 2004
+++ external/PyLucene/patches-0.5.1	Tue Sep 14 19:16:21 2004
@@ -86,3 +86,45 @@
  	install $(GCJ_HOME)/lib/libgcc_s.so.1 $(DISTRIB)/gcj
  else
  
+--- PyLucene-0.5.1/Makefile	Tue Sep 14 14:52:58 2004
++++ PyLucene-0.5.1-patched/Makefile	Tue Sep 14 14:51:34 2004
+@@ -347,6 +347,9 @@
+ install:: all
+ 	install PyLucene.py $(PYTHON_SITE)
+ 	install $(PYLUCENE_LIB) $(PYTHON_SITE)
++	mkdir -p $(PYTHON_SITE)/security
++	install $(GCJ_HOME)/lib/security/classpath.security $(PYTHON_SITE)/security
++	install $(GCJ_HOME)/lib/security/libgcj.security $(PYTHON_SITE)/security
+ 
+ ifeq ($(OS),Darwin)
+ install::
+--- PyLucene-0.5.1/PyLucene.i	Sun Jul 11 16:15:15 2004
++++ PyLucene-0.5.1-patched/PyLucene.i	Tue Sep 14 19:09:56 2004
+@@ -674,6 +674,27 @@
+         java::lang::System::getProperties();
+     props->put(JvNewStringUTF("inPython"), objects);
+ 
++    PyObject *sys = PyImport_ImportModule("sys");
++    PyObject *path = PyObject_GetAttrString(sys, "path");
++    int count = PyList_Size(path);
++
++    while (count-- > 0) {
++        PyObject *pp = PyList_GET_ITEM(path, count);
++        char *p = PyString_AsString(pp);
++        int l = strlen(p);
++
++        if (l > 13 && !strcmp(p + l - 13, "site-packages"))
++        {
++            jstring jp = JvNewStringUTF(p);
++
++            props->put(JvNewStringUTF("gnu.classpath.home.url"),
++		       JvNewStringUTF("file:")->concat(jp->replace('\\','/')));
++            break;
++        }
++    }
++    Py_DECREF(path);
++    Py_DECREF(sys);
++
+     JvInitClass(&org::apache::lucene::document::Field::class$);
+     JvInitClass(&org::apache::lucene::queryParser::QueryParser::class$);
+     JvInitClass(&org::apache::lucene::store::FSDirectory::class$);