Update of /cvsroot/monetdb/sql
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv540/sql
Modified Files:
MonetDB-SQL.pc.in MonetDB-SQL.spec.in 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/sql/RunMserver.bat.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- RunMserver.bat.in 24 Jun 2008 07:59:42 -0000 1.9
+++ RunMserver.bat.in 29 Oct 2008 18:51:56 -0000 1.10
@@ -2,18 +2,13 @@
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]@
-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]@
@@ -28,7 +23,6 @@
set PATH=%builddir%\src\backends\monet%V%;%PATH%
set PATH=%builddir%\conf;%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" %1 %2
%3 %4 %5 %6 %7 %8 %9
U vertoo.data
Index: vertoo.data
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.data,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- vertoo.data 15 Oct 2008 00:47:46 -0000 1.37
+++ vertoo.data 29 Oct 2008 18:51:56 -0000 1.38
@@ -1,5 +1,4 @@
monetdb = major:1; minor:25; release:0; rc:x; build:1;
monetdb5 = major:5; minor:7; release:0; rc:x; build:1;
clients = major:1; minor:24; release:0; rc:x; build:1;
-sql = major:2; minor:25; release:0; rc:x; build:1;
-monetdb4 = major:4; minor:24; release:0; rc:x; build:1;
\ No newline at end of file
+sql = major:2; minor:25; release:0; rc:x; build:1;
\ No newline at end of file
U MonetDB-SQL.pc.in
Index: MonetDB-SQL.pc.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.pc.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- MonetDB-SQL.pc.in 10 Oct 2008 08:52:10 -0000 1.40
+++ MonetDB-SQL.pc.in 29 Oct 2008 18:51:56 -0000 1.41
@@ -28,8 +28,8 @@
Name: ${pkg}
Description: A SQL/ODBC/JDBC interface to MonetDB.
Version: @VERSION@
-Requires: MonetDB >= 4.24.0
-# ^^^^^^
+Requires: MonetDB >= 5.7.0
+# ^^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
Cflags: -I${includedir}/sql
U RunMtest.in
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMtest.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- RunMtest.in 10 Oct 2008 08:52:25 -0000 1.38
+++ RunMtest.in 29 Oct 2008 18:51:56 -0000 1.39
@@ -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
@@ -52,7 +49,7 @@
done
# enhance various paths to find our stuff
-binpath="${builddir}/conf:${builddir}/src/backends/monet4:${builddir}/src/backends/monet5"
+binpath="${builddir}/conf:${builddir}/src/backends/monet5"
libpath="${MOD_PATH}:${builddir}/src/server/.libs"
PATH="${binpath}:$PATH"
U RunMtest.bat.in
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMtest.bat.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- RunMtest.bat.in 15 Dec 2007 06:38:56 -0000 1.29
+++ RunMtest.bat.in 29 Oct 2008 18:51:56 -0000 1.30
@@ -8,18 +8,13 @@
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]@
-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
U configure.ag
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/sql/configure.ag,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- configure.ag 15 Oct 2008 00:47:46 -0000 1.139
+++ configure.ag 29 Oct 2008 18:51:56 -0000 1.140
@@ -78,29 +78,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
U vertoo.config
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/sql/vertoo.config,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- vertoo.config 3 Jul 2008 04:35:53 -0000 1.33
+++ vertoo.config 29 Oct 2008 18:51:56 -0000 1.34
@@ -5,7 +5,6 @@
main = addModule('sql')
monetdb = addModule('MonetDB')
clients = addModule('clients')
-monetdb4 = addModule('MonetDB4')
monetdb5 = addModule('MonetDB5')
#jdbc = addModule('jdbc')
@@ -17,15 +16,9 @@
main.addAnchor("VERSION", "%v")
main.addAnchor("configure.ag", "[MonetDB SQL Server], [%v]")
main.addAnchor("NT/rules.msc", "VERSION = %v")
-main.addAnchors("NT/MonetDB4-SQL/MonetDB4-SQL-Installer.vdproj",
- arguments(pattern = "MonetDB-SQL-%v",
- format = '@normal'))
main.addAnchors("NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj",
arguments(pattern = "MonetDB-SQL-%v",
format = '@normal'))
-main.addAnchors("NT/MonetDB4-SQL64/MonetDB4-SQL-Installer.vdproj",
- arguments(pattern = "MonetDB-SQL-%v",
- format = '@normal'))
main.addAnchors("NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj",
arguments(pattern = "MonetDB-SQL-%v",
format = '@normal'))
@@ -39,7 +32,6 @@
format = "@normal"),
arguments(pattern = "MonetDB-SQL-%v",
format = '@normal'))
-main.addAnchor("src/backends/monet4/sql_server.mx", "MonetDB/SQL module v%v")
monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
@@ -69,17 +61,9 @@
arguments(pattern = '"FileName" = "8:libMapi.dll"\n
"MinVesion" = "8:%v.0"',
format = "@normal"))
-monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
-monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
-monetdb4.addAnchor("MonetDB-SQL.pc.in", "\nRequires: MonetDB >= %v")
-monetdb4.addAnchors("MonetDB-SQL.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.addAnchor("MonetDB-SQL.pc.in", "\nRequires: MonetDB >= %v")
monetdb5.addAnchors("MonetDB-SQL.spec.in",
arguments(pattern = "\nRequires: MonetDB5-server >= %v",
format = "%major.%minor"),
U MonetDB-SQL.spec.in
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- MonetDB-SQL.spec.in 15 Oct 2008 00:47:46 -0000 1.69
+++ MonetDB-SQL.spec.in 29 Oct 2008 18:51:56 -0000 1.70
@@ -28,7 +28,6 @@
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
-%{!?_with_monetdb4: %{!?_without_monetdb4: %define _without_monetdb4
--without-monetdb4}}
%{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5
--with-monetdb5}}
%if !%{?buildsystem}
@@ -54,33 +53,7 @@
automatic index management, extensibility of data types and search
accelerators, SQL- and XML- frontends.
-This package contains some common files for the %{name}-server4 and
-%{name}-server5 packages.
-
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%package server4
-Summary: MonetDB4 SQL server 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 server4
-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 SQL frontend for MonetDB4.
-
-%endif
+This package contains some common files for the %{name}-server5 packages.
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%package server5
@@ -125,27 +98,6 @@
This package contains the files needed to develop with %{name}.
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%package devel4
-Summary: MonetDB SQL development package
-Group: Applications/Databases
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-Requires: %{name}-server4
-Requires: MonetDB4-server-devel
-Requires: %{name}-devel
-%endif
-Requires: MonetDB-devel
-Requires: MonetDB-client-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
@@ -163,7 +115,6 @@
%{?comp_cc:CC="%{comp_cc}"} \
--with-monetdb=%{_prefix} \
--with-clients=%{_prefix} \
- %{?_with_monetdb4} %{?_without_monetdb4} \
%{?_with_monetdb5} %{?_without_monetdb5}
make
@@ -176,7 +127,6 @@
# cleanup stuff we don't want to install
#find $RPM_BUILD_ROOT -name .incs.in | xargs rm
find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
-rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB4/Tests/*
rm -rf $RPM_BUILD_ROOT%{_prefix}/lib*/python*/site-packages
%post -p /sbin/ldconfig
@@ -193,17 +143,6 @@
%dir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}/*
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%files server4
-%defattr(-,root,root)
-%{_bindir}/Mbeddedsql
-%{_libdir}/libembeddedsql.so.*
-%{_libdir}/MonetDB4/lib/lib_sql_server*
-%{_libdir}/MonetDB4/*.mil
-%dir %{_includedir}/MonetDB4/sql
-%{_includedir}/MonetDB4/sql/embeddedclient.h
-%endif
-
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%files server5
%defattr(-,root,root)
@@ -227,12 +166,6 @@
%{_libdir}/libembeddedsql5.so
%endif
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-%files devel4
-%defattr(-,root,root)
-%{_libdir}/libembeddedsql.so
-%endif
-
%changelog
* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
- Built.
U rpm.mk.in
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- rpm.mk.in 10 Oct 2008 08:52:48 -0000 1.29
+++ rpm.mk.in 29 Oct 2008 18:51:56 -0000 1.30
@@ -23,8 +23,6 @@
@[EMAIL PROTECTED] python
@[EMAIL PROTECTED] python
[EMAIL PROTECTED]@monetdb4=--without monetdb4
[EMAIL PROTECTED]@monetdb4=--with monetdb4
@[EMAIL PROTECTED] monetdb5
@[EMAIL PROTECTED] monetdb5
@@ -49,14 +47,14 @@
if test "@oids@" -eq 32; then echo "%oid32 1" >>
$(rpmtopdir)/rpmmacros; fi
rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
${python} ${monetdb4} ${monetdb5} --define="buildsystem 1" --define="comp_cc
@CC@" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
${python} ${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-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${python} ${monetdb4}
${monetdb5} --define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${python} ${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
