Update of /cvsroot/monetdb/geom
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv540/geom
Modified Files:
MonetDB-geom.spec.in README RunMserver.bat.in RunMtest.bat.in
RunMtest.in configure.ag rpm.mk.in vertoo.config vertoo.data
Log Message:
Since SQL & GEOM do no longer support the MonetDB4 back-end,
we clean up the code base by removing all MonetDB4-related "legacy"
from the SQL & GEOM repositories.
For convenience, the changes are wrapped in CVS tags
"with_MonetDB4" & "without_MonetDB4".
U RunMserver.bat.in
Index: RunMserver.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMserver.bat.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RunMserver.bat.in 24 Jun 2008 07:55:45 -0000 1.3
+++ RunMserver.bat.in 29 Oct 2008 18:51:59 -0000 1.4
@@ -2,26 +2,20 @@
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
+rem M5 is default;
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 [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
set [EMAIL PROTECTED]@
set MOD_PATH=%modpath%
-if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
@@ -34,7 +28,6 @@
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
-if %V% == 4 set mserver=Mserver.exe
if %V% == 5 set mserver=mserver5.exe
%mserver% --set "monet_mod_path=%MOD_PATH%" %1 %2 %3 %4 %5 %6 %7 %8 %9
U MonetDB-geom.spec.in
Index: MonetDB-geom.spec.in
===================================================================
RCS file: /cvsroot/monetdb/geom/MonetDB-geom.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- MonetDB-geom.spec.in 15 Oct 2008 00:53:20 -0000 1.7
+++ MonetDB-geom.spec.in 29 Oct 2008 18:51:59 -0000 1.8
@@ -27,7 +27,6 @@
Source: http://downloads.sourceforge.net/monetdb/MonetDB-geom-%{version}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-%{!?_with_monetdb4: %{!?_without_monetdb4: %define _without_monetdb4
--without-monetdb4}}
%{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5
--with-monetdb5}}
%if !%{?buildsystem}
@@ -47,32 +46,6 @@
This package contains the common parts of the GIS (Geographic
Information System) extensions for MonetDB-SQL.
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%package MonetDB4
-Summary: MonetDB4 SQL GIS modules
-Group: Applications/Databases
-Requires: MonetDB4-server >= 4.24
-# ^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
-%if !%{?buildsystem}
-BuildRequires: MonetDB4-server-devel >= 4.24
-# ^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
-%endif
-
-%description MonetDB4
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automaticautomatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
-
-This package contains the GIS (Geographic Information System)
-extensions for MonetDB-SQL-server4.
-
-%endif
-
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%package MonetDB5
Summary: MonetDB5 SQL GIS modules
@@ -117,27 +90,6 @@
This package contains the files needed to develop with %{name}.
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%package devel4
-Summary: MonetDB SQL GIS development package
-Group: Applications/Databases
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-Requires: %{name}-MonetDB4
-Requires: MonetDB4-server-devel
-%endif
-Requires: %{name}-devel
-Requires: MonetDB-devel
-Requires: geos-devel
-
-%description devel4
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators, SQL- and XML- frontends.
-
-This package contains the files needed to develop with %{name}.
-%endif
-
%prep
rm -rf $RPM_BUILD_ROOT
@@ -154,7 +106,6 @@
%{?oid32:--enable-oid32} \
%{?comp_cc:CC="%{comp_cc}"} \
--with-monetdb=%{_prefix} \
- %{?_with_monetdb4} %{?_without_monetdb4} \
%{?_with_monetdb5} %{?_without_monetdb5}
make
@@ -173,11 +124,6 @@
%files
%defattr(-,root,root)
%{_datadir}/MonetDB/sql/geom.sql
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%files MonetDB4
-%{_libdir}/MonetDB4/lib/lib_geom.so.*
-%{_libdir}/MonetDB4/geom.mil
-%endif
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%files MonetDB5
%{_libdir}/MonetDB5/lib/lib_geom.so.*
@@ -190,11 +136,6 @@
%{_libdir}/MonetDB5/lib/lib_geom.so
%endif
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%files devel4
-%{_libdir}/MonetDB4/lib/lib_geom.so
-%endif
-
%changelog
* Tue May 27 2008 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
- Built.
U vertoo.data
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/geom/vertoo.data,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vertoo.data 15 Oct 2008 00:53:20 -0000 1.8
+++ vertoo.data 29 Oct 2008 18:51:59 -0000 1.9
@@ -1,4 +1,3 @@
monetdb = major:1; minor:25; release:0; rc:x; build:1;
-monetdb4 = major:4; minor:24; release:0; rc:x; build:1;
geom = major:0; minor:5; release:0; rc:x; build:1;
monetdb5 = major:5; minor:7; release:0; rc:x; build:1;
\ No newline at end of file
U README
Index: README
===================================================================
RCS file: /cvsroot/monetdb/geom/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- README 1 Jun 2007 08:01:47 -0000 1.1.1.1
+++ README 29 Oct 2008 18:51:59 -0000 1.2
@@ -1,13 +1,13 @@
This "geom" directory contains the nessesary configure files and scripts
-to build a simple example module (src/monetdb4/geom.mx) for the MonetDB
database
+to build a simple example module (src/monetdb5/geom.mx) for the MonetDB
database
engine.
Prerequisites
=============
-Before compiling the "geom" module, make sure you have version 4.16 (or
+Before compiling the "geom" module, make sure you have version 5.6 (or
newer) of MonetDB installed, and "monetdb-config" is reachable via your
$PATH.
See http://monetdb.cwi.nl/ for details.
@@ -15,7 +15,7 @@
Further, make sure that you also have the "buildtools" installed, and
"autogen.py", "Mx" and "mel" are reachable via your $PATH.
You can get the "buildtools" via
- cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot/monetdb checkout -P
-rMonetDB_4-16 buildtools
+ cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot/monetdb checkout -P
-rMonetDB_1-24 buildtools
See the buildtools' README file for more details.
U RunMtest.in
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- RunMtest.in 10 Oct 2008 08:47:16 -0000 1.11
+++ RunMtest.in 29 Oct 2008 18:51:59 -0000 1.12
@@ -23,15 +23,12 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
-# if both M4 & M5 are available, M5 is default;
-# otherwise, the available one is default
[EMAIL PROTECTED]@V=4
+# M5 is default;
@[EMAIL PROTECTED]
# commandline option overrules default
for arg
do
case "$arg" in
- -4) V=4;;
-5) V=5;;
esac
done
U RunMtest.bat.in
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.bat.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- RunMtest.bat.in 23 Jun 2008 14:22:56 -0000 1.4
+++ RunMtest.bat.in 29 Oct 2008 18:51:59 -0000 1.5
@@ -8,19 +8,14 @@
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
+rem M5 is default;
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 [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
@@ -29,7 +24,6 @@
set [EMAIL PROTECTED]@
set MOD_PATH=%modpath%
-if %V% == 4 set MOD_PATH=%modpath4%;%MOD_PATH%
if %V% == 5 set MOD_PATH=%modpath5%;%MOD_PATH%
set MOD_PATH=%builddir%\src\sql;%MOD_PATH%
U configure.ag
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/geom/configure.ag,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.ag 15 Oct 2008 00:53:20 -0000 1.20
+++ configure.ag 29 Oct 2008 18:51:59 -0000 1.21
@@ -67,29 +67,17 @@
AM_MONETDB_OPTIONS()
AM_MONETDB_LIBS()
AM_MONETDB_UTILS()
-req_monetdb4_ver='4.24.0'
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
-AM_MONETDB4($req_monetdb4_ver)
req_monetdb5_ver='5.7.0'
# ^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
AM_MONETDB5($req_monetdb5_ver)
-if test "x$have_monetdb4" != xyes -a "x$have_monetdb5" != xyes; then
- if test "x$MONETDB4_VERSION" = "x" -a "x$MONETDB5_VERSION" = "x"; then
- AC_MSG_ERROR([Neither MonetDB4 nor MonetDB5 was not found.
MonetDB/SQL requires at least version $req_monetdb4_ver of MonetDB4 or version
$req_monetdb5_ver of MonetDB5.])
- else
- if test "x$MONETDB4_VERSION" = "x"; then
- MONETDB4_VERSION='none'
- fi
- if test "x$MONETDB5_VERSION" = "x"; then
- MONETDB5_VERSION='none'
- fi
- AC_MSG_ERROR([MonetDB/SQL requires at least version
$req_monetdb4_ver of MonetDB4 (found $MONETDB4_VERSION) or version
$req_monetdb5_ver of MonetDB5 (found $MONETDB5_VERSION).])
+if test "x$have_monetdb5" != xyes; then
+ if test "x$MONETDB5_VERSION" = "x"; then
+ MONETDB5_VERSION='none'
fi
+ AC_MSG_ERROR([MonetDB/SQL requires at least version $req_monetdb5_ver
of MonetDB5 (found $MONETDB5_VERSION).])
fi
dnl geos
U vertoo.config
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/geom/vertoo.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- vertoo.config 23 Jun 2008 14:22:56 -0000 1.5
+++ vertoo.config 29 Oct 2008 18:51:59 -0000 1.6
@@ -3,7 +3,6 @@
main = addModule('geom')
monetdb = addModule('MonetDB')
-monetdb4 = addModule('MonetDB4')
monetdb5 = addModule('MonetDB5')
# %v - unadorned version number
@@ -20,14 +19,6 @@
arguments(pattern = "\nBuildRequires: MonetDB-devel >= %v",
format = "%major.%minor"))
-monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
-monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
-monetdb4.addAnchors("MonetDB-geom.spec.in",
- arguments(pattern = "\nRequires: MonetDB4-server >= %v",
- format = "%major.%minor"),
- arguments(pattern = "\nBuildRequires:
MonetDB4-server-devel >= %v",
- format = "%major.%minor"))
-
monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb5.addAnchor("configure.ag", "req_monetdb5_ver=%q")
monetdb5.addAnchors("MonetDB-geom.spec.in",
U rpm.mk.in
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/geom/rpm.mk.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rpm.mk.in 10 Oct 2008 08:47:32 -0000 1.5
+++ rpm.mk.in 29 Oct 2008 18:51:59 -0000 1.6
@@ -19,8 +19,6 @@
rpmtopdir = $(shell cd $(top_builddir) && pwd)/rpm
[EMAIL PROTECTED]@monetdb4=--without monetdb4
[EMAIL PROTECTED]@monetdb4=--with monetdb4
@[EMAIL PROTECTED] monetdb5
@[EMAIL PROTECTED] monetdb5
@@ -45,14 +43,14 @@
if test "@oids@" -eq 32; then echo "%oid32 1" >>
$(rpmtopdir)/rpmmacros; fi
rpm: MonetDB-geom.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
${monetdb4} ${monetdb5} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
${monetdb5} --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
rm -rf $(rpmtopdir)/BUILD
srpm: MonetDB-geom.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${monetdb4} ${monetdb5}
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${monetdb5}
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
