Merge pull request #230 from jbo-ads/prep-release

Minor updates to release scripts

Author: jbo-ads

release-notes.sh

@@ -1,11 +1,20 @@
 #!/bin/bash
 
-commitdiff=$1
+# Run from a MapCache git clone, ./release-notes.sh tag1..tag2 , e.g. for changes
+# from 1.8.0 to 1.8.1, run
+# ./release-notes.sh rel-1-8-0..rel-1-8-1
+# Output from this script can be appended to the changelogs after having been
+# manually filtered of irrelevant commits
 
-if test -z $commitdiff; then
+tags=$1
+if test -z $tags; then
    echo "usage: $0 startcommit..endcommit"
    exit
 fi
 
-git --no-pager  log --no-merges  --pretty=format:'%s (%an) : `%h <https://github.com/mapserver/mapcache/commit/%H>`__' $commitdiff | gsed  's!#\([0-9]\+\)! `#\1 <https://github.com/mapserver/mapcache/issues/\1>`__ !g'
+SED=sed
+if [ "$(uname)" = "Darwin" ]; then
+  SED=gsed
+fi
 
+git --no-pager  log --no-merges  --pretty=format:'* %s (%an) : `%h <https://github.com/mapserver/mapcache/commit/%H>`__' $tags | $SED  's!#\([0-9]\+\)! `#\1 <https://github.com/mapserver/mapcache/issues/\1>`__ !g'

release.sh

@@ -2,7 +2,8 @@
 
 ms_version=$1
 
-echo "release steps for mapcache version $ms_version (mapcache-$ms_version.tar.gz)"
+echo ""
+echo "# Release steps for mapcache version $ms_version (mapcache-$ms_version.tar.gz)"
 echo ""
 
 ms_version_suffix=`echo $ms_version | cut -s -d- -f2`
@@ -23,9 +24,9 @@ if [ ! -z $ms_version_suffix ]; then
 fi
 
 echo "#"
-echo "# make sure:"
+echo "# Make sure:"
 echo "# - you are on branch-$ms_version_major-$ms_version_minor"
-echo "# - you have edited HISTORY.TXT with changes related to this release"
+echo "# - you have edited MIGRATION_GUIDE.txt with changes related to this release"
 echo "#"
 echo ""
 
@@ -47,8 +48,8 @@ echo "scp /tmp/mapcache-$ms_version.tar.gz download.osgeo.org:/osgeo/download/ma
 
 echo ""
 echo "#"
-echo "#optionally update doc site, these commands need tweaking before being ran"
+echo "# Optionally update doc site, these commands need tweaking before being ran"
 echo "#"
 
-echo "/path/to/docs/scripts/changelog.sh rel-previous-tag..$tagname >> /path/to/docs/en/development/changelog/changelog-$ms_version_major-$ms_version_minor.txt"
+echo "/path/to/mapcache/release-notes.sh rel-previous-tag..$tagname >> /path/to/docs/en/development/changelog/changelog-$ms_version_major-$ms_version_minor.txt"