Update of /cvsroot/monetdb/clients/src/python
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17693/src/python
Modified Files:
Makefile.ag mclient.py.in
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/Makefile.ag,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.ag 31 Aug 2007 15:55:44 -0000 1.6
+++ Makefile.ag 11 Sep 2007 11:11:40 -0000 1.7
@@ -32,7 +32,7 @@
scripts_python = {
EXT = py
- DIR = datadir/MonetDB/python
+ DIR = $(prefix)/$(PYTHON_LIBDIR)/MonetDB
SOURCES = Mapi.py
}
Index: mclient.py.in
===================================================================
RCS file: /cvsroot/monetdb/clients/src/python/mclient.py.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mclient.py.in 30 Aug 2007 12:35:35 -0000 1.1
+++ mclient.py.in 11 Sep 2007 11:11:40 -0000 1.2
@@ -17,22 +17,13 @@
# All Rights Reserved.
import sys
-import os
-
-sys.path.append(os.path.join(os.environ.get('CLIENTS_PREFIX','@QXprefix@'),
- 'share',
- 'MonetDB',
- 'python'))
-sys.path.append(os.path.join(os.environ.get('CLIENTS_SOURCE','@QXCLIENTS_SOURCE@'),
- 'src',
- 'python'))
-sys.path.append(os.path.join(os.environ.get('MONETDB_PREFIX','@QXprefix@'),
- 'share',
- 'MonetDB',
- 'python'))
-import monet_options
-from Mapi import server
+from MonetDB import monet_options
+try:
+ from MonetDB.Mapi import server
+except ImportError:
+ # if running from the build directory Mapi is not in MonetDB module
+ from Mapi import server
import fileinput
@@ -86,7 +77,11 @@
if __name__ == "__main__":
if '--trace' in sys.argv:
sys.argv.remove('--trace')
- import trace
+ try:
+ from MonetDB import trace
+ except ImportError:
+ # if running from the build directory trace is not in MonetDB
module
+ import trace
t = trace.Trace(trace=1, count=0)
t.runfunc(main, sys.argv)
else:
-------------------------------------------------------------------------
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
