Update of /cvsroot/monetdb/geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27271
Modified Files:
RunMserver.bat.in RunMtest.bat.in configure.ag vertoo.config
Log Message:
propagated changes of Friday Jun 20 2008 - Monday Jun 23 2008
from the Geom_0-4 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
NT/geom_config.h.in,1.4.4.1(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Use monetdb_winconfig.h.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
RunMserver.bat.in,1.1.1.1.4.1(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
RunMtest.bat.in,1.3.4.1(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
One step towards being able to use this on Windows.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
src/monetdb5/geom.mx,1.13.4.6(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Export functions.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
src/lib/libgeom.mx,1.5.4.5(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
src/monetdb5/geom.mx,1.13.4.7(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Port to geos 3.0.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
RunMtest.bat.in,1.3.4.2(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Add SQL module path to MOD_PATH.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - sjoerd:
configure.ag,1.12.2.5(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
Commented max version check for geos library: we should now be able to
use geos 3.0.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/20 - stmane:
vertoo.config,1.3.4.2(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22,Stable_DailyBuild-21)
have VERSION in NT/rules.msc maintained by vertoo
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/21 - stmane:
RunMtest.bat.in,1.3.4.3(Geom_0-4,Stable_DailyBuild-23,Stable_DailyBuild-22)
make sure that we indeed call
"%sql_prefix%\bin\monetdb-sql-config.bat"
not just
"%sql_prefix%"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/geom/vertoo.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vertoo.config 27 May 2008 14:20:24 -0000 1.4
+++ vertoo.config 23 Jun 2008 14:22:56 -0000 1.5
@@ -12,6 +12,7 @@
main.setVersionFormat('@normal%[rc?_rc%build:]')
main.addAnchor("configure.ag", "[MonetDB geometry module], [%v]")
+main.addAnchor("NT/rules.msc", "VERSION = %v")
monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMserver.bat.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- RunMserver.bat.in 1 Jun 2007 08:01:47 -0000 1.1.1.1
+++ RunMserver.bat.in 23 Jun 2008 14:22:56 -0000 1.2
@@ -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
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.bat.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RunMtest.bat.in 10 Jan 2008 17:03:53 -0000 1.3
+++ RunMtest.bat.in 23 Jun 2008 14:22:56 -0000 1.4
@@ -18,32 +18,34 @@
set [EMAIL PROTECTED]@
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
+call "%sql_prefix%\bin\monetdb-sql-config.bat" --internal
-REM ... remainder is not working/correct, yet ...
-
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
-set [EMAIL PROTECTED]@
+set pkg=monetdb-geom
+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 MOD_PATH=%modpath%
+if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
+if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
-rem to find the geom module
-set MOD_PATH=%builddir%\src\.libs;%MOD_PATH%
+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
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/configure.ag,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- configure.ag 6 Jun 2008 10:50:27 -0000 1.15
+++ configure.ag 23 Jun 2008 14:22:56 -0000 1.16
@@ -93,7 +93,7 @@
dnl geos
GEOS_VERSION_REQUIRED_MIN=2.0.0
-GEOS_VERSION_REQUIRED_MAX=3.0.0
+dnl GEOS_VERSION_REQUIRED_MAX=3.0.0
have_geos=auto
GEOS_CONFIG=''
GEOS_INCS=''
@@ -118,20 +118,21 @@
fi
fi
if test "x$have_geos" != xno; then
- AC_MSG_CHECKING([for Geos >= $GEOS_VERSION_REQUIRED_MIN, but <
$GEOS_VERSION_REQUIRED_MAX])
+dnl AC_MSG_CHECKING([for Geos >= $GEOS_VERSION_REQUIRED_MIN, but <
$GEOS_VERSION_REQUIRED_MAX])
+ AC_MSG_CHECKING([for Geos >= $GEOS_VERSION_REQUIRED_MIN])
GEOS_VERSION="`$GEOS_CONFIG --version`"
AC_MSG_RESULT(found $GEOS_VERSION)
wrong=''
if test MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION) -lt
MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION_REQUIRED_MIN); then
wrong="too old"
fi
- if test MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION_REQUIRED_MAX); then
- wrong="not yet supported"
- fi
- if test "x$wrong" != x; then
- AC_MSG_ERROR([Geos version $GEOS_VERSION is $wrong])
- have_geos=no
- fi
+dnl if test MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION) -ge
MONETDB_VERSION_TO_NUMBER(echo $GEOS_VERSION_REQUIRED_MAX); then
+dnl wrong="not yet supported"
+dnl fi
+dnl if test "x$wrong" != x; then
+dnl AC_MSG_ERROR([Geos version $GEOS_VERSION is $wrong])
+dnl have_geos=no
+dnl fi
fi
if test "x$have_geos" != xno; then
case "$GCC-$CC-`$GEOS_CONFIG --prefix`-`$GEOS_CONFIG --includes`" in
-------------------------------------------------------------------------
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
