Update of /cvsroot/monetdb/sql/NT
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv540/sql/NT
Modified Files:
Makefile rules.msc sql_config.h.in
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 sql_config.h.in
Index: sql_config.h.in
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/sql_config.h.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- sql_config.h.in 10 Oct 2008 08:52:55 -0000 1.9
+++ sql_config.h.in 29 Oct 2008 18:51:56 -0000 1.10
@@ -21,10 +21,6 @@
#include <monetdb_winconfig.h>
-/* ! Should be replaced by `monetdb4-config --prefix` ! */
-#define MONETDB4_PREFIX "@QXprefix@"
-/* ! Should be replaced by `monetdb4-config --sysconfdir`\MonetDB.conf ! */
-#define MONETDB4_CONFFILE "@QXsysconfdir@@[EMAIL PROTECTED]"
/* ! Should be replaced by `monetdb5-config --prefix` ! */
#define MONETDB5_PREFIX "@QXprefix@"
/* ! Should be replaced by `monetdb5-config --sysconfdir`\monetdb5.conf ! */
U Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Makefile 8 Aug 2008 14:09:06 -0000 1.29
+++ Makefile 29 Oct 2008 18:51:56 -0000 1.30
@@ -18,12 +18,6 @@
IBITS = 64
!ENDIF
-!IFDEF HAVE_MONETDB4
-M4INSTALLER = install-m4installer
-!ELSE
-M4INSTALLER =
-!ENDIF
-
!IFDEF HAVE_MONETDB5
RUNMSERVER5 = RunMserver5.bat
M5INSTALLER = install-m5installer
@@ -39,7 +33,7 @@
$(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" check
call RunMtest.bat
-install: targetdirs all $(M4INSTALLER) $(M5INSTALLER) $(INSTALLER_PREREQ)
+install: targetdirs all $(M5INSTALLER) $(INSTALLER_PREREQ)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) MSQLserver.bat "$(prefix)"
$(INSTALL) $(INSTALLER)\$(INSTALLER)$(IBITS).sln "$(prefix)"
@@ -57,20 +51,12 @@
$(INSTALL) "$(MONETDB_PREFIX)\monetdb.ico" "$(prefix)\monetdb.ico"
!IFDEF BITS32
-install-m4installer:
- $(INSTALL) MonetDB4-SQL\MonetDB4-SQL-Installer.sln "$(prefix)"
- $(INSTALL) MonetDB4-SQL\MonetDB4-SQL-Installer.vdproj "$(prefix)"
-
install-m5installer:
$(INSTALL) MonetDB5-SQL\MonetDB5-SQL-Installer.sln "$(prefix)"
$(INSTALL) MonetDB5-SQL\MonetDB5-SQL-Installer.vdproj "$(prefix)"
!ENDIF
!IFDEF BITS64
-install-m4installer:
- $(INSTALL) MonetDB4-SQL64\MonetDB4-SQL-Installer.sln "$(prefix)"
- $(INSTALL) MonetDB4-SQL64\MonetDB4-SQL-Installer.vdproj "$(prefix)"
-
install-m5installer:
$(INSTALL) MonetDB5-SQL64\MonetDB5-SQL-Installer.sln "$(prefix)"
$(INSTALL) MonetDB5-SQL64\MonetDB5-SQL-Installer.vdproj "$(prefix)"
U rules.msc
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/rules.msc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- rules.msc 14 Oct 2008 09:22:20 -0000 1.64
+++ rules.msc 29 Oct 2008 18:51:56 -0000 1.65
@@ -43,16 +43,6 @@
CLIENTS_LIBS=/libpath:"$(CLIENTS_PREFIX)\lib"
CLIENTS_MODS=/libpath:"$(CLIENTS_PREFIX)\lib\MonetDB"
-!IFDEF HAVE_MONETDB4
-MONETDB4_INCLUDEDIR=$(MONETDB4_PREFIX)\include\MonetDB4
-
-MONETDB4_INCS=-I"$(MONETDB4_INCLUDEDIR)" -I"$(MONETDB4_INCLUDEDIR)\monet"
-I"$(MONETDB4_INCLUDEDIR)\plain" -I"$(MONETDB4_INCLUDEDIR)\contrib"
-MONETDB4_LIBS=/libpath:"$(MONETDB4_PREFIX)\lib"
-MONETDB4_MODS=/libpath:"$(MONETDB4_PREFIX)\lib\MonetDB4"
-!ELSE
-MONETDB4_INCS=
-!ENDIF
-
!IFDEF HAVE_MONETDB5
MONETDB5_INCLUDEDIR=$(MONETDB5_PREFIX)\include\MonetDB5
-------------------------------------------------------------------------
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
