[geos-commits] r2125 - in trunk: . source

[svn_geos at osgeo.org]

Author: mloskot
Date: 2008-05-20 16:33:50 -0400 (Tue, 20 May 2008)
New Revision: 2125

Added:
   trunk/bootstrap.bat
Modified:
   trunk/ChangeLog
   trunk/source/Makefile.vc
Log:
* bootstrap.bat: Added script generating headers for use with Visual C++ compiler. DO NOT include this script in GEOS source distribution. * source/makefile.vc: Do not make copies of 3 dynamic headers but let users to use bootstrap.bat instead.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-21 23:22:11 UTC (rev 2124)
+++ trunk/ChangeLog	2008-05-20 20:33:50 UTC (rev 2125)
@@ -1,6 +1,12 @@
 $Id$
 
+2008-05-20 Mateusz Loskot <mateusz at loskot.net>
 
+	* bootstrap.bat: Added script generating headers for use with Visual C++
+	compiler. DO NOT include this script in GEOS source distribution.
+	* source/makefile.vc: Do not make copies of 3 dynamic headers but let
+	users to use bootstrap.bat instead.
+
 ---------  GEOS-3.0.0 release [2007-12-21] --------------------------
 
 2007-12-19 Mateusz Loskot <mateusz at loskot.net>

Added: trunk/bootstrap.bat
===================================================================
--- trunk/bootstrap.bat	                        (rev 0)
+++ trunk/bootstrap.bat	2008-05-20 20:33:50 UTC (rev 2125)
@@ -0,0 +1,17 @@
+ at ECHO OFF
+REM $Id$
+REM
+REM This script generates headers for use with Visual C++ only
+REM
+REM Usage:
+REM .\bootstrap.bat
+REM nmake -f makefile.vc
+REM
+REM NOTE: DO NOT include this script in GEOS sources distribution
+REM
+
+set GEOS_HEADERS=source\headers\geos
+
+COPY %GEOS_HEADERS%\version.h.vc %GEOS_HEADERS%\version.h 
+COPY %GEOS_HEADERS%\platform.h.vc %GEOS_HEADERS%\platform.h
+COPY capi\geos_c.h.in capi\geos_c.h

Modified: trunk/source/Makefile.vc
===================================================================
--- trunk/source/Makefile.vc	2008-04-21 23:22:11 UTC (rev 2124)
+++ trunk/source/Makefile.vc	2008-05-20 20:33:50 UTC (rev 2125)
@@ -296,14 +296,6 @@
 $(CDLLNAME): ..\capi\geos_c.obj $(DLLNAME)
 	link /dll /debug ..\capi\geos_c.obj $(LIBNAME) /out:$(CDLLNAME) /implib:$(CLIBNAME)
   
-headers/geos/platform.h: headers/geos/platform.h.vc
-	copy headers\geos\platform.h.vc headers\geos\platform.h
-
-# geos_c.h should already be in distribution, if is not you'll
-# have to run ./configure to recreate
-../capi/geos_c.h: ../capi/geos_c.h.in.
-	copy ..\capi\geos_c.h.in ..\capi\geos_c.h
-   
 .cpp.obj:
 	$(CC) $(CFLAGS) /c $*.cpp /Fo$@