Made further refinements to supporting files used for generating

and sending release announcements.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 2075ed1a1f388494f99276e3f75c577cd9206b7b..3edc38469883685415d53b8ae7536cffff04f941 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -227,8 +227,8 @@ install: tag upload-to-sf-incoming upload-to-project-webspace
        @echo
        @echo "  http://sourceforge.net/project/admin/editpackages.php?group_id=21935"
 
-announce: RELEASE-NOTES-PARTIAL.txt .announcement-text distrib
-       $(RELEASE_ANNOUNCE) "$(DISTRO_TITLE)" "$(RELVER)" "$(ANNOUNCE_RECIPIENTS)" < .announcement-text
+announce: $(ANNOUNCE_CHANGES) .announcement-text distrib
+       $(RELEASE_ANNOUNCE) "$(DISTRO_TITLE)" "$(RELVER)" .announcement-text $< "$(ANNOUNCE_RECIPIENTS)"
 
 tag:
 ifeq (,$(shell svn status))

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 58c6453aaa8655fd2e7efddee45dfb0b905c75ed..5b4aac90eb12a89bf4ca8cc4767bd6000d66bbfa 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -12,6 +12,7 @@ include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
 RELEASE_ANNOUNCE=$(DOCBOOK_SVN)/releasetools/release-announce
 ANNOUNCE_RECIPIENTS=docbook-apps@lists.oasis-open.org
+ANNOUNCE_CHANGES=RELEASE-NOTES-PARTIAL.txt
 FRESHMEAT_SUBMIT=$(DOCBOOK_SVN)/releasetools/freshmeat-submit
 
 CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example
@@ -218,4 +219,3 @@ SVN_OPTS=
 
 SED=sed
 SED_OPTS=
-

diff --git a/releasetools/release-announce b/releasetools/release-announce
index 990533aabb448d19789dc65b35f38c530e56cf33..57f92700a9138010488441aa27930876eb5db788 100755 (executable)
--- a/releasetools/release-announce
+++ b/releasetools/release-announce
@@ -4,19 +4,21 @@
 # release-announce - send DocBook Project release announcements
 
 # Usage:
-# release-announce TITLE VERSION RECIPIENTS < messageBodyFile
-#   or
-# cat messageBodyFile | release-announce TITLE VERSION RECIPIENTS 
+# release-announce TITLE VERSION MESSAGE CHANGES RECIPIENTS
 #
 # e.g.,
-#   release-announce XSL Stylesheets 1.73.0 docbook-apps@lists.oasis-open.org < .announcement-text
+#  release-announce "XSL Stylesheets" 1.73.0 \
+#    .announcement-text \
+#    RELEASE-NOTES-PARTIAL.txt \
+#    docbook-apps@lists.oasis-open.org
 
 title=$1
 version=$2
-recipients=$3
+message=$3
+changesfile=$4
+recipients=$5
 sender=docbook-dev@xml-doc.org
 tempfile=/tmp/announcement-message-body.txt
-releasenotesfilename=RELEASE-NOTES-PARTIAL.txt
 
 rm -f $tempfile
 
@@ -27,15 +29,16 @@ Subject: ANNOUNCE: DocBook $title $version released
 
 EOF
 
-# read in annoucement text
-while read line
-do
-  # substitute actual version no. where needed, append to message body
-  echo $line | sed "s/@@version@@/$version/" >> $tempfile
-done
+# append announcement boilerplate text, substituting actual version
+# number where needed
+sed "s/@@version@@/$version/" < $message >> $tempfile
 
 # add a blank line to separate announcement header and text from
 # appended release-notes content
 echo >> $tempfile
 
-cat $tempfile $releasenotesfilename | sendmail -v -f $sender $recipients
+# append the current list of changes
+cat $changesfile >> $tempfile
+
+# e-mail the actual announcement
+cat $tempfile | sendmail -v -f $sender $recipients

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index af2376dc2d70c80927b8d87dd023297b3515e032..8a8c3ff4ac2c1252a6e916e8dd1dce8c34ddd208 100644 (file)
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -101,4 +101,7 @@ install-ns: upload-to-sf-incoming upload-to-project-webspace-ns
        @echo "  http://sourceforge.net/project/admin/editpackages.php?group_id=21935"
 
 announce-ns: announce
-       $(RELEASE_ANNOUNCE) "XSL-NS Stylesheets" "$(RELVER)" "$(ANNOUNCE_RECIPIENTS)" < $(DOCBOOK_SVN)/releasetools/xslnsfiles/announcement-text
+       $(RELEASE_ANNOUNCE) "XSL-NS Stylesheets" "$(RELVER)" \
+         $(DOCBOOK_SVN)/releasetools/xslnsfiles/announcement-text
+         $(ANNOUNCE_CHANGES) \
+        "$(ANNOUNCE_RECIPIENTS)"