Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17089/sql

Modified Files:
        RunMapprove.in 
Log Message:

cleaned-up, simplified and "normalized" the RunMapprove.in scripts
(Unix shell script version, only; Windows batch script version still to be 
done...)


Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMapprove.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- RunMapprove.in      5 Jan 2007 00:35:07 -0000       1.9
+++ RunMapprove.in      8 Sep 2007 17:54:15 -0000       1.10
@@ -16,22 +16,29 @@
 # Portions created by CWI are Copyright (C) 1997-2007 CWI.
 # All Rights Reserved.
 
-builddir=`pwd`
+pkg=monetdb-sql
[EMAIL PROTECTED]@
 # make sure srcdir contains absolute path name
 srcdir=`cd '@srcdir@'; pwd`
 
-# enhance various paths to find our stuff
-# 
PYTHONPATH="$builddir/src/testing:$srcdir/src/testing:$builddir/src/common:$srcdir/src/mapi/clients/python"
-#export PATH PYTHONPATH
+# default back-end is MonetDB4
+V=4
+for arg
+do
+    case "$arg" in
+    -4) V=4;;
+    -5) V=5;;
+    esac
+done
+
+# enhance PATH to find ${pkg}-config
+PATH="${builddir}/conf:$PATH"
+export PATH
 
 # execute Mapprove.py in the source directory
 cd "$srcdir"
 
-# check python version
-type -a @PYTHON@
[EMAIL PROTECTED]@ -V
-
-# execute the script
+# execute the script.
 # if no arguments, do a recursive approve (Mapprove.py -r), else pass
 # on the arguments
-exec Mapprove.py --config="`monetdb4-config --sysconfdir`/MonetDB.conf" 
--TSTSRCBASE="$srcdir" --TSTTRGBASE="$builddir" "[EMAIL PROTECTED]"
+exec Mapprove.py -$V --package=${pkg} --TSTTRGBASE="${builddir}" "[EMAIL 
PROTECTED]"


-------------------------------------------------------------------------
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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to