Update of /cvsroot/monetdb/MonetDB4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25153
Modified Files:
Tag: MonetDB_4-20
RunMapprove.bat.in RunMserver.bat.in RunMtest.bat.in
Log Message:
Fixes for Windows.
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMserver.bat.in,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -d -r1.2 -r1.2.8.1
--- RunMserver.bat.in 4 Jan 2007 22:23:36 -0000 1.2
+++ RunMserver.bat.in 3 Oct 2007 13:27:37 -0000 1.2.8.1
@@ -4,8 +4,21 @@
set [EMAIL PROTECTED]@
-set
MOD_PATH=%builddir%\src\modules\plain\.libs;%builddir%\src\modules\plain;%builddir%\src\modules\contrib\.libs;%builddir%\src\modules\contrib;%builddir%\src\modules\calibrator\.libs;%builddir%\src\modules\calibrator;%builddir%\src\mapi\.libs;%builddir%\src\mapi;%builddir%\src\modules\mnetcdf\.libs;%builddir%\src\modules\mnetcdf
-set PATH=%MOD_PATH%;%builddir%\src\monet;%PATH%
+set MOD_PATH=%builddir%\src\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\plain
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts\tools
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\monet;%PATH%
set PATH=%builddir%\src\tools;%PATH%
Mserver.exe "--config=%builddir%\conf\MonetDB.conf" --set
"monet_mod_path=%MOD_PATH%" %*
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMtest.bat.in,v
retrieving revision 1.6.6.2
retrieving revision 1.6.6.3
diff -u -d -r1.6.6.2 -r1.6.6.3
--- RunMtest.bat.in 3 Oct 2007 09:44:57 -0000 1.6.6.2
+++ RunMtest.bat.in 3 Oct 2007 13:27:37 -0000 1.6.6.3
@@ -31,9 +31,6 @@
set PATH=%builddir%\src\tools;%PATH%
set PATH=%builddir%\conf;%PATH%
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
-
REM execute Mtest.py in the source directory
pushd %srcdir%
Index: RunMapprove.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/RunMapprove.bat.in,v
retrieving revision 1.2
retrieving revision 1.2.8.1
diff -u -d -r1.2 -r1.2.8.1
--- RunMapprove.bat.in 4 Jan 2007 17:30:50 -0000 1.2
+++ RunMapprove.bat.in 3 Oct 2007 13:27:35 -0000 1.2.8.1
@@ -8,15 +8,32 @@
setlocal
+set pkg=monetdb4
+
set [EMAIL PROTECTED]@
set [EMAIL PROTECTED]@
-REM set
PYTHONPATH=%builddir%\src\testing;%srcdir%\src\testing;%builddir%\src\common;%srcdir%\src\mapi\clients\python
+set MOD_PATH=%builddir%\src\modules\plain\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\plain
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\contrib
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\calibrator
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\mapi
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mnetcdf
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts
+set MOD_PATH=%MOD_PATH%;%builddir%\scripts\tools
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\monet;%PATH%
+set PATH=%builddir%\src\tools;%PATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call Mapprove.py "--config=%builddir%\conf\MonetDB.conf"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
+call Mapprove.py "--config=%builddir%\conf\MonetDB.conf" --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--sql_logdir=%builddir%\sql_logs" "--xquery_logdir=%builddir%\xquery_logs"
"--TSTTRGBASE=%builddir%" %*
popd
endlocal
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
