Update of /cvsroot/monetdb/geom/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2616/NT
Modified Files:
Tag: Geom_0-4
.cvsignore Makefile
Log Message:
Created installers.
U .cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvsroot/monetdb/geom/NT/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -u -d -r1.1.1.1 -r1.1.1.1.4.1
--- .cvsignore 1 Jun 2007 08:01:49 -0000 1.1.1.1
+++ .cvsignore 23 Jun 2008 14:34:56 -0000 1.1.1.1.4.1
@@ -1,6 +1,7 @@
src
conf
RunMserver.bat
+RunMserver5.bat
geom_config.h
unistd.h
RunMapprove.bat
U Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/geom/NT/Makefile,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- Makefile 16 Jan 2008 09:53:24 -0000 1.4
+++ Makefile 23 Jun 2008 14:34:57 -0000 1.4.4.1
@@ -9,50 +9,44 @@
!INCLUDE "$(TOPDIR)\rules.msc"
-UNISTD_H = unistd.h
+!IFDEF HAVE_MONETDB5
+RUNMSERVER5 = RunMserver5.bat
+M5INSTALLER = install-m5installer
+!ELSE
+RUNMSERVER5 =
+M5INSTALLER =
+!ENDIF
-all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) RunMserver.bat RunMtest.bat
RunMapprove.bat
+all: "$(SRCDIR)\Makefile.msc" all-msc unistd.h RunMserver.bat $(RUNMSERVER5)
RunMtest.bat RunMapprove.bat
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
-all-clear: "$(SRCDIR)\Makefile.msc-clear" all-msc-clear $(UNISTD_H)-clear
RunMserver.bat-clear RunMtest.bat-clear RunMapprove.bat-clear
- if exist "src" RMDIR /S /Q "src"
- if exist "conf" RMDIR /S /Q "conf"
-
-clear-all: all-clear all
-
check: "$(SRCDIR)\Makefile.msc" RunMtest.bat
$(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" check
call RunMtest.bat
-install: targetdirs geom_config.h all
+install: targetdirs all $(M5INSTALLER)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
+!IFDEF BITS32
+install-m5installer:
+ $(INSTALL) MonetDB5-Geom\MonetDB5-Geom-Module.sln "$(prefix)"
+ $(INSTALL) MonetDB5-Geom\MonetDB5-Geom-Module.vdproj "$(prefix)"
+!ENDIF
+
+!IFDEF BITS64
+install-m5installer:
+ $(INSTALL) MonetDB5-Geom64\MonetDB5-Geom-Module.sln "$(prefix)"
+ $(INSTALL) MonetDB5-Geom64\MonetDB5-Geom-Module.vdproj "$(prefix)"
+!ENDIF
+
$(SRCDIR)\Makefile.msc: "$(SRCDIR)\Makefile.ag"
$(CD) "$(SRCDIR)" && autogen.py
-$(SRCDIR)\Makefile.msc-clear:
- if exist "$(SRCDIR)\acout.in" $(DEL)
"$(SRCDIR)\acout.in"
- if exist "$(SRCDIR)\doc.lst" $(DEL)
"$(SRCDIR)\doc.lst"
- if exist "$(SRCDIR)\install.lst" $(DEL)
"$(SRCDIR)\install.lst"
- if exist "$(SRCDIR)\Makefile.am" $(DEL)
"$(SRCDIR)\Makefile.am"
- if exist "$(SRCDIR)\Makefile.msc" $(DEL)
"$(SRCDIR)\Makefile.msc"
- if exist "$(SRCDIR)\src\.incs.ag" $(DEL)
"$(SRCDIR)\src\.incs.ag"
- if exist "$(SRCDIR)\src\.incs.in" $(DEL)
"$(SRCDIR)\src\.incs.in"
- if exist "$(SRCDIR)\src\Makefile.am" $(DEL)
"$(SRCDIR)\src\Makefile.am"
- if exist "$(SRCDIR)\src\Makefile.msc" $(DEL)
"$(SRCDIR)\src\Makefile.msc"
- if exist "$(SRCDIR)\conf\Makefile.am" $(DEL)
"$(SRCDIR)\conf\Makefile.am"
- if exist "$(SRCDIR)\conf\Makefile.msc" $(DEL)
"$(SRCDIR)\conf\Makefile.msc"
-
all-msc: geom_config.h
-all-msc-clear: geom_config.h-clear
-
geom_config.h: geom_config.h.in
$(CONFIGURE) geom_config.h.in > geom_config.h
-geom_config.h-clear:
- if exist "geom_config.h" $(DEL) "geom_config.h"
-
unistd.h:
$(ECHO) #ifndef UNISTD_H > unistd.h
$(ECHO) #define UNISTD_H >> unistd.h
@@ -65,43 +59,31 @@
$(ECHO) #define umask _umask >> unistd.h
$(ECHO) #endif >> unistd.h
-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"
+RunMserver5.bat: "$(SRCDIR)\RunMserver5.bat"
+ $(INSTALL) "$(SRCDIR)\RunMserver5.bat" .
targetdirs:
- if not exist "$(bindir)" $(MKDIR) "$(bindir)"
- if not exist "$(sbindir)" $(MKDIR) "$(sbindir)"
+ if not exist "$(bindir)" $(MKDIR) "$(bindir)"
+ if not exist "$(sbindir)" $(MKDIR) "$(sbindir)"
if not exist "$(libexecdir)" $(MKDIR) "$(libexecdir)"
- if not exist "$(datadir)" $(MKDIR) "$(datadir)"
+ if not exist "$(datadir)" $(MKDIR) "$(datadir)"
if not exist "$(sysconfdir)" $(MKDIR) "$(sysconfdir)"
if not exist "$(sharedstatedir)" $(MKDIR) "$(sharedstatedir)"
if not exist "$(localstatedir)" $(MKDIR) "$(localstatedir)"
- if not exist "$(libdir)" $(MKDIR) "$(libdir)"
- if not exist "$(infodir)" $(MKDIR) "$(infodir)"
- if not exist "$(mandir)" $(MKDIR) "$(mandir)"
+ if not exist "$(libdir)" $(MKDIR) "$(libdir)"
+ if not exist "$(infodir)" $(MKDIR) "$(infodir)"
+ if not exist "$(mandir)" $(MKDIR) "$(mandir)"
if not exist "$(includedir)" $(MKDIR) "$(includedir)"
if not exist "$(pkgdatadir)" $(MKDIR) "$(pkgdatadir)"
- if not exist "$(pkglibdir)" $(MKDIR) "$(pkglibdir)"
+ if not exist "$(pkglibdir)" $(MKDIR) "$(pkglibdir)"
if not exist "$(pkglibdir)\Tests" $(MKDIR) "$(pkglibdir)\Tests"
if not exist "$(pkgincludedir)" $(MKDIR) "$(pkgincludedir)"
-
-docs:
- python "$(SRCDIR)\doc\mkdoc.py" "$(SRCDIR)" "$(prefix)"
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
