X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=do_release;h=64e21dc7b360203f852ab9cbb63848f5c2148a86;hb=413ace18d106fef69fa96d53831eebd600c9f157;hp=67b957af90d176bec33a35900f9e826f06bc10f3;hpb=2127e1931eec4a688d41baf253744fc48ed8c989;p=mirror_smartmontools-debian.git

diff --git a/do_release b/do_release
index 67b957a..64e21dc 100755
--- a/do_release
+++ b/do_release
@@ -1,46 +1,28 @@
-#!/bin/bash -ev
+#!/bin/bash
 #
 # do a smartmontools release
-# (C) 2003-6 Bruce Allen <ballen4705@users.sourceforge.net>, 
-#          Guido Guenther <agx@sigxcpu.org>
-# $Id: do_release 2845 2009-07-18 13:25:18Z chrfranke $
-
-echo 'TODO: Rework this script for SVN.'
-exit 1
+# (C) 2003-11 Bruce Allen, Guido Guenther
+# (C) 2006-15 Christian Franke
+# $Id: do_release 4071 2015-04-26 18:25:12Z chrfranke $
 
 # Notes on generating releases:
 # (1) update NEWS
-# (2) update CHANGELOG -- put in release number
-# (3) update release number in configure.in 
-# (4) to test, set USECVS below to 0
-# (5) when satisfied, set USECVS below to 1
-
-USECVS=1
+# (2) update ChangeLog -- put in release number
+# (3) update release number in configure.ac
+# (4) to test, run without '--commit'
+# (5) when satisfied, add option '--commit'
 
-KEYID=0x841ABAE8
-
-setup_cvs()
-{
-  CVS_SERVER=fakevalue
-  unset CVS_SERVER || echo "can't unset CVS_SERVER=$CVS_SERVER"
-  CVS_RSH=ssh
-  CVSROOT=:ext:ballen4705@smartmontools.cvs.sourceforge.net:/cvsroot/smartmontools
-}
+set -e
 
-get_release()
-{
-  VERSION=`grep 'AC_INIT' configure.in | awk '{ print $2 }' | sed s/,//g`
-  RELEASE="RELEASE_${VERSION//\./_}"
-  echo "Version: $VERSION"
-  echo "Release: $RELEASE"
-}
+# Smartmontools Signing Key (through 2016)
+KEYID=0xC4A4903A
 
 inc_release()
 {
   MINOR=`echo $VERSION | cut -d. -f2`
   MAJOR=`echo $VERSION | cut -d. -f1`
   PERL_OLD=$MAJOR\\.$MINOR
-  ((MINOR++))
+  ((++MINOR))
   NEW_VERSION=$MAJOR.$MINOR
   PERL_NEW=$MAJOR\\.$MINOR	
   NEW_RELEASE="RELEASE_${NEW_VERSION//\./_}"
@@ -48,52 +30,116 @@ inc_release()
   echo "New Release: $NEW_RELEASE"
 }
 
