You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/02/23 02:11:06 UTC
svn commit: r746852 - in /lucene/pylucene/trunk/jcc: CHANGES
jcc/sources/JArray.cpp jcc/sources/functions.cpp jcc/sources/types.cpp
setup.py
Author: vajda
Date: Mon Feb 23 01:11:05 2009
New Revision: 746852
URL: http://svn.apache.org/viewvc?rev=746852&view=rev
Log:
- added JDK variable to setup.py to better parameterize build configuration
Modified:
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp
lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
lucene/pylucene/trunk/jcc/jcc/sources/types.cpp
lucene/pylucene/trunk/jcc/setup.py
Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=746852&r1=746851&r2=746852&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Mon Feb 23 01:11:05 2009
@@ -8,6 +8,7 @@
- unhandled java exception now is printed out via ExceptionDescribe()
- added cast to placate Solaris compiler error in JArray.cpp
- JArray Python wrappers should return None when passed a null array
+ - added JDK variable to setup.py to better parameterize build configuration
-
Version 2.0 -> 2.1
Modified: lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp?rev=746852&r1=746851&r2=746852&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JArray.cpp Mon Feb 23 01:11:05 2009
@@ -1075,7 +1075,7 @@
PyObject *JArray_Type(PyObject *self, PyObject *arg)
{
PyObject *type_name = NULL, *type;
- char *name = NULL;
+ char const *name = NULL;
if (PyType_Check(arg))
{
Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp?rev=746852&r1=746851&r2=746852&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.cpp Mon Feb 23 01:11:05 2009
@@ -152,8 +152,8 @@
PyObject *obj = PySequence_GetItem(arg, 0);
int ok =
(obj == Py_None ||
- PyObject_TypeCheck(obj, &ObjectType) &&
- cls->isInstance(((t_Object *) obj)->object));
+ (PyObject_TypeCheck(obj, &ObjectType) &&
+ cls->isInstance(((t_Object *) obj)->object)));
Py_DECREF(obj);
if (ok)
Modified: lucene/pylucene/trunk/jcc/jcc/sources/types.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/types.cpp?rev=746852&r1=746851&r2=746852&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/types.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/types.cpp Mon Feb 23 01:11:05 2009
@@ -249,7 +249,9 @@
static void t_descriptor_dealloc(t_descriptor *self)
{
if (self->flags & DESCRIPTOR_VALUE)
+ {
Py_DECREF(self->access.value);
+ }
self->ob_type->tp_free((PyObject *) self);
}
Modified: lucene/pylucene/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=746852&r1=746851&r2=746852&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Mon Feb 23 01:11:05 2009
@@ -21,25 +21,38 @@
else:
platform = sys.platform
-# Add or edit the entry corresponding to your system in the INCLUDES, CFLAGS
-# DEBUG_CFLAGS, LFLAGS and JAVAC dictionaries below. These entries are used
-# to build JCC _and_ by JCC to drive compiling and linking via distutils or
-# setuptools the extensions it generated code for. The key for your system
-# is determined by the platform variable defined above.
+# Add or edit the entry corresponding to your system in the JDK, INCLUDES,
+# CFLAGS, DEBUG_CFLAGS, LFLAGS and JAVAC dictionaries below.
+# These entries are used to build JCC _and_ by JCC to drive compiling and
+# linking via distutils or setuptools the extensions it generated code for.
+#
+# The key for your system is determined by the platform variable defined
+# above.
#
# Instead of editing the entries below, you may also override these
-# dictionaries with JCC_INCLUDES, JCC_CFLAGS, JCC_DEBUG_CFLAGS, JCC_LFLAGS
-# and JCC_JAVAC environment variables using os.pathsep as value separator.
+# dictionaries with JCC_JDK, JCC_INCLUDES, JCC_CFLAGS, JCC_DEBUG_CFLAGS,
+# JCC_LFLAGS and JCC_JAVAC environment variables using os.pathsep as value
+# separator.
+
+JDK = {
+ 'darwin': '/System/Library/Frameworks/JavaVM.framework/Versions/Current',
+ 'ipod': '/usr/include/gcc',
+ 'linux2': '/usr/lib/jvm/java-6-openjdk',
+ 'sunos5': '/usr/jdk/instances/jdk1.6.0',
+ 'win32': 'o:/Java/jdk1.6.0_02',
+}
+if 'JCC_JDK' in os.environ:
+ JDK[platform] = os.environ['JCC_JDK']
INCLUDES = {
- 'darwin': ['/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers'],
- 'ipod': ['/usr/include/gcc/darwin/default'],
- 'linux2': ['/usr/lib/jvm/java-6-openjdk/include',
- '/usr/lib/jvm/java-6-openjdk/include/linux'],
- 'sunos5': ['/usr/jdk/instances/jdk1.6.0/include',
- '/usr/jdk/instances/jdk1.6.0/include/solaris'],
- 'win32': ['o:/Java/jdk1.6.0_02/include',
- 'o:/Java/jdk1.6.0_02/include/win32'],
+ 'darwin': ['%(darwin)s/Headers' %(JDK)],
+ 'ipod': ['%(ipod)s/darwin/default' %(JDK)],
+ 'linux2': ['%(linux2)s/include' %(JDK),
+ '%(linux2)s/include/linux' %(JDK)],
+ 'sunos5': ['%(sunos5)s/include' %(JDK),
+ '%(sunos5)s/include/solaris' %(JDK)],
+ 'win32': ['%(win32)s/include' %(JDK),
+ '%(win32)s/include/win32' %(JDK)],
}
CFLAGS = {
@@ -64,19 +77,19 @@
'darwin': ['-framework', 'JavaVM', '-framework', 'Python'],
'ipod': ['-ljvm', '-lpython%s.%s' %(sys.version_info[0:2]),
'-L/usr/lib/gcc/arm-apple-darwin9/4.0.1'],
- 'linux2/i386': ['-L/usr/lib/jvm/java-6-sun/jre/lib/i386', '-ljava',
- '-L/usr/lib/jvm/java-6-sun/jre/lib/i386/client', '-ljvm',
- '-Wl,-rpath=/usr/lib/jvm/java-6-sun/jre/lib/i386:/usr/lib/jvm/java-6-sun/jre/lib/i386/client'],
- 'linux2/i686': ['-L/usr/lib/jvm/java-6-sun/jre/lib/i386', '-ljava',
- '-L/usr/lib/jvm/java-6-sun/jre/lib/i386/client', '-ljvm',
- '-Wl,-rpath=/usr/lib/jvm/java-6-sun/jre/lib/i386:/usr/lib/jvm/java-6-sun/jre/lib/i386/client'],
- 'linux2/x86_64': ['-L/usr/lib/jvm/java-6-openjdk/jre/lib/amd64', '-ljava',
- '-L/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server', '-ljvm',
- '-Wl,-rpath=/usr/lib/jvm/java-6-openjdk/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64/server'],
- 'sunos5': ['-L/usr/jdk/instances/jdk1.6.0/jre/lib/i386', '-ljava',
- '-L/usr/jdk/instances/jdk1.6.0/jre/lib/i386/client', '-ljvm',
- '-R/usr/jdk/instances/jdk1.6.0/jre/lib/i386:/usr/jdk/instances/jre/lib/i386/client'],
- 'win32': ['/LIBPATH:o:/Java/jdk1.6.0_02/lib', 'jvm.lib'],
+ 'linux2/i386': ['-L%(linux2)s/jre/lib/i386' %(JDK), '-ljava',
+ '-L%(linux2)s/jre/lib/i386/client' %(JDK), '-ljvm',
+ '-Wl,-rpath=%(linux2)s/jre/lib/i386:%(linux2)s/jre/lib/i386/client' %(JDK)],
+ 'linux2/i686': ['-L%(linux2)s/jre/lib/i386' %(JDK), '-ljava',
+ '-L%(linux2)s/jre/lib/i386/client' %(JDK), '-ljvm',
+ '-Wl,-rpath=%(linux2)s/jre/lib/i386:%(linux2)s/jre/lib/i386/client' %(JDK)],
+ 'linux2/x86_64': ['-L%(linux2)s/jre/lib/amd64' %(JDK), '-ljava',
+ '-L%(linux2)s/jre/lib/amd64/server' %(JDK), '-ljvm',
+ '-Wl,-rpath=%(linux2)s/jre/lib/amd64:%(linux2)s/jre/lib/amd64/server' %(JDK)],
+ 'sunos5': ['-L%(sunos5)s/jre/lib/i386' %(JDK), '-ljava',
+ '-L%(sunos5)s/jre/lib/i386/client' %(JDK), '-ljvm',
+ '-R%(sunos5)s/jre/lib/i386:%(sunos5)s/jre/lib/i386/client' %(JDK)],
+ 'win32': ['/LIBPATH:%(win32)s/lib' %(JDK), 'jvm.lib'],
}
if platform == 'linux2':