[beast] BUILD: added 'release-check' rule to take care of contributor lists



commit 50dc9002d7660bdf07b0cdc2774ac30bd5f67a3c
Author: Tim Janik <timj gtk org>
Date:   Fri Apr 8 18:53:16 2011 +0200

    BUILD: added 'release-check' rule to take care of contributor lists

 Makefile.am  |   17 ++++++-----------
 mkrelease.sh |    8 ++++++--
 2 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 307239b..2a8b8ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,20 +37,15 @@ ChangeLog:	$(shell $(srcdir)/mkrelease.sh commit-stamps)
 noinst_DATA += ChangeLog
 EXTRA_DIST  += ChangeLog mkrelease.sh
 
-# --- release-news ---
+# --- release helpers ---
 release-news:
-	$(srcdir)/mkrelease.sh news
-.PHONY: release-news
-
-# --- release-contributors ---
-release-contributors:
-	$(srcdir)/mkrelease.sh contributors -B timj,stw -C $(srcdir)/beast-gtk/bstmain.c
-.PHONY: release-contributors
-
-# --- release-upload ---
+	@$(srcdir)/mkrelease.sh news
+release-check:
+	@echo "Checking for unlisted contributors..."
+	@$(srcdir)/mkrelease.sh contributors -X -B timj,stw -C $(srcdir)/beast-gtk/bstmain.c
 release-upload: ChangeLog
 	$(srcdir)/mkrelease.sh upload -U beast:dist/beast/ -E configure.in:BSE_MICRO_VERSION
-.PHONY: release-upload
+.PHONY: release-news release-check release-upload
 
 # --- dist fixes ---
 uninstall_filter = $(strip	\
diff --git a/mkrelease.sh b/mkrelease.sh
index 0e853d0..b2398fd 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -52,6 +52,7 @@ usage() {
 	  -T <disttarball>	name of distribution tarball (from Makefile)
 	  -U <remoteurl>	remote release URL (e.g. example.com:distdir)
 	  -V <releaseversion>	release version (from Makefile)
+	  -X			expect no strings to be found for "contributors"
 EOF
   [ -z "$1" ] || exit $1
 }
@@ -64,6 +65,7 @@ REMOTE_URL=
 REVISIONVAR=
 CONTRBLACK=
 CONTRCFILE=/dev/null
+CONTREXIT=0
 parse_options=1
 while test $# -ne 0 -a $parse_options = 1; do
   case "$1" in
@@ -75,6 +77,7 @@ while test $# -ne 0 -a $parse_options = 1; do
     -T)		TARBALL="$2" ; shift ;;
     -U)		REMOTE_URL="$2" ; shift ;;
     -V)		VERSION="$2" ; shift ;;
+    -X)		CONTREXIT=1 ;;
     -v|--version) echo "$MYVERSION" ; exit 0 ;;
     --)		parse_options=0 ;;
     *)		[ -z "$COMMAND" ] || usage 1
@@ -140,11 +143,12 @@ done
 	      p; };
 	    b 1; }' < NEWS | sort | uniq > $TEMPF
   # list unknown contributor names as C strings
+  EX=0
   while read NAME ; do
     case ",$CONTRBLACK," in (*",$NAME,"*) continue ;; esac
-    grep -qFie \""$NAME"\" "$CONTRCFILE" || echo "  \"$NAME\","
+    grep -qFie \""$NAME"\" "$CONTRCFILE" || { echo "  \"$NAME\"," ; EX=$CONTREXIT ; }
   done < $TEMPF
-  exit
+  exit $EX
 }
 
 # === news ===



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]