Changeset: 3dc7b6687e45 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3dc7b6687e45
Modified Files:
MonetDB.spec
NT/installer32/MonetDB4-XQuery-Installer.vdproj
NT/installer64/MonetDB4-XQuery-Installer.vdproj
NT/monetdb_config.h.in
clients/NT/mclient.bat
clients/mapiclient/Makefile.ag
clients/mapilib/Makefile.ag
common/stream/Makefile.ag
configure.ag
debian/control
debian/monetdb4-server.install
debian/rules
gdk/Makefile.ag
geom/monetdb4/Makefile.ag
monetdb4/modules/calibrator/Makefile.ag
monetdb4/modules/contrib/Makefile.ag
monetdb4/modules/mapi/Makefile.ag
monetdb4/modules/mnetcdf/Makefile.ag
monetdb4/modules/plain/Makefile.ag
monetdb4/monet/Makefile.ag
monetdb4/tools/Makefile.ag
pathfinder/modules/geoxml/Makefile.ag
pathfinder/modules/pftijah/Makefile.ag
pathfinder/modules/probxml/Makefile.ag
pathfinder/runtime/Makefile.ag
pathfinder/runtime5/Makefile.ag
Branch: default
Log Message:
Created upgradepath so that we can later upgrade without MonetDB4.
This is not yet fully tested, but it seems to work on at least Fedora.
diffs (truncated from 803 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -270,8 +270,6 @@
%package client-tests
Summary: MonetDB Client tests package
Group: Applications/Databases
-Requires: MonetDB4-server = %{version}-%{release}
-Requires: MonetDB4-XQuery = %{version}-%{release}
Requires: MonetDB5-server = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
Requires: %{name}-client-odbc = %{version}-%{release}
@@ -302,11 +300,9 @@
%{_bindir}/smack01
%{_bindir}/testgetinfo
%{_bindir}/malsample.pl
-%{_bindir}/milsample.pl
%{_bindir}/sqlsample.php
%{_bindir}/sqlsample.pl
%{_bindir}/sqlsample.py
-%{_bindir}/xquerysample.php
%package geom-MonetDB4
Summary: MonetDB4 GIS module
@@ -394,6 +390,7 @@
%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/monetdb4
%attr(2770,monetdb,monetdb) %dir %{_localstatedir}/monetdb4/dbfarm
%{_bindir}/Mserver
+%{_bindir}/m4client
%config(noreplace) %{_sysconfdir}/MonetDB.conf
%dir %{_libdir}/monetdb4
%dir %{_libdir}/monetdb4/lib
@@ -402,6 +399,9 @@
%exclude %{_libdir}/monetdb4/mnetcdf.mil
%endif
%{_libdir}/libmonet.so.*
+%{_libdir}/libbat4.so.*
+%{_libdir}/libstream4.so.*
+%{_libdir}/libmapi4.so.*
%exclude %{_libdir}/monetdb4/lib/lib_geom.so*
%exclude %{_libdir}/monetdb4/lib/lib_pathfinder*
%exclude %{_libdir}/monetdb4/lib/lib_pf*
@@ -597,7 +597,7 @@
%package -n MonetDB4-XQuery-ferry
Summary: MonetDB XQuery Ferry library
Group: Applications/Databases
-Requires: MonetDB4-XQuery = %{version}-%{release}
+# Requires: MonetDB4-XQuery = %{version}-%{release}
%description -n MonetDB4-XQuery-ferry
MonetDB is a database management system that is developed from a
@@ -718,6 +718,8 @@
--enable-bits=%{bits} \
--enable-java=no \
--enable-rdf=no \
+ --enable-monetdb4=yes \
+ --enable-pathfinder=yes \
--with-gc=no \
--with-valgrind=no \
--with-mseed=no \
@@ -751,11 +753,20 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/Maddlog
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libbat.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libbat4.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libbat4.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libstream4.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libstream4.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libmapi4.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libmapi4.so
rm -f $RPM_BUILD_ROOT%{_libdir}/libMonetODBC*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet.so
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonetdb5.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libmonetdb5.so
+# deprecated monetdb4
+rm -f %{_bindir}/milsample.pl
+rm -f %{_bindir}/xquerysample.php
%post -p /sbin/ldconfig
diff --git a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
@@ -1204,8 +1204,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_10AB8DCD4D3D45BB90C8DF897878ABE2"
{
- "SourcePath" = "8:bin\\mclient.exe"
- "TargetName" = "8:mclient.exe"
+ "SourcePath" = "8:bin\\mclient4.exe"
+ "TargetName" = "8:mclient4.exe"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
@@ -2744,8 +2744,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AE4DE6CBA77D450EA12BDD0424DF2E30"
{
- "SourcePath" = "8:lib\\libbat.dll"
- "TargetName" = "8:libbat.dll"
+ "SourcePath" = "8:lib\\libbat4.dll"
+ "TargetName" = "8:libbat4.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
@@ -3244,8 +3244,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D0453158655041DCBE710008E8981EBE"
{
- "SourcePath" = "8:lib\\libmapi.dll"
- "TargetName" = "8:libmapi.dll"
+ "SourcePath" = "8:lib\\libmapi4.dll"
+ "TargetName" = "8:libmapi4.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
@@ -3444,8 +3444,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DB3242097F75443EAEE116BCC9A4247C"
{
- "SourcePath" = "8:lib\\libstream.dll"
- "TargetName" = "8:libstream.dll"
+ "SourcePath" = "8:lib\\libstream4.dll"
+ "TargetName" = "8:libstream4.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
diff --git a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer64/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer64/MonetDB4-XQuery-Installer.vdproj
@@ -1204,8 +1204,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_10AB8DCD4D3D45BB90C8DF897878ABE2"
{
- "SourcePath" = "8:bin\\mclient.exe"
- "TargetName" = "8:mclient.exe"
+ "SourcePath" = "8:bin\\mclient4.exe"
+ "TargetName" = "8:mclient4.exe"
"Tag" = "8:"
"Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24"
"Condition" = "8:"
@@ -2744,8 +2744,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AE4DE6CBA77D450EA12BDD0424DF2E30"
{
- "SourcePath" = "8:lib\\libbat.dll"
- "TargetName" = "8:libbat.dll"
+ "SourcePath" = "8:lib\\libbat4.dll"
+ "TargetName" = "8:libbat4.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
@@ -3244,8 +3244,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D0453158655041DCBE710008E8981EBE"
{
- "SourcePath" = "8:lib\\libmapi.dll"
- "TargetName" = "8:libmapi.dll"
+ "SourcePath" = "8:lib\\libmapi4.dll"
+ "TargetName" = "8:libmapi4.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
@@ -3444,8 +3444,8 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DB3242097F75443EAEE116BCC9A4247C"
{
- "SourcePath" = "8:lib\\libstream.dll"
- "TargetName" = "8:libstream.dll"
+ "SourcePath" = "8:lib\\libstream4.dll"
+ "TargetName" = "8:libstream4.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
"Condition" = "8:"
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -1078,4 +1078,14 @@
#define PTRFMT "%I64x"
#define PTRFMTCAST (unsigned __int64)
+#ifdef LIBGDK4
+#define LIBGDK 1
+#endif
+#ifdef LIBSTREAM4
+#define LIBSTREAM 1
+#endif
+#ifdef LIBMAPI4
+#define LIBMAPI 1
+#endif
+
#endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/clients/NT/mclient.bat b/clients/NT/mclient.bat
--- a/clients/NT/mclient.bat
+++ b/clients/NT/mclient.bat
@@ -15,6 +15,6 @@
:skip
rem start the real client
-"%MONETDB%\bin\mclient.exe" %1 %2 %3 %4 %5 %6 %7 %8
+"%MONETDB%\bin\m4client.exe" %1 %2 %3 %4 %5 %6 %7 %8
if ERRORLEVEL 1 pause
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -31,6 +31,15 @@
$(curl_LIBS) $(LTLIBICONV)
}
+bin_m4client = {
+ COND = HAVE_MONETDB4
+ SOURCES = mclient.c ReadlineTools.c
+ LIBS = libmcutil ../mapilib/libmapi4 \
+ ../../common/stream/libstream \
+ $(READLINE_LIBS) \
+ $(curl_LIBS) $(LTLIBICONV)
+}
+
bin_msqldump = {
SOURCES = msqldump.c
LIBS = libmcutil ../mapilib/libmapi \
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -25,6 +25,13 @@
../../common/options/libmoptions $(openssl_LIBS)
}
+lib_mapi4 = {
+ COND = HAVE_MONETDB4
+ SOURCES = mapi.mx mapi.rc
+ LIBS = $(SOCKET_LIBS) ../../common/stream/libstream \
+ ../../common/options/libmoptions $(openssl_LIBS)
+}
+
headers_mapi = {
DIR = includedir/monetdb
HEADERS = h
diff --git a/common/stream/Makefile.ag b/common/stream/Makefile.ag
--- a/common/stream/Makefile.ag
+++ b/common/stream/Makefile.ag
@@ -37,6 +37,17 @@
$(ICONV_LIBS)
}
+lib_stream4 = {
+ COND = HAVE_MONETDB4
+ SOURCES = stream.c stream.h
+ LIBS = $(SOCKET_LIBS) \
+ $(zlib_LIBS) \
+ $(BZ_LIBS) \
+ $(openssl_LIBS) \
+ $(curl_LIBS) \
+ $(ICONV_LIBS)
+}
+
headers_common = {
DIR = includedir/monetdb
HEADERS = h
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -120,10 +120,10 @@
AC_DEFINE(MONETDB_RELEASE, "unreleased", [Release name or "unreleased"])
-dft_monetdb4=auto
+dft_monetdb4=no
AC_ARG_ENABLE(monetdb4,
AS_HELP_STRING([--enable-monetdb4],
- [enable support for MonetDB4 (default=auto)]),
+ [enable support for MonetDB4 (default=no)]),
enable_monetdb4=$enableval,
enable_monetdb4=$dft_monetdb4)
@@ -171,10 +171,10 @@
;;
esac
-dft_pathfinder=auto
+dft_pathfinder=no
AC_ARG_ENABLE(pathfinder,
AS_HELP_STRING([--enable-pathfinder],
- [enable support for MonetDB/XQuery (default=auto)]),
+ [enable support for MonetDB/XQuery (default=no)]),
enable_pathfinder=$enableval,
enable_pathfinder=$dft_pathfinder)
@@ -3421,6 +3421,16 @@
#error no definition for PTRFMT
#endif
+#ifdef LIBGDK4
+#define LIBGDK 1
+#endif
+#ifdef LIBSTREAM4
+#define LIBSTREAM 1
+#endif
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
