Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26860
Modified Files:
Tag: SQL_2-20
RunMapprove.bat.in RunMserver.bat.in RunMtest.bat.in
Added Files:
Tag: SQL_2-20
RunMserver5.bat
Removed Files:
Tag: SQL_2-20
RunMserver5.bat.in
Log Message:
Fixes for Windows.
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMserver.bat.in,v
retrieving revision 1.6
retrieving revision 1.6.8.1
diff -u -d -r1.6 -r1.6.8.1
--- RunMserver.bat.in 4 Jan 2007 23:44:04 -0000 1.6
+++ RunMserver.bat.in 3 Oct 2007 13:28:53 -0000 1.6.8.1
@@ -2,12 +2,32 @@
setlocal
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+rem default back end is MonetDB4
+set V=4
+if "%1" == "-4" set V=4 & shift
+if "%1" == "-5" set V=5 & shift
+
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+
+if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
+if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+
+set [EMAIL PROTECTED]@
+
+set MOD_PATH=%modpath%
+set MOD_PATH=%builddir%\src\backends\monet%V%\.libs;%MOD_PATH%
-set
MOD_PATH=%builddir%\src\backends\monet4\.libs;%builddir%\src\backends\monet4;%monetdb4_prefix%\lib\MonetDB4;%monetdb4_prefix%\lib\MonetDB4\lib;%monetdb4_prefix%\lib\MonetDB4\bin
set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\server;%PATH%
+set PATH=%builddir%\src\storage\bat;%PATH%
+set PATH=%builddir%\src\common;%PATH%
+set PATH=%builddir%\src\backends\monet%V%;%PATH%
+set PATH=%builddir%\conf;%PATH%
-Mserver.exe "--config=%monetdb4_prefix%\etc\MonetDB.conf" --set
"monet_mod_path=%MOD_PATH%" %*
+if %V% == 4 set mserver=Mserver.exe
+if %V% == 5 set mserver=mserver5.exe
+
+%mserver% --set "monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm" %*
endlocal
--- NEW FILE: RunMserver5.bat ---
@call RunMserver.bat -5 %*
--- RunMserver5.bat.in DELETED ---
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMtest.bat.in,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- RunMtest.bat.in 12 Sep 2007 14:50:36 -0000 1.22
+++ RunMtest.bat.in 3 Oct 2007 13:28:54 -0000 1.22.2.1
@@ -8,38 +8,37 @@
setlocal
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+rem default back end is MonetDB4
+set V=4
+if "%1" == "-4" set V=4 & shift
+if "%1" == "-5" set V=5 & shift
-set MOD_PATH=%builddir%\src\backends\monet4\.libs
-set MOD_PATH=%MOD_PATH%;%sqldir%\src\backends\monet4
-set MOD_PATH=%MOD_PATH%;%monetdb4_prefix%\lib\MonetDB4
-set MOD_PATH=%MOD_PATH%;%monetdb4_prefix%\lib\MonetDB4\lib
-set MOD_PATH=%MOD_PATH%;%monetdb4_prefix%\lib\MonetDB4\bin
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+
+if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
+if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+
+set pkg=monetdb-sql
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+
+set MOD_PATH=%modpath%
+set MOD_PATH=%builddir%\src\backends\monet%V%\.libs;%MOD_PATH%
-set [EMAIL PROTECTED]@\lib\MonetDB\Tests;%PATH%
-set [EMAIL PROTECTED]@\bin;%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\server;%PATH%
set PATH=%builddir%\src\storage\bat;%PATH%
set PATH=%builddir%\src\common;%PATH%
-set PATH=%builddir%\src\backends\monet4;%PATH%
-set PATH=%builddir%\src\backends\monet5;%PATH%
+set PATH=%builddir%\src\backends\monet%V%;%PATH%
set PATH=%builddir%\conf;%PATH%
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
-set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
-set PYTHONPATH=%builddir%\src\backends\monet4;%PYTHONPATH%
+if %V% == 4 set PYTHONPATH=%builddir%\src\backends\monet4;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
-call Mtest.py "--config=%monetdb4_prefix%\etc\MonetDB.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%" %*
-REM "--SQL_PREFIX=%builddir%\src\tools"
+call Mtest.py -%V% "--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/sql/RunMapprove.bat.in,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -d -r1.4 -r1.4.8.1
--- RunMapprove.bat.in 4 Jan 2007 23:44:04 -0000 1.4
+++ RunMapprove.bat.in 3 Oct 2007 13:28:52 -0000 1.4.8.1
@@ -8,14 +8,37 @@
setlocal
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+rem default back end is MonetDB4
+set V=4
+if "%1" == "-4" set V=4 & shift
+if "%1" == "-5" set V=5 & shift
+
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+
+if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
+if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
+
+set pkg=monetdb-sql
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
+
+set MOD_PATH=%modpath%
+set MOD_PATH=%builddir%\src\backends\monet%V%\.libs;%MOD_PATH%
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\src\server;%PATH%
+set PATH=%builddir%\src\storage\bat;%PATH%
+set PATH=%builddir%\src\common;%PATH%
+set PATH=%builddir%\src\backends\monet%V%;%PATH%
+set PATH=%builddir%\conf;%PATH%
+
+if %V% == 4 set PYTHONPATH=%builddir%\src\backends\monet4;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call Mapprove.py "--config=%monetdb4_prefix%\etc\MonetDB.conf"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
+call Mapprove.py -%V% "--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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
