[geos-commits] r4322 - branches/3.6

[Sandro Santilli]

Author: strk
Date: 2017-01-05 11:47:29 -0800 (Thu, 05 Jan 2017)
New Revision: 4322

Modified:
   branches/3.6/HOWTO_RELEASE
   branches/3.6/Makefile.am
Log:
Print a warning if ChangeLog isn't found on make dist

Tweak HOWTO_RELEASE file to make sure a ChangeLog is included

Modified: branches/3.6/HOWTO_RELEASE
===================================================================
--- branches/3.6/HOWTO_RELEASE	2017-01-05 19:47:22 UTC (rev 4321)
+++ branches/3.6/HOWTO_RELEASE	2017-01-05 19:47:29 UTC (rev 4322)
@@ -4,7 +4,7 @@
 - Run 'make distcheck', fix any problem with it.
 
 - Update the NEWS file (extract most important things from the
-  repository log). Make sure to update the release date 
+  repository log). Make sure to update the release date
 
 - Commit the changes in the NEWS file.
 
@@ -13,12 +13,10 @@
    $ svn copy -m "Tagged release MAJOR.MINOR.PATCH" \
 		$base/trunk $base/tags/MAJOR.MINOR.PATCH
 
-- Export the tag and 'make dist-bzip2'. 
-  $ svn export $base/tags/$rev
-  $ cd $rev
-  $ ./autogen.sh && ./configure && make dist-bzip2
+- Build a tarball: make dist-bzip2
 
-- Verify that you can unpack and build the tarball
+- Verify that you can unpack and build the generated tarball
+  (and that it contains a correct ChangeLog)
 
 - Copy the tarball to upload.osgeo.org:/osgeo/download/geos
 
@@ -33,7 +31,7 @@
 
 - Increment release version:
    - In configure.in
-   - In include/geos/version.h.vc 
+   - In include/geos/version.h.vc
    - In capi/geos_c.h.in
      - VERSION_PATCH for bugfixes/improvements (even breaking C++ API)
      - VERSION_MINOR for NEW interfaces in the C lib
@@ -47,5 +45,5 @@
     - Add latest release
     - Remove previos patch level release (if any)
 
-- Announce 
-   
+- Announce
+

Modified: branches/3.6/Makefile.am
===================================================================
--- branches/3.6/Makefile.am	2017-01-05 19:47:22 UTC (rev 4321)
+++ branches/3.6/Makefile.am	2017-01-05 19:47:29 UTC (rev 4322)
@@ -41,7 +41,10 @@
 	elif test -d .svn; then \
 		svn2cl --authors=authors.svn -i -o $${owd}/ChangeLog; \
 	elif test -f ChangeLog; then \
+		echo "NOTE: distributing ChangeLog found in source dir"; \
 		cp ChangeLog  $${owd}/ChangeLog; \
+	else \
+		echo "WARNING: could not find a ChangeLog" >&2; \
 	fi
 
 apidoc doxygen: