Update of /cvsroot/monetdb/geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12357
Modified Files:
Tag: Geom_0-4
RunMserver.bat.in RunMtest.bat.in
Log Message:
One step towards being able to use this on Windows.
U RunMserver.bat.in
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMserver.bat.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -u -d -r1.1.1.1 -r1.1.1.1.4.1
--- RunMserver.bat.in 1 Jun 2007 08:01:47 -0000 1.1.1.1
+++ RunMserver.bat.in 20 Jun 2008 15:52:07 -0000 1.1.1.1.4.1
@@ -2,20 +2,33 @@
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
MOD_PATH=%prefix%\src\modules\plain\.libs;%prefix%\src\modules\plain;%prefix%\src\modules\contrib\.libs;%prefix%\src\modules\contrib;%prefix%\src\modules\calibrator\.libs;%prefix%\src\modules\calibrator;%prefix%\src\modules\mnetcdf\.libs;%prefix%\src\modules\mnetcdf;%prefix%\src\mapi\.libs;%prefix%\src\mapi
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
-rem to find the geom module
-set MOD_PATH=%builddir%\src\.libs;%MOD_PATH%
+if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
+if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
-set
PATH=%prefix%\src\testing;%prefix%\src\tools;%prefix%\src\mapi\clients\C;%prefix%\src\mapi\clients\python;%PATH%
-set
PATH=%MOD_PATH%;%prefix%\src\common;%prefix%\src\gdk;%prefix%\src\mapi\clients\C;%prefix%\src\modules\plain\stream;%prefix%\src\monet;%PATH%
+set [EMAIL PROTECTED]@
+
+set MOD_PATH=%modpath%
+set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
+
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\conf;%PATH%
rem to find geos_c.dll
-set PATH=%builddir%;%PATH%
+set PATH=%GEOS%\bin;%PATH%
-"%prefix%\src\tools\Mserver.exe" --dbinit="module(geom);"
"--config=%prefix%\conf\MonetDB.conf" --set "monet_mod_path=%MOD_PATH%"
--dbname=geom %*
+if %V% == 4 set mserver=Mserver.exe
+if %V% == 5 set mserver=mserver5.exe
+
+%mserver% --set "monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm" %1 %2
%3 %4 %5 %6 %7 %8 %9
endlocal
U RunMtest.bat.in
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.bat.in,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- RunMtest.bat.in 10 Jan 2008 17:03:53 -0000 1.3
+++ RunMtest.bat.in 20 Jun 2008 15:52:08 -0000 1.3.4.1
@@ -22,28 +22,25 @@
if %V% == 4 call "%monetdb4_prefix%\bin\monetdb4-config.bat" --internal
if %V% == 5 call "%monetdb5_prefix%\bin\monetdb5-config.bat" --internal
-REM ... remainder is not working/correct, yet ...
-
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-
-set
MOD_PATH=%prefix%\src\modules\plain\.libs;%prefix%\src\modules\plain;%prefix%\src\modules\contrib\.libs;%prefix%\src\modules\contrib;%prefix%\src\modules\calibrator\.libs;%prefix%\src\modules\calibrator;%prefix%\src\modules\mnetcdf\.libs;%prefix%\src\modules\mnetcdf;%prefix%\src\mapi\.libs;%prefix%\src\mapi
+set pkg=monetdb-geom
+set [EMAIL PROTECTED]@
+set [EMAIL PROTECTED]@
-rem to find the geom module
-set MOD_PATH=%builddir%\src\.libs;%MOD_PATH%
+set MOD_PATH=%modpath%
+set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
+set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
-set
PATH=%prefix%\src\testing;%prefix%\src\tools;%prefix%\src\mapi\clients\C;%prefix%\src\mapi\clients\python;%PATH%
-set
PYTHONPATH=%prefix%\src\testing;%srcdir%\src\testing;%prefix%\src\common;%srcdir%\src\mapi\clients\python
-set
PATH=%MOD_PATH%;%prefix%\src\common;%prefix%\src\gdk;%prefix%\src\mapi\clients\C;%prefix%\src\modules\plain\stream;%prefix%\src\monet;%PATH%
+set PATH=%MOD_PATH%;%PATH%
+set PATH=%builddir%\conf;%PATH%
rem to find geos_c.dll
-set PATH=%builddir%;%PATH%
+set PATH=%GEOS%\bin;%PATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
-call python "Mtest.py" "--TSTSRCBASE=%srcdir%" "--TSTBLDBASE=%builddir%"
"--TSTTRGBASE=%builddir%" "--monet_mod_path=%MOD_PATH%"
"--config=%prefix%\conf\MonetDB.conf" "--dbfarm=%prefix%\dbfarm"
"--sql_logdir=%prefix%\log" %*
+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%" %1 %2 %3 %4
%5 %6 %7 %8 %9
popd
endlocal
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
