Add msvc files to distribution target, and update release notes to in…

…clude updating

version in .vc headers.


git-svn-id: http://svn.osgeo.org/geos/trunk@2244 5242fede-7e19-0410-aef8-94bd7d2200fb

HOWTO_RELEASE

@@ -7,10 +7,12 @@
      [ THIS MUST BE CAREFULLY AVOIDED ]
 
 2: Increment release version:
-   - VERSION_PATCH for bugfixes/improvements (even breaking C++ API)
-   - VERSION_MINOR for NEW interfaces in the C lib
-   - VERSION_MAJOR for SUBSTANTIAL additions or C lib ABI break
-     [ THIS MUST BE CAREFULLY AVOIDED ]
+   - In configure.in
+   - In source/headers/geos/version.h.vc
+     - VERSION_PATCH for bugfixes/improvements (even breaking C++ API)
+     - VERSION_MINOR for NEW interfaces in the C lib
+     - VERSION_MAJOR for SUBSTANTIAL additions or C lib ABI break
+       [ THIS MUST BE CAREFULLY AVOIDED ]
 
 3: Release-mark the ChangeLog (search for '---' at start of a line to 
    see how a release mark looks like).
@@ -20,6 +22,7 @@
 5: make distcheck
 
 6: check everything is ok ;)
+   ./configure ; make ; make check
 
 7: Tag the release:
    $ base=http://svn.osgeo.org/geos/

Makefile.am

@@ -6,6 +6,7 @@
 # relies on the order items in SUBDIRS appear.
 #
 SUBDIRS = 	\
+	build	\
 	source	\
 	capi	\
 	doc	\
@@ -15,3 +16,5 @@ SUBDIRS = 	\
 	tools
 
 EXTRA_DIST = acsite.m4 makefile.vc
+
+ACLOCAL_AMFLAGS = -I macros

build/Makefile.am

@@ -0,0 +1,12 @@
+#
+# NOTE: Make sure that 'source' appears first.
+# 'capi' and 'doc' surely rely on availability of libgeos
+# which is built under 'source' and it seems that automake
+# is not able to detect required build order but blindly
+# relies on the order items in SUBDIRS appear.
+#
+SUBDIRS = 	\
+	msvc80	
+
+EXTRA_DIST = README
+

build/msvc80/Makefile.am

@@ -0,0 +1,18 @@
+#
+# NOTE: Make sure that 'source' appears first.
+# 'capi' and 'doc' surely rely on availability of libgeos
+# which is built under 'source' and it seems that automake
+# is not able to detect required build order but blindly
+# relies on the order items in SUBDIRS appear.
+#
+SUBDIRS = \
+	geos_c_dll \
+	geos_lib \
+	geos_python \
+	geos_ruby \
+	geos_unit
+
+EXTRA_DIST = \
+	README \
+	geos.sln \
+	geos.vsprops

build/msvc80/geos_c_dll/Makefile.am

@@ -0,0 +1,9 @@
+#
+# NOTE: Make sure that 'source' appears first.
+# 'capi' and 'doc' surely rely on availability of libgeos
+# which is built under 'source' and it seems that automake
+# is not able to detect required build order but blindly
+# relies on the order items in SUBDIRS appear.
+#
+EXTRA_DIST = \
+	geos_c_dll.vcproj

build/msvc80/geos_lib/Makefile.am

@@ -0,0 +1,9 @@
+#
+# NOTE: Make sure that 'source' appears first.
+# 'capi' and 'doc' surely rely on availability of libgeos
+# which is built under 'source' and it seems that automake
+# is not able to detect required build order but blindly
+# relies on the order items in SUBDIRS appear.
+#
+EXTRA_DIST = \
+	geos_lib.vcproj

build/msvc80/geos_python/Makefile.am

@@ -0,0 +1,9 @@
+#
+# NOTE: Make sure that 'source' appears first.
+# 'capi' and 'doc' surely rely on availability of libgeos
+# which is built under 'source' and it seems that automake
+# is not able to detect required build order but blindly
+# relies on the order items in SUBDIRS appear.
+#
+EXTRA_DIST = \
+	geos_python.vcproj

build/msvc80/geos_ruby/Makefile.am

@@ -0,0 +1,9 @@
+#
+# NOTE: Make sure that 'source' appears first.
+# 'capi' and 'doc' surely rely on availability of libgeos
+# which is built under 'source' and it seems that automake
+# is not able to detect required build order but blindly
+# relies on the order items in SUBDIRS appear.
+#
+EXTRA_DIST = \
+	geos_ruby.vcproj

build/msvc80/geos_unit/Makefile.am

@@ -0,0 +1,9 @@
+#
+# NOTE: Make sure that 'source' appears first.
+# 'capi' and 'doc' surely rely on availability of libgeos
+# which is built under 'source' and it seems that automake
+# is not able to detect required build order but blindly
+# relies on the order items in SUBDIRS appear.
+#
+EXTRA_DIST = \
+	geos_unit.vcproj

configure.in

@@ -244,6 +244,13 @@ dnl output stuff ----------------------------------------------------------
 
 AC_OUTPUT([
 	Makefile 
+	build/Makefile
+	build/msvc80/Makefile
+	build/msvc80/geos_c_dll/Makefile
+	build/msvc80/geos_lib/Makefile
+	build/msvc80/geos_python/Makefile
+	build/msvc80/geos_ruby/Makefile
+	build/msvc80/geos_unit/Makefile
 	capi/Makefile
 	capi/geos_c.h
 	doc/Doxyfile

source/Makefile.vc

@@ -56,10 +56,10 @@ SLIBNAME = geos_i.lib
 
 # List of objects
 OBJ = \
-    algorithm\CGAlgorithms.obj \
 	algorithm\CentroidArea.obj \
 	algorithm\CentroidLine.obj \
 	algorithm\CentroidPoint.obj \
+	algorithm\CGAlgorithms.obj \
 	algorithm\ConvexHull.obj \
 	algorithm\HCoordinate.obj \
 	algorithm\InteriorPointArea.obj \
@@ -72,6 +72,7 @@ OBJ = \
 	algorithm\PointLocator.obj \
 	algorithm\RayCrossingCounter.obj \
 	algorithm\RobustDeterminant.obj \
+	algorithm\RobustLineIntersector \
 	algorithm\SimplePointInRing.obj \
 	algorithm\SIRtreePointInRing.obj \
 	algorithm\locate\IndexedPointInAreaLocator.obj \

source/headers/geos/Makefile.am

@@ -11,7 +11,7 @@ SUBDIRS = \
 	simplify \
 	util 
 
-EXTRA_DIST = platform.h.vc version.h
+EXTRA_DIST = platform.h.vc version.h version.h.vc
 
 
 geosdir = $(includedir)/geos