[geos-commits] r2244 - in trunk: . build build/msvc80
build/msvc80/geos_c_dll build/msvc80/geos_lib
build/msvc80/geos_python build/msvc80/geos_ruby
build/msvc80/geos_unit source source/headers/geos
svn_geos at osgeo.org
svn_geos at osgeo.org
Sun Jan 18 18:07:34 EST 2009
Author: pramsey
Date: 2009-01-18 18:07:34 -0500 (Sun, 18 Jan 2009)
New Revision: 2244
Added:
trunk/build/Makefile.am
trunk/build/msvc80/Makefile.am
trunk/build/msvc80/geos_c_dll/Makefile.am
trunk/build/msvc80/geos_lib/Makefile.am
trunk/build/msvc80/geos_python/Makefile.am
trunk/build/msvc80/geos_ruby/Makefile.am
trunk/build/msvc80/geos_unit/Makefile.am
Modified:
trunk/HOWTO_RELEASE
trunk/Makefile.am
trunk/build/
trunk/build/msvc80/
trunk/build/msvc80/geos_c_dll/
trunk/build/msvc80/geos_lib/
trunk/build/msvc80/geos_python/
trunk/build/msvc80/geos_ruby/
trunk/build/msvc80/geos_unit/
trunk/configure.in
trunk/source/Makefile.vc
trunk/source/headers/geos/Makefile.am
Log:
Add msvc files to distribution target, and update release notes to include updating
version in .vc headers.
Modified: trunk/HOWTO_RELEASE
===================================================================
--- trunk/HOWTO_RELEASE 2009-01-18 22:35:44 UTC (rev 2243)
+++ trunk/HOWTO_RELEASE 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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/
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-01-18 22:35:44 UTC (rev 2243)
+++ trunk/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -6,6 +6,7 @@
# relies on the order items in SUBDIRS appear.
#
SUBDIRS = \
+ build \
source \
capi \
doc \
@@ -15,3 +16,5 @@
tools
EXTRA_DIST = acsite.m4 makefile.vc
+
+ACLOCAL_AMFLAGS = -I macros
Property changes on: trunk/build
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Added: trunk/build/Makefile.am
===================================================================
--- trunk/build/Makefile.am (rev 0)
+++ trunk/build/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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
+
Property changes on: trunk/build/msvc80
___________________________________________________________________
Name: svn:ignore
- *.ncb
*.suo
debug
release
+ *.ncb
*.suo
debug
release
Makefile
Makefile.in
Added: trunk/build/msvc80/Makefile.am
===================================================================
--- trunk/build/msvc80/Makefile.am (rev 0)
+++ trunk/build/msvc80/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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
Property changes on: trunk/build/msvc80/geos_c_dll
___________________________________________________________________
Name: svn:ignore
- *.vcproj.*.user
Debug
Release
+ *.vcproj.*.user
Debug
Release
Makefile
Makefile.in
Added: trunk/build/msvc80/geos_c_dll/Makefile.am
===================================================================
--- trunk/build/msvc80/geos_c_dll/Makefile.am (rev 0)
+++ trunk/build/msvc80/geos_c_dll/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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
Property changes on: trunk/build/msvc80/geos_lib
___________________________________________________________________
Name: svn:ignore
- *.vcproj.*.user
Debug
Release
+ *.vcproj.*.user
Debug
Release
Makefile
Makefile.in
Added: trunk/build/msvc80/geos_lib/Makefile.am
===================================================================
--- trunk/build/msvc80/geos_lib/Makefile.am (rev 0)
+++ trunk/build/msvc80/geos_lib/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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
Property changes on: trunk/build/msvc80/geos_python
___________________________________________________________________
Name: svn:ignore
- Release
Debug
*.user
+ Release
Debug
*.user
Makefile
Makefile.in
Added: trunk/build/msvc80/geos_python/Makefile.am
===================================================================
--- trunk/build/msvc80/geos_python/Makefile.am (rev 0)
+++ trunk/build/msvc80/geos_python/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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
Property changes on: trunk/build/msvc80/geos_ruby
___________________________________________________________________
Name: svn:ignore
- Debug
Release
*.user
+ Debug
Release
*.user
Makefile
Makefile.in
Added: trunk/build/msvc80/geos_ruby/Makefile.am
===================================================================
--- trunk/build/msvc80/geos_ruby/Makefile.am (rev 0)
+++ trunk/build/msvc80/geos_ruby/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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
Property changes on: trunk/build/msvc80/geos_unit
___________________________________________________________________
Name: svn:ignore
- *.vcproj.*.user
Debug
Release
+ *.vcproj.*.user
Debug
Release
Makefile
Makefile.in
Added: trunk/build/msvc80/geos_unit/Makefile.am
===================================================================
--- trunk/build/msvc80/geos_unit/Makefile.am (rev 0)
+++ trunk/build/msvc80/geos_unit/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -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
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-01-18 22:35:44 UTC (rev 2243)
+++ trunk/configure.in 2009-01-18 23:07:34 UTC (rev 2244)
@@ -244,6 +244,13 @@
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
Modified: trunk/source/Makefile.vc
===================================================================
--- trunk/source/Makefile.vc 2009-01-18 22:35:44 UTC (rev 2243)
+++ trunk/source/Makefile.vc 2009-01-18 23:07:34 UTC (rev 2244)
@@ -56,10 +56,10 @@
# 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 @@
algorithm\PointLocator.obj \
algorithm\RayCrossingCounter.obj \
algorithm\RobustDeterminant.obj \
+ algorithm\RobustLineIntersector \
algorithm\SimplePointInRing.obj \
algorithm\SIRtreePointInRing.obj \
algorithm\locate\IndexedPointInAreaLocator.obj \
Modified: trunk/source/headers/geos/Makefile.am
===================================================================
--- trunk/source/headers/geos/Makefile.am 2009-01-18 22:35:44 UTC (rev 2243)
+++ trunk/source/headers/geos/Makefile.am 2009-01-18 23:07:34 UTC (rev 2244)
@@ -11,7 +11,7 @@
simplify \
util
-EXTRA_DIST = platform.h.vc version.h
+EXTRA_DIST = platform.h.vc version.h version.h.vc
geosdir = $(includedir)/geos
More information about the geos-commits
mailing list