Update of /cvsroot/monetdb/clients/src/python/Cimpl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17693/src/python/Cimpl
Modified Files:
CMapi.py Makefile.ag
Log Message:
Put Python files in their own Python module MonetDB.
In the RPMs, put Python files in the Python hierarchy.
Created a new RPM MonetDB-python which contains monet_options.py and other such
files.
Added merovingian man page to RPM.
Fixed MonetDB5 spec file.
Removed Python ODBC interface: it was not directly related to MonetDB.
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/clients/src/python/Cimpl/Makefile.ag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.ag 9 May 2007 11:50:55 -0000 1.4
+++ Makefile.ag 11 Sep 2007 11:11:40 -0000 1.5
@@ -31,14 +31,14 @@
NAME = _MapiLib
SOURCES = MapiLib.py.i
LIBS = ../../mapilib/libMapi $(PYTHON_LIBS) $(MATH_LIBS) $(DL_LIBS)
$(PTHREAD_LIBS)
- DIR = $(prefix)/$(PYTHON_LIBDIR)
+ DIR = $(prefix)/$(PYTHON_LIBDIR)/MonetDB
}
headers_py = {
HEADERS = py
SOURCES = MapiLib.py.i CMapi.py
TARGETS = MapiLib.py CMapi.py
- DIR = $(prefix)/$(PYTHON_LIBDIR)
+ DIR = $(prefix)/$(PYTHON_LIBDIR)/MonetDB
}
EXTRA_DIST = MapiLib.py
Index: CMapi.py
===================================================================
RCS file: /cvsroot/monetdb/clients/src/python/Cimpl/CMapi.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMapi.py 26 Apr 2007 09:27:53 -0000 1.3
+++ CMapi.py 11 Sep 2007 11:11:40 -0000 1.4
@@ -14,7 +14,11 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-import MapiLib
+try:
+ from MonetDB import MapiLib
+except ImportError:
+ # if run from the build directory, MapiLib is not in the MonetDB module
+ import MapiLib
class Mapi:
def __init__(self, host = None, port = 0, username = None, password =
None, lang = None):
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
