Update of /cvsroot/monetdb/MonetDB5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31634
Modified Files:
Tag: GDK-2
RunMapprove.bat.in RunMapprove.in RunMserver.bat.in
RunMtest.bat.in RunMtest.in
Log Message:
propagated changes of Friday Sep 28 2007 - Wednesday Oct 03 2007
from the development trunk to the GDK-2 branch
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMtest.in,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.4
diff -u -d -r1.28.2.3 -r1.28.2.4
--- RunMtest.in 10 Sep 2007 14:26:48 -0000 1.28.2.3
+++ RunMtest.in 3 Oct 2007 14:53:35 -0000 1.28.2.4
@@ -29,7 +29,7 @@
done
# make sure scripts are executable
-for x in "${builddir}/src/tools/${pkg}-config"
"${srcdir}/src/tools/mcheckpoint" "${srcdir}/src/tools/mrecover"
+for x in "${builddir}/conf/${pkg}-config" "${srcdir}/src/tools/mcheckpoint"
"${srcdir}/src/tools/mrecover"
do
if [ -s $x ] ; then
chmod +x $x
@@ -37,7 +37,7 @@
done
# enhance various paths to find our stuff
-binpath="${builddir}/src/tools:${srcdir}/src/tools"
+binpath="${builddir}/conf:${builddir}/src/tools:${srcdir}/src/tools"
libpath="${MOD_PATH}:${builddir}/src/mal/.libs"
PATH="${binpath}:$PATH"
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMserver.bat.in,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -d -r1.5 -r1.5.6.1
--- RunMserver.bat.in 4 Jan 2007 22:10:48 -0000 1.5
+++ RunMserver.bat.in 3 Oct 2007 14:53:32 -0000 1.5.6.1
@@ -1,13 +1,34 @@
@echo off
+if not "%1"=="" goto skip
+call %0 -rq
+goto end
+
+:skip
+
setlocal
set [EMAIL PROTECTED]@
-set
MOD_PATH=%builddir%\src\compiler\.libs;%builddir%\src\compiler;%builddir%\src\optimizer\.libs;%builddir%\src\optimizer;%builddir%\src\scheduler\.libs;%builddir%\src\scheduler;%builddir%\src\modules\atoms\.libs;%builddir%\src\modules\atoms;%builddir%\src\modules\kernel\.libs;%builddir%\src\modules\kernel;%builddir%\src\modules\mal\.libs;%builddir%\src\modules\mal
-set PATH=%MOD_PATH%;%builddir%\src\mal;%PATH%
+set MOD_PATH=%builddir%\src\compiler\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\compiler
+set MOD_PATH=%MOD_PATH%;%builddir%\src\optimizer\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\optimizer
+set MOD_PATH=%MOD_PATH%;%builddir%\src\scheduler\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\scheduler
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\atoms\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\atoms
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\kernel\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\kernel
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\mal;%PATH%
set PATH=%builddir%\src\tools;%PATH%
mserver5.exe "--config=%builddir%\conf\monetdb5.conf" --set
"monet_mod_path=%MOD_PATH%" %*
endlocal
+
+:end
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMapprove.in,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -u -d -r1.9.6.1 -r1.9.6.2
--- RunMapprove.in 10 Sep 2007 14:26:47 -0000 1.9.6.1
+++ RunMapprove.in 3 Oct 2007 14:53:30 -0000 1.9.6.2
@@ -22,7 +22,7 @@
srcdir=`cd '@srcdir@'; pwd`
# enhance PATH to find ${pkg}-config
-PATH="${builddir}/src/tools:$PATH"
+PATH="${builddir}/conf:$PATH"
export PATH
# execute Mapprove.py in the source directory
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMtest.bat.in,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -u -d -r1.14 -r1.14.4.1
--- RunMtest.bat.in 22 Feb 2007 11:29:14 -0000 1.14
+++ RunMtest.bat.in 3 Oct 2007 14:53:34 -0000 1.14.4.1
@@ -8,8 +8,9 @@
setlocal
+set pkg=monetdb5
set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
set MOD_PATH=%builddir%\src\compiler\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\src\compiler
@@ -23,22 +24,19 @@
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\kernel
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\crackers\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\crackers
-set [EMAIL PROTECTED]@\lib\MonetDB\Tests;%PATH%
-set [EMAIL PROTECTED]@\bin;%PATH%
-set [EMAIL PROTECTED]@\bin;%PATH%
-set [EMAIL PROTECTED]@\bin;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\src\mal;%PATH%
set PATH=%builddir%\src\tools;%PATH%
-
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
+set PATH=%builddir%\src\scheduler;%PATH%
+set PATH=%builddir%\conf;%PATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
-call Mtest.py -5 --config="%builddir%/conf/monetdb5.conf"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--sql_logdir=%builddir%\sql_logs" "--xquery_logdir=%builddir%\xquery_logs"
"--TSTSRCBASE=%srcdir%" "--TSTBLDBASE=%builddir%" "--TSTTRGBASE=%builddir%" %*
+call Mtest.py --config="%builddir%/conf/monetdb5.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
Index: RunMapprove.bat.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/RunMapprove.bat.in,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -d -r1.9 -r1.9.6.1
--- RunMapprove.bat.in 5 Jan 2007 00:32:41 -0000 1.9
+++ RunMapprove.bat.in 3 Oct 2007 14:53:29 -0000 1.9.6.1
@@ -8,15 +8,31 @@
setlocal
+set pkg=monetdb5
set [EMAIL PROTECTED]@
-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\compiler\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\compiler
+set MOD_PATH=%MOD_PATH%;%builddir%\src\optimizer\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\optimizer
+set MOD_PATH=%MOD_PATH%;%builddir%\src\scheduler\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\scheduler
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\atoms\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\atoms
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\kernel\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\kernel
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\mal;%PATH%
+set PATH=%builddir%\src\tools;%PATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call Mapprove.py -5 "--config=%builddir%\conf\monetdb5.conf"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
+call Mapprove.py --config="%builddir%/conf/monetdb5.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
