Update of /cvsroot/monetdb/geom/NT
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18194/NT
Modified Files:
Makefile rules.msc
Log Message:
Reviving MonetDB4 support for the "Geom(etry)" module.
When MonetDB4 support for SQL had been discontinued some weeks ago,
I was too eager to also discontinue MonetDB4 support the "Geom(etry)" module,
assuming it was only used together with SQL.
However, it appears, now, that Geom is also (to be?) used together with XQuery,
and hence still requires MonetDB4 support.
Basically, this check-in reverts most of the changes between CVS tags
"with_MonetDB4" & "implicit_MonetDB5", only the obsolete "RunMserver5.bat.in"
script and MonetDB4-specific files of the (SQL-based) tests are not revived.
For convenience, these changes are wrapped in CVS tags
"before_reviving_MonetDB4_support" & "after_reviving_MonetDB4_support".
U rules.msc
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/geom/NT/rules.msc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rules.msc 4 Nov 2008 19:02:02 -0000 1.15
+++ rules.msc 15 Dec 2008 14:11:51 -0000 1.16
@@ -41,8 +41,22 @@
MONETDB_LIBS=/libpath:"$(MONETDB_PREFIX)\lib"
MONETDB_MODS=/libpath:"$(MONETDB_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
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/geom/NT/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile 30 Oct 2008 10:38:50 -0000 1.9
+++ Makefile 15 Dec 2008 14:11:51 -0000 1.10
@@ -9,6 +9,12 @@
!INCLUDE "$(TOPDIR)\rules.msc"
+!IFDEF HAVE_MONETDB5
+M5INSTALLER = install-m5installer
+!ELSE
+M5INSTALLER =
+!ENDIF
+
all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h RunMserver.bat RunMtest.bat
RunMapprove.bat
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
@@ -16,7 +22,7 @@
$(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" check
call RunMtest.bat
-install: targetdirs all install-m5installer
+install: targetdirs all $(M5INSTALLER)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
!IFDEF BITS32
------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