-# run automake/autoconf
-if [ -f Makefile ] ; then
-  make distcheck || exit 1
-  make clean
-  make distclean
-  rm -f Makefile configure
+COMMIT=
+RC=
+
+case "$1" in
+  --commit) COMMIT=yes; shift ;;
+esac
+
+case "$*" in
+  RC[1-9]) RC="$1" ;;
+  FINAL) ;;
+  *) echo "Usage: $0 [--commit] RC[1-9]|FINAL"; exit 1 ;;
+esac
+
+# Check workdir
+case "`/bin/pwd`" in
+  */trunk/smartmontools)      WDROOT="../..";    DIRPAT="trunk"      ;;
+  */branches/*/smartmontools) WDROOT="../../.."; DIRPAT="branches/*" ;;
+  *) echo "`/bin/pwd`: no trunk or branch working dir"; exit 1 ;;
+esac
+
+if [ ! -d "$WDROOT/tags" ]; then
+  echo "tags directory missing"; exit 1
 fi
 
-smartmontools_release_date=`date -u +"%Y/%m/%d"`
-smartmontools_release_time=`date -u +"%T %Z"`
-cat configure.in  | sed "s|smartmontools_release_date=.*|smartmontools_release_date=${smartmontools_release_date}|" > configure.tmp
-cat configure.tmp | sed "s|smartmontools_release_time=.*|smartmontools_release_time=\"${smartmontools_release_time}\"|" > configure.in
-rm -f configure.tmp
+REVX="`(cd $WDROOT && svnversion)`" || exit 1
+REV="${REVX/%[PM]/}"; REV="${REV/%[PM]/}"
+if [ -n "${REV//[0-9]/}" ]; then
+  echo "Working directory not clean: $REVX"; exit 1
+fi
 
-./autogen.sh
+(cd $WDROOT && svn status) | while read s; do
+  case "`echo $s | tr -s ' '`" in
+    "M "$DIRPAT/smartmontools/ChangeLog)    echo "$s: OK";;
+    "M "$DIRPAT/smartmontools/NEWS)         echo "$s: OK";;
+    "M "$DIRPAT/smartmontools/configure.ac) echo "$s: OK";;
+    *) echo "$s: not allowed"; exit 1;;
+  esac
+done
+if [ $? -ne 0 ]; then
+  exit 1
+fi
+
+# Get release number
+VERSION=`sed -n 's|^AC_INIT[^,]*, *\([0-9.]*\) *,.*$|\1|p' configure.ac`
+if [ -z "$VERSION" ]; then
+  echo "AC_INIT not found in configure.ac"; exit 1
+fi
+VERSIONRC="$VERSION"
+RELEASE="RELEASE_${VERSION//\./_}"
 
-get_release
+if [ "$RC" ]; then
+  VERSIONRC="${VERSION}-${RC/#RC/rc}"
+  RELEASE="${RELEASE}_${RC}"
+fi
 
-# tag CVS version
-if [ $USECVS -ne 0 ] ; then
-    setup_cvs
-    cvs commit -m "Release $VERSION $RELEASE"
-    cvs tag -d $RELEASE 
-    cvs tag $RELEASE
+if [ -e "$WDROOT/tags/$RELEASE" ]; then
+  echo "tags/$RELEASE exists"; exit 1
 fi
 
-# build .tar.gz
-rm -rf build
+echo "r$REV: Release $VERSIONRC $RELEASE"
+
+# Update timestamp
+smartmontools_release_date=`date -u +"%Y-%m-%d"`
+smartmontools_release_time=`date -u +"%T %Z"`
+cat configure.ac  | sed "s|smartmontools_release_date=.*|smartmontools_release_date=${smartmontools_release_date}|" > configure.tmp
+cat configure.tmp | sed "s|smartmontools_release_time=.*|smartmontools_release_time=\"${smartmontools_release_time}\"|" > configure.ac
+rm -f configure.tmp
+
+# Review changes
+svn diff
+echo "==================================================================="
+echo ">>> Continuing in 20 seconds ..."
+sleep 20
+set -v
+
+# Create tag and commit
+if [ "$COMMIT" = "yes" ]; then
+  svn mkdir $WDROOT/tags/$RELEASE
+  svn copy ../smartmontools $WDROOT/tags/$RELEASE/smartmontools
+  svn commit -m "Release $VERSIONRC $RELEASE" $WDROOT
+fi
+
+# Build
+./autogen.sh
+
 mkdir build
 cd build
 ../configure
 make distcheck || exit 1
+make maintainer-clean
 cd ..
 
-# increase release number:
-inc_release
-if [ $USECVS -ne 0 ] ; then
-    perl -p -i.bak -e "s/$PERL_OLD/$PERL_NEW/" configure.in
+TARFILE=smartmontools-$VERSIONRC.tar.gz
+
+mv -f build/smartmontools-$VERSION.tar.gz $TARFILE
+rm -rvf build
+
+md5sum $TARFILE > $TARFILE.md5
+
+# Increase release number
+if [ -z "$RC" -a "$DIRPAT" = "trunk" ]; then
+  inc_release
+  if [ "$COMMIT" = "yes" ]; then
+    perl -p -i.bak -e "s/$PERL_OLD/$PERL_NEW/" configure.ac
+    # svn commit -m "Bump release number to $NEW_VERSION" configure.ac
+  fi
 fi
 
-cp -f build/smartmontools-$VERSION.tar.gz .
-if [ "$KEYID" ]; then
-  gpg --default-key $KEYID --armor --detach-sign ./smartmontools-$VERSION.tar.gz
+# Sign tarball
+if [ -n "$KEYID" ] && gpg --list-secret-keys $KEYID >/dev/null 2>/dev/null; then
+  gpg --default-key $KEYID --armor --detach-sign ./smartmontools-$VERSIONRC.tar.gz
 fi
 
-# cleanup
-rm -rf autom4te.cache build/ config.h.in Makefile.in examplescripts/Makefile.in \
-       depcomp mkinstalldirs install-sh configure config.guess config.sub \
-       aclocal.m4 missing *.bak