Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17756/src/testing
Modified Files:
Makefile.ag Mtest.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: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- Mtest.py.in 6 Sep 2007 10:29:00 -0000 1.300
+++ Mtest.py.in 11 Sep 2007 11:11:46 -0000 1.301
@@ -98,15 +98,12 @@
str = nstr
return str
-# add dir where monet_options, trace & subprocess26 are installed to sys.path
-# we must expand configure variables in the process
-sys.path.append(_configure(os.path.join('@QXdatadir@','@PACKAGE@','python')))
-import monet_options
+from MonetDB import monet_options
try:
import subprocess
except ImportError:
# use private copy for old Python versions
- import subprocess26 as subprocess
+ import MonetDB.subprocess26 as subprocess
randomPortRepeat = 9
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Makefile.ag,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.ag 4 Sep 2007 12:31:01 -0000 1.20
+++ Makefile.ag 11 Sep 2007 11:11:46 -0000 1.21
@@ -47,7 +47,7 @@
scripts_python = {
EXT = py
- DIR = pkgdatadir/python
+ DIR = $(prefix)/$(PYTHON_LIBDIR)/MonetDB
SOURCES = trace.py subprocess26.py
}
-------------------------------------------------------------------------
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
