script/librelease.sh: automate Samba4 alpha releases

2 files changed, 14 insertions, 27 deletions

diff --git a/script/librelease.sh b/script/librelease.sh
index 089b371b7d..ac82762d30 100755
--- a/script/librelease.sh
+++ b/script/librelease.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 # make a release of a Samba library
 
-GPG_USER='Samba Library Distribution Key <samba-bugs@samba.org>'
-GPG_KEYID='13084025'
+[ -z "$GPG_USER" ] && {
+    GPG_USER='Samba Library Distribution Key <samba-bugs@samba.org>'
+}
+
+[ -z "$GPG_KEYID" ] && {
+    GPG_KEYID='13084025'
+}
 
 if [ ! -d ".git" ]; then
 	echo "Run this script from the top-level directory in the"
@@ -20,6 +25,7 @@ umask 0022
 release_lib() {
     lib="$1"
     srcdir="$2"
+    ftpdir="$3"
 
     pushd $srcdir
 
@@ -67,21 +73,21 @@ release_lib() {
     }
 
     echo "Transferring for FTP"
-    rsync -Pav $tarname.asc $tgzname master.samba.org:~ftp/pub/$lib/ || {
+    rsync -Pav $tarname.asc $tgzname master.samba.org:~ftp/pub/$ftpdir/ || {
 	exit 1
     }
-    rsync master.samba.org:~ftp/pub/$lib/$tarname.*
+    rsync master.samba.org:~ftp/pub/$ftpdir/$tarname.*
 
     popd
 }
 
 for lib in $*; do
     case $lib in
-	talloc | tdb | tevent)
-	    release_lib $lib "lib/$lib"
+	talloc | tdb | tevent | ldb)
+	    release_lib $lib "lib/$lib" $lib
 	    ;;
-	ldb)
-	    release_lib $lib "source4/lib/$lib"
+	samba4)
+	    release_lib $lib "." "samba/$lib"
 	    ;;
 	*)
 	    echo "Unknown library $lib"
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
deleted file mode 100755
index 19a1ade376..0000000000
--- a/source4/script/mkrelease.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then
-	echo "Run this script from the top-level directory in the"
-	echo "repository as: ./source4/script/mkrelease.sh"
-	exit 1
-fi
-
-./buildtools/bin/waf dist
-TGZFILE="`echo *.tar.gz`"
-gunzip $TGZFILE
-TARFILE="`echo *.tar`"
-
-echo "Now run: "
-echo "gpg --detach-sign --armor $TARFILE"
-echo "gzip $TARFILE"
-echo "And then upload "
-echo "$TARFILE.gz $TARFILE.asc"
-echo "to pub/samba/samba4/ on samba.org"