Update of /cvsroot/monetdb/geom/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6013/NT
Modified Files:
Makefile rules.msc
Removed Files:
geos_c.dll geos_c.dll.manifest geos_c.h geos_c_i.lib
Log Message:
Ported to Windows.
Also see buildtools/doc/windowsbuild.rst for information on how to compile and
install the geos library.
--- geos_c_i.lib DELETED ---
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/geom/NT/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 10 Dec 2007 00:10:49 -0000 1.2
+++ Makefile 15 Jan 2008 09:31:27 -0000 1.3
@@ -24,7 +24,7 @@
$(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" check
call RunMtest.bat
-install: targetdirs monetdb_config.h all
+install: targetdirs geom_config.h all
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" install
$(SRCDIR)\Makefile.msc: "$(SRCDIR)\Makefile.ag"
@@ -67,22 +67,22 @@
unistd.h-clear:
if exist unistd.h $(DEL) unistd.h
-
+
RunMtest.bat: "$(SRCDIR)\RunMtest.bat.in"
if exist "$(SRCDIR)\RunMtest.bat.in" $(CONFIGURE)
"$(SRCDIR)\RunMtest.bat.in" > RunMtest.bat
-
+
RunMtest.bat-clear:
if exist "RunMtest.bat" $(DEL) "RunMtest.bat"
RunMapprove.bat: "$(SRCDIR)\RunMapprove.bat.in"
if exist "$(SRCDIR)\RunMapprove.bat.in" $(CONFIGURE)
"$(SRCDIR)\RunMapprove.bat.in" > RunMapprove.bat
-
+
RunMapprove.bat-clear:
if exist "RunMapprove.bat" $(DEL) "RunMapprove.bat"
RunMserver.bat: "$(SRCDIR)\RunMserver.bat.in"
if exist "$(SRCDIR)\RunMserver.bat.in" $(CONFIGURE)
"$(SRCDIR)\RunMserver.bat.in" > RunMserver.bat
-
+
RunMserver.bat-clear:
if exist "RunMserver.bat" $(DEL) "RunMserver.bat"
--- geos_c.h DELETED ---
--- geos_c.dll DELETED ---
--- geos_c.dll.manifest DELETED ---
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/geom/NT/rules.msc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules.msc 11 Jan 2008 10:35:53 -0000 1.4
+++ rules.msc 15 Jan 2008 09:31:27 -0000 1.5
@@ -1,3 +1,5 @@
+# -*- makefile -*-
+
# The contents of this file are subject to the MonetDB Public License
# Version 1.1 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
@@ -14,173 +16,28 @@
# Portions created by CWI are Copyright (C) 1997-2008 CWI.
# All Rights Reserved.
-# install python, flex and bison on your systems
-PYTHON=python
-YACC=bison -b y -y
-LEX=flex
-SWIG=swig
-
-# This is the location of pthreads for Win32,
-# see http://sources.redhat.com/pthreads-win32/
-PTHREAD = C:\Pthreads
-PTHREAD_LIBS = "$(PTHREAD)\lib\pthreadVC2.lib"
-PTHREAD_INCS = "-I$(PTHREAD)\include"
-
-GEOS = C:\Geos
-GEOS_LIBS = "..\geos_c_i.lib"
-GEOS_INCS = "-I.\.."
-
-PYTHONBASE=C:\Python24
-PYTHON_INCS=-I$(PYTHONBASE)\include
-PYTHON_LIBS=$(PYTHONBASE)\libs\python24.lib
-PYTHON_LIBDIR=share\MonetDB\python
+RULESMSC = $(MONETDB_PREFIX)\share\MonetDB\winrules.msc
+!INCLUDE $(RULESMSC)
-# not need to edit beyond here..
+GEOS = C:\geos-3.0.win$(bits)
+GEOS_LIBS = $(GEOS)\lib\geos_c_i.lib
+GEOS_INCS = -I$(GEOS)\include
pkg = sql
-exec_prefix = $(prefix)\..\..\MonetDB\NT
-
-bindir = $(exec_prefix)\bin
-sbindir = $(exec_prefix)\sbin
-libexecdir = $(exec_prefix)\libexec
-datadir = $(prefix)\share
-sysconfdir = $(prefix)\etc
-sharedstatedir = $(prefix)\com
-localstatedir = $(prefix)\var
-libdir = $(exec_prefix)\lib
-infodir = $(prefix)\info
-mandir = $(prefix)\man
-includedir = $(prefix)\include
-oldincludedir = \usr\include
-pkgdatadir = $(datadir)\$(pkg)
-pkglibdir = $(libdir)\$(pkg)
-pkgincludedir = $(includedir)\$(pkg)
-
-NATIVE_WIN32 = 1
+CONFIG_H=geos_config.h
-#-FI$(TOPDIR)\config.h
-LIBC_INCS = $(PTHREAD_INCS)
-SOCKET_LIBS = wsock32.lib
+MONETDB_INCLUDEDIR=$(MONETDB_PREFIX)\include\MonetDB
-CXX=$(CC)
-MEL="$(TOPDIR)\..\..\buildtools\mel\mel.exe"
-MX="$(TOPDIR)\..\..\buildtools\Mx\Mx.exe"
-CP=copy
-MV=copy
-DEL=del
-CONFIGURE=$(PYTHON) "$(TOPDIR)\configure.py" "$(TOPDIR)" "$(prefix)"
+MONETDB_INCS=-I"$(MONETDB_INCLUDEDIR)" -I"$(MONETDB_INCLUDEDIR)\common"
-I"$(MONETDB_INCLUDEDIR)\gdk"
+MONETDB_LIBS=/libpath:"$(MONETDB_PREFIX)\lib"
+MONETDB_MODS=/libpath:"$(MONETDB_PREFIX)\lib\MonetDB"
-# Use "nmake DEBUG=1" to get a debug build (assertions enabled);
-# use "nmake NDEBUG=1" to get a release build (assertions disabled);
-# use plain "nmake" to get the default.
-!IFNDEF DEBUG
-!IFDEF NDEBUG
-CFLAGS = $(CFLAGS) -DNDEBUG
-!ELSE
-# default in case neither NDEBUG nor DEBUG are defined
-CFLAGS = $(CFLAGS) -DNDEBUG
-!ENDIF
-!ENDIF
+!IFDEF HAVE_MONETDB5
+MONETDB5_INCLUDEDIR=$(MONETDB5_PREFIX)\include\MonetDB5
-MONETDB_INCLUDEDIR=$(MONETDB_PREFIX)\include\MonetDB
-MONETDB_INCS="-I$(MONETDB_INCLUDEDIR)" "-I$(MONETDB_INCLUDEDIR)\common"
"-I$(MONETDB_INCLUDEDIR)\gdk" "-I$(MONETDB_INCLUDEDIR)\monet"
"-I$(MONETDB_INCLUDEDIR)\plain" "-I$(MONETDB_INCLUDEDIR)\mapi"
-!IF [$(MAKE) /help 2>&1 | grep -q 6.]
-MONETDB_LIBS="/LIBPATH:$(MONETDB_PREFIX)\lib"
"/LIBPATH:$(MONETDB_PREFIX)\lib\MonetDB" "/LIBPATH:$(prefix)"
+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
-MONETDB_LIBS="\"/LIBPATH:$(MONETDB_PREFIX)\lib\""
"\"/LIBPATH:$(MONETDB_PREFIX)\lib\MonetDB\"" "\"/LIBPATH:$(prefix)""
+MONETDB5_INCS=
!ENDIF
-MONET4=yes
-
-{$(SRCDIR)}.mx.h:
- $(MX) $(MXFLAGS) -x h $<
-
-.mx.h:
- $(MX) $(MXFLAGS) -x h $<
-
-{$(SRCDIR)}.mx.c:
- $(MX) $(MXFLAGS) -x c $<
-
-.mx.c:
- $(MX) $(MXFLAGS) -x c $<
-
-{$(SRCDIR)}.mx.cxx:
- $(MX) $(MXFLAGS) -x C $<
-
-.mx.cxx:
- $(MX) $(MXFLAGS) -x C $<
-
-{$(SRCDIR)}.mx.m:
- $(MX) $(MXFLAGS) -x m $<
-
-.mx.m:
- $(MX) $(MXFLAGS) -x m $<
-
-.m.mil:
- $(MEL) $(INCLUDES) -mil $*.m > $@
- type $*.tmpmil >> $@
- if not exist .libs $(MKDIR) .libs
- $(INSTALL) $@ .libs\$@
-
-.m.mil:
- $(MEL) $(INCLUDES) -mil $*.m > $@
- if not exist .libs $(MKDIR) .libs
- $(INSTALL) $@ .libs\$@
-
-{$(SRCDIR)}.mx.tmpmil:
- $(MX) $(MXFLAGS) -x mil $<
- $(MV) $*.mil $*.tmpmil
- $(DEL) $*.mil
-
-{$(SRCDIR)}.mx.mil:
- $(MX) $(MXFLAGS) -x mil $<
-
-.mx.tmpmil:
- $(MX) $(MXFLAGS) -x mil $<
- $(MV) $*.mil $*.tmpmil
- $(DEL) $*.mil
-
-.mx.mil:
- $(MX) $(MXFLAGS) -x mil $<
-
-{$(SRCDIR)}.mx.y:
- $(MX) $(MXFLAGS) -x y $<
-
-.mx.y:
- $(MX) $(MXFLAGS) -x y $<
-
-{$(SRCDIR)}.mx.l:
- $(MX) $(MXFLAGS) -x l $<
-
-.mx.l:
- $(MX) $(MXFLAGS) -x l $<
-
-{$(SRCDIR)}.mx.yy:
- $(MX) $(MXFLAGS) -x Y $<
-
-.mx.yy:
- $(MX) $(MXFLAGS) -x Y $<
-
-{$(SRCDIR)}.mx.ll:
- $(MX) $(MXFLAGS) -x L $<
-
-.mx.ll:
- $(MX) $(MXFLAGS) -x L $<
-
-{$(SRCDIR)}.c.obj:
- $(CC) $(CFLAGS) $(INCLUDES) -c $<
-
-.c.obj:
- $(CC) $(CFLAGS) $(INCLUDES) -c $<
-
-{$(SRCDIR)}.cxx.obj:
- $(CXX) $(CXXFLAGS) $(INCLUDES) -c $<
-
-.cxx.obj:
- $(CXX) $(CXXFLAGS) $(INCLUDES) -c $<
-
-# needed for yacc/lex output generated under unix
-.cc.cxx:
- rename $< $@
-
-.SUFFIXES: .m .mx .proto_h .mil .glue_c .cxx .cc
-.PRECIOUS: .m
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
