Update of /cvsroot/monetdb/sql/NT
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22301/sql/NT
Modified Files:
MSQLserver.bat Makefile rules.msc
Log Message:
With MonetDB4 support for SQL & GEOM being history,
there is no need to have MonetDB5 as conditional back-end;
MonetDB5 now is the mandatory, default, "hard-wired" back-end.
For convenience, the changes are wrapped in CVS tags
"explicit_MonetDB5" & "implicit_MonetDB5".
U rules.msc
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/rules.msc,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- rules.msc 29 Oct 2008 18:51:56 -0000 1.65
+++ rules.msc 29 Oct 2008 23:05:52 -0000 1.66
@@ -43,12 +43,8 @@
CLIENTS_LIBS=/libpath:"$(CLIENTS_PREFIX)\lib"
CLIENTS_MODS=/libpath:"$(CLIENTS_PREFIX)\lib\MonetDB"
-!IFDEF HAVE_MONETDB5
MONETDB5_INCLUDEDIR=$(MONETDB5_PREFIX)\include\MonetDB5
MONETDB5_INCS=-I"$(MONETDB5_INCLUDEDIR)" -I"$(MONETDB5_INCLUDEDIR)\atoms"
-I"$(MONETDB5_INCLUDEDIR)\compiler" -I"$(MONETDB5_INCLUDEDIR)\kernel"
-I"$(MONETDB5_INCLUDEDIR)\mal" -I"$(MONETDB5_INCLUDEDIR)\mil"
-I"$(MONETDB5_INCLUDEDIR)\optimizer" -I"$(MONETDB5_INCLUDEDIR)\scheduler"
MONETDB5_LIBS=/libpath:"$(MONETDB5_PREFIX)\lib"
MONETDB5_MODS=/libpath:"$(MONETDB5_PREFIX)\lib\MonetDB5"
-!ELSE
-MONETDB5_INCS=
-!ENDIF
U Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile 29 Oct 2008 18:51:56 -0000 1.30
+++ Makefile 29 Oct 2008 23:05:52 -0000 1.31
@@ -18,22 +18,14 @@
IBITS = 64
!ENDIF
-!IFDEF HAVE_MONETDB5
-RUNMSERVER5 = RunMserver5.bat
-M5INSTALLER = install-m5installer
-!ELSE
-RUNMSERVER5 =
-M5INSTALLER =
-!ENDIF
-
-all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h RunMserver.bat $(RUNMSERVER5)
RunMtest.bat RunMapprove.bat
+all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h RunMserver.bat RunMserver5.bat
RunMtest.bat RunMapprove.bat
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
check: "$(SRCDIR)\Makefile.msc" RunMtest.bat
$(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" check
call RunMtest.bat
-install: targetdirs all $(M5INSTALLER) $(INSTALLER_PREREQ)
+install: targetdirs all install-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)"
U MSQLserver.bat
Index: MSQLserver.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/MSQLserver.bat,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MSQLserver.bat 19 Jan 2007 14:40:42 -0000 1.10
+++ MSQLserver.bat 29 Oct 2008 23:05:52 -0000 1.11
@@ -10,10 +10,6 @@
rem start the real server
-if exist "%MONETDB%\M5server.bat" goto m5server
-"%MONETDB%\Mserver.bat" --dbinit="module(sql_server);" %*
-
-:m5server
"%MONETDB%\M5server.bat" --dbinit="include sql;" %*
endlocal
-------------------------------------------------------------------------
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
