You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bh...@apache.org on 2012/07/11 15:31:05 UTC
svn commit: r1360170 - in /uima/uimacpp/trunk/scriptators: perl/Makefile
python/Makefile tcl/Makefile uima.i
Author: bhavani
Date: Wed Jul 11 13:31:05 2012
New Revision: 1360170
URL: http://svn.apache.org/viewvc?rev=1360170&view=rev
Log:
UIMA-2433 Updated for newer version of python and swig
Modified:
uima/uimacpp/trunk/scriptators/perl/Makefile
uima/uimacpp/trunk/scriptators/python/Makefile
uima/uimacpp/trunk/scriptators/tcl/Makefile
uima/uimacpp/trunk/scriptators/uima.i
Modified: uima/uimacpp/trunk/scriptators/perl/Makefile
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/scriptators/perl/Makefile?rev=1360170&r1=1360169&r2=1360170&view=diff
==============================================================================
--- uima/uimacpp/trunk/scriptators/perl/Makefile (original)
+++ uima/uimacpp/trunk/scriptators/perl/Makefile Wed Jul 11 13:31:05 2012
@@ -19,7 +19,8 @@ ifeq ($(UIMACPP_HOME),)
$(error UIMACPP_HOME not set)
endif
-SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
+SWIGVERSION:=$(shell swig -version | grep SWIG | sed "s/SWIG Version //" )
+#SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
ifeq ($(SWIGVERSION),)
$(error unable to determine SWIGVERSION)
Modified: uima/uimacpp/trunk/scriptators/python/Makefile
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/scriptators/python/Makefile?rev=1360170&r1=1360169&r2=1360170&view=diff
==============================================================================
--- uima/uimacpp/trunk/scriptators/python/Makefile (original)
+++ uima/uimacpp/trunk/scriptators/python/Makefile Wed Jul 11 13:31:05 2012
@@ -19,16 +19,16 @@ ifeq ($(UIMACPP_HOME),)
$(error UIMACPP_HOME not set)
endif
-SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
+SWIGVERSION:=$(shell swig -version | grep SWIG | sed "s/SWIG Version //" )
+#SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version $(SWIGMAJORMINOR).% ,$(shell swig -version 2>&1)))
ifeq ($(SWIGVERSION),)
- $(error unable to determine SWIGVERSION)
+ $(error unable to determine SWIGVERSION looking for $(SWIGMAJOR).$(MAJOR)) Rerun passing in SWIGMAJOR and SWIGMINOR)
endif
SWIGDEPS=uimapywrap.h
SWIGFLAGS=-DSWIG$(subst .,_,$(SWIGVERSION))
-
PYTHONVERSION:=$(subst ., ,$(subst Python ,,$(shell python -V 2>&1)))
ifeq ($(PYTHONVERSION),)
$(error PYTHONVERSION could not be determined)
Modified: uima/uimacpp/trunk/scriptators/tcl/Makefile
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/scriptators/tcl/Makefile?rev=1360170&r1=1360169&r2=1360170&view=diff
==============================================================================
--- uima/uimacpp/trunk/scriptators/tcl/Makefile (original)
+++ uima/uimacpp/trunk/scriptators/tcl/Makefile Wed Jul 11 13:31:05 2012
@@ -19,7 +19,8 @@ ifeq ($(UIMACPP_HOME),)
$(error UIMACPP_HOME not set)
endif
-SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
+SWIGVERSION:=$(shell swig -version | grep SWIG | sed "s/SWIG Version //" )
+#SWIGVERSION:=$(subst SWIG Version ,,$(filter SWIG Version 1.3.%,$(shell swig -version 2>&1)))
ifeq ($(SWIGVERSION),)
$(error unable to determine SWIGVERSION)
Modified: uima/uimacpp/trunk/scriptators/uima.i
URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/scriptators/uima.i?rev=1360170&r1=1360169&r2=1360170&view=diff
==============================================================================
--- uima/uimacpp/trunk/scriptators/uima.i (original)
+++ uima/uimacpp/trunk/scriptators/uima.i Wed Jul 11 13:31:05 2012
@@ -68,6 +68,7 @@ static bool PyUnicodeConvert(PyObject *o
static bool PyStringConvert(PyObject *obj, UnicodeString &rv) {
char *src;
int len;
+ //Py_ssize_t len;
PyString_AsStringAndSize(obj, &src, &len);
rv = UnicodeString((const char *) src, (int32_t) len);
return true;