Changeset: fb7fa5b28dde for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb7fa5b28dde
Modified Files:
NT/rules.msc
clients/RunMtest.bat.in
geom/RunMtest.bat.in
monetdb4/RunMtest.bat.in
monetdb5/RunMtest.bat.in
pathfinder/RunMtest.bat.in
sql/RunMtest.bat.in
Branch: Mar2011
Log Message:
Fixed RunMtest.bat scripts.
With these changes, RunMtest.bat seems to work on Windows.
The various scripts are now more aligned with minimal differences
between the monetdb5, sql, and geom versions, and also between the
monetdb4 and pathfinder versions. These sets, and the clients version
also differ only where needed.
One reason the old versions didn't work is that the (expanded
--monet_mod_path argument was longer than a cmd scripts can deal
with. These versions use the minimal --monet_mod_path argument
(i.e. only directories where there are files to be found).
diffs (truncated from 721 to 300 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -330,6 +330,7 @@
"BITS32_FALSE=$(BITS32_FALSE)" \
"BITS64_FALSE=$(BITS64_FALSE)" \
"DOCTOOLS_FALSE=$(DOCTOOLS_FALSE)" \
+ "HAVE_CFITSIO_FALSE=$(HAVE_CFITSIO_FALSE)" \
"HAVE_JAVAJDBC_FALSE=$(HAVE_JAVAJDBC_FALSE)" \
"HAVE_JAVAXRPC_FALSE=$(HAVE_JAVAXRPC_FALSE)" \
"HAVE_JAVA_FALSE=$(HAVE_JAVA_FALSE)" \
@@ -338,6 +339,7 @@
"HAVE_LIBZ_FALSE=$(HAVE_LIBZ_FALSE)" \
"HAVE_MONETDB4_FALSE=$(HAVE_MONETDB4_FALSE)" \
"HAVE_MONETDB5_FALSE=$(HAVE_MONETDB5_FALSE)" \
+ "HAVE_MSEED_FALSE=$(HAVE_MSEED_FALSE)" \
"HAVE_NETCDF_FALSE=$(HAVE_NETCDF_FALSE)" \
"HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \
"HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -2,7 +2,7 @@
if not "%1"=="" goto skip
call %0 -rq
-goto end
+goto :EOF
:skip
@@ -10,29 +10,31 @@
set pkg=clients
set buildbase=@XBUILD@
-set builddir=%buildbase%\clients
-set srcdir=@XSOURCE@\clients
+set srcdir=@XSOURCE@
+rem binaries (.exe)
+set PATH=%buildbase%\clients\examples\C;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%PATH%
+set PATH=%buildbase%\clients\odbc\samples;%PATH%
set PATH=%buildbase%\testing;%PATH%
-set
PATH=%builddir%\examples\C;%builddir%\examples\php;%builddir%\examples\python;%builddir%\perl\Tests;%PATH%
-set PATH=%builddir%\mapiclient;%PATH%
-set PATH=%builddir%\mapilib;%PATH%
+rem libraries (.dll)
+set PATH=%buildbase%\clients\mapilib;%PATH%
+set PATH=%buildbase%\clients\perl\Cimpl;%PATH%
+set PATH=%buildbase%\common\stream;%PATH%
-set
PYTHONPATH=%builddir%\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
-set perlib=%builddir%\perl;%srcdir%\perl
+set perlib=%buildbase%\clients\perl;%srcdir%\clients\perl
set PERLLIB=%perlib%;%PERLLIB%
set PERL5LIB=%perlib%;%PERL5LIB%
-REM execute Mtest.py in the source directory
-pushd %srcdir%
+rem execute Mtest.py in the source directory
+pushd "%srcdir%"
-call "%buildbase%\testing\Mtest.py" --package=%pkg%
"--dbfarm=%builddir%\dbfarm" "--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\Mtest.py" "--package=%pkg%"
"--dbfarm=%buildbase%\%pkg%\dbfarm" "--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3
%4 %5 %6 %7 %8 %9
popd
endlocal
-
-:end
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -2,122 +2,72 @@
if not "%1"=="" goto skip
call %0 -rq
-goto end
+goto :EOF
:skip
setlocal
-rem if both M4 & M5 are available, M5 is default;
-rem otherwise, the available one is default
-if "@HAVE_MONETDB4_FALSE@" == "#" set V=4
-if "@HAVE_MONETDB5_FALSE@" == "#" set V=5
-rem commandline option overrules default
-if "%1" == "-4" set V=4& shift
-if "%1" == "-5" set V=5& shift
-
set pkg=geom
set buildbase=@XBUILD@
-set builddir=%buildbase%\geom
-set srcdir=@XSOURCE@\geom
-
-set MOD_PATH=%builddir%\monetdb%V%\.libs
-set MOD_PATH=%MOD_PATH%;%builddir%\monetdb%V%
+set srcdir=@XSOURCE@
REM enable auto-loading of modules before `make install`
-if not exist %builddir%\monetdb%V%\autoload mkdir
%builddir%\monetdb%V%\autoload
-copy /y %srcdir%\monetdb%V%\??_*.mal %builddir%\monetdb%V%\autoload
+if not exist "%buildbase%\sql\backends\monet5\autoload" mkdir
"%buildbase%\sql\backends\monet5\autoload"
+copy /y "%srcdir%"\sql\backends\monet5\??_*.mal
"%buildbase%\sql\backends\monet5\autoload"
+rem vaults is not (yet?) built on Windows
+rem if not exist "%buildbase%\sql\backends\monet5\vaults\autoload" mkdir
"%buildbase%\sql\backends\monet5\vaults\autoload"
+rem copy /y "%srcdir%"\sql\backends\monet5\vaults\??_*.mal
"%buildbase%\sql\backends\monet5\vaults\autoload"
+rem if "@HAVE_MSEED_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal"
+rem if "@HAVE_CFITSIO_FALSE@"=="" del /y
"%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal"
REM enable auto-loading of SQL createdb scripts before `make install`
-set MOD_PATH=%MOD_PATH%;%builddir%\sql
-if not exist %builddir%\sql\createdb mkdir %builddir%\sql\createdb
-copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
+if not exist "%buildbase%\sql\sql\createdb" mkdir
"%buildbase%\sql\sql\createdb"
+copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
+if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
-if not %V% == 4 goto skip_4
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\contrib\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\contrib
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\calibrator\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\calibrator
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mapi\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mapi
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf
-set MOD_PATH=%MOD_PATH%;%srcdir%\..\monetdb4\scripts\tools
+rem binaries (.exe)
+set PATH=%buildbase%\clients\examples\C;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%PATH%
+set PATH=%buildbase%\clients\odbc\samples;%PATH%
+set PATH=%buildbase%\testing;%PATH%
+set PATH=%buildbase%\tools\mserver;%PATH%
-set PATH=%buildbase%\monetdb4\tools;%PATH%
-set cfg=%buildbase%\monetdb4\conf\MonetDB.conf
-:skip_4
+rem libraries (.dll)
+set PATH=%buildbase%\clients\mapilib;%PATH%
+set PATH=%buildbase%\clients\perl\Cimpl;%PATH%
+set PATH=%buildbase%\common\stream;%PATH%
+set PATH=%buildbase%\gdk;%PATH%
+set PATH=%buildbase%\monetdb5\tools;%PATH%
-if not %V% == 5 goto skip_5
-set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5
-set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\vaults\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\vaults
-set MOD_PATH=%MOD_PATH%;%buildbase%\sql\sql
+rem modules (lib_*.dll and *.mal)
+set MOD_PATH=%buildbase%\geom\monetdb5
+set MOD_PATH=%buildbase%\monetdb5\extras\compiler;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\extras\crackers;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\modules\atoms;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\modules\kernel;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\modules\mal;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\optimizer;%MOD_PATH%
+set MOD_PATH=%buildbase%\monetdb5\scheduler;%MOD_PATH%
+rem vaults is not (yet?) built on Windows
+rem set MOD_PATH=%buildbase%\sql\backends\monet5\vaults;%MOD_PATH%
+set MOD_PATH=%buildbase%\sql\backends\monet5;%MOD_PATH%
+set MOD_PATH=%buildbase%\sql\sql;%MOD_PATH%
-REM enable auto-loading of modules before `make install`
-if not exist %buildbase%\sql\backends\monet5\autoload mkdir
%buildbase%\sql\backends\monet5\autoload
-copy /y %srcdir%\..\sql\backends\monet5\??_*.mal
%buildbase%\sql\backends\monet5\autoload
-if not exist %buildbase%\sql\backends\monet5\vaults\autoload mkdir
%buildbase%\sql\backends\monet5\vaults\autoload
-copy /y %srcdir%\..\sql\backends\monet5\vaults\??_*.mal
%buildbase%\sql\backends\monet5\vaults\autoload
-if "@HAVE_MSEED_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal
-if "@HAVE_CFITSIO_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal
+set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
-REM enable auto-loading of SQL createdb scripts before `make install`
-if not exist %buildbase%\sql\sql\createdb mkdir %buildbase%\sql\sql\createdb
-copy /y %srcdir%\..\sql\sql\??_*.sql %buildbase%\sql\sql\createdb
-if "@HAVE_RAPTOR_FALSE@"="" del /y %buildbase%\sql\sql\createdb\30_rdf.sql
-
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\atoms\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\atoms
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\kernel\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\kernel
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\mal\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\modules\mal
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\crackers\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\crackers
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\rdf
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\extras\xml
-
-REM enable auto-loading of modules before `make install`
-if not exist %buildbase%\monetdb5\extras\rdf\autoload mkdir
%buildbase%\monetdb5\extras\rdf\autoload
-copy /y %srcdir%\..\monetdb5\extras\rdf\??_*.mal
%buildbase%\monetdb5\extras\rdf\autoload
-if not exist %buildbase%\monetdb5\extras\xml\autoload mkdir
%buildbase%\monetdb5\extras\xml\autoload
-copy /y %srcdir%\..\monetdb5\extras\xml\??_*.mal
%buildbase%\monetdb5\extras\xml\autoload
-
-set PATH=%buildbase%\tools\mserver;%PATH%
-set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
-:skip_5
-
-set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\examples\php;%buildbase%\clients\examples\python;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
-
-set PATH=%MOD_PATH%;%PATH%
-
-rem to find geos_c.dll
-set PATH=%GEOS%\bin;%PATH%
-
-set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\testing;%PYTHONPATH%
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
-set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set perlib=%buildbase%\clients\perl;%srcdir%\clients\perl
set PERLLIB=%perlib%;%PERLLIB%
set PERL5LIB=%perlib%;%PERL5LIB%
-REM execute Mtest.py in the source directory
-pushd %srcdir%
+rem execute Mtest.py in the source directory
+pushd "%srcdir%"
-call "%buildbase%\testing\Mtest.py" "--config=%cfg%" -%V% "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\Mtest.py" "--config=%cfg%" "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%buildbase%\%pkg%\dbfarm"
"--TSTTRGBASE=%buildbase%\%pkg%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
-
-:end
diff --git a/monetdb4/RunMtest.bat.in b/monetdb4/RunMtest.bat.in
--- a/monetdb4/RunMtest.bat.in
+++ b/monetdb4/RunMtest.bat.in
@@ -2,7 +2,7 @@
if not "%1"=="" goto skip
call %0 -rq
-goto end
+goto :EOF
:skip
@@ -10,51 +10,46 @@
set pkg=monetdb4
set buildbase=@XBUILD@
-set builddir=%buildbase%\monetdb4
-set srcdir=@XSOURCE@\monetdb4
+set srcdir=@XSOURCE@
-set MOD_PATH=%builddir%\modules\plain\.libs
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\plain
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\contrib\.libs
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\contrib
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\calibrator\.libs
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\calibrator
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\mapi\.libs
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\mapi
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\mnetcdf\.libs
-set MOD_PATH=%MOD_PATH%;%builddir%\modules\mnetcdf
-set MOD_PATH=%MOD_PATH%;%srcdir%\scripts\tools
+rem binaries (.exe)
+set PATH=%buildbase%\clients\examples\C;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%PATH%
+set PATH=%buildbase%\clients\odbc\samples;%PATH%
+set PATH=%buildbase%\testing;%PATH%
+set PATH=%buildbase%\monetdb4\tools;%PATH%
-set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb4\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb4
+rem libraries (.dll)
+set PATH=%buildbase%\clients\mapilib;%PATH%
+set PATH=%buildbase%\clients\perl\Cimpl;%PATH%
+set PATH=%buildbase%\common\stream;%PATH%
+set PATH=%buildbase%\gdk;%PATH%
+set PATH=%buildbase%\monetdb4\monet;%PATH%
-set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\runtime\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\runtime
-set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\pftijah\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\pftijah
-set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\probxml\.libs
-set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\probxml
+rem modules (lib_*.dll and *.mal)
+set MOD_PATH=%buildbase%\geom\monetdb4
+set MOD_PATH=%buildbase%\monetdb4\modules\contrib;%MOD_PATH%
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
