Tweak release makeall

[bacula/bacula] / bacula / release / makeall

diff --git a/bacula/release/makeall b/bacula/release/makeall
index 5721d5453ebfce664161945bcacdc940fd5dd0fe..16a9bead044fb74fd2517ef84c21be6751d53fa5 100755 (executable)
--- a/bacula/release/makeall
+++ b/bacula/release/makeall
@@ -2,30 +2,69 @@
 #
 # Make full release
 #
-branch=5.0.0
-#
+. ./functions
+
 # Bacula git repos
-bacula=/home/kern/bacula/k
-docs=/home/kern/bacula/docs
-rescue=/home/kern/bacula/rescue
-push=yes
+bacula=${bacula:-${HOME}/bacula/k}
+docs=${docs:-${HOME}/bacula/docs}
+rescue=${rescue:-${HOME}/bacula/rescue}
+#
+# Set the following to your remote name.  By default it is origin.
+#  NOTE!!! There is a different remote set on rescue below
+remote=bs
 
-./makeclean
-./makebacularel $bacula $branch
-./makedocsrel $bacula $docs $branch
-./makerescuerel $rescue $branch
-./makewinrel $bacula $branch | tee win$$.log
+#
+# Note, you will probably want to set updatepo=no if you
+#   run this script multiple times for a given release.
+export updatepo=no
+export push=yes
 
-grep -i warning win$$.log >/dev/null
-if [ $? -eq 0 ] ; then
-  echo " "
-  echo "Warnings in win$$.log"
+
+if [ $# != 1 ] ; then
+  echo "Need $0 <Branch-to-release>"
+  echo "e.g. $0 Branch-5.0"
   exit 1
 fi
+
+branch=$1
+
+cwd=`pwd`
+
+# We pull the version $ver from the main bacula source directory
+cd $bacula/bacula
+check_return_code "makeall: Directory $bacula/bacula does not exist"
+
+current=`git branch | awk '/*/ { print $2 }'`
+git checkout ${branch}
+check_return_code "makeall: Checkout of branch ${branch} failed."
+
+git pull ${remote} ${branch}
+ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' src/version.h`
+git checkout ${current}
+cd $cwd
+
+# ./makeclean
+./makebacularel $bacula $remote $branch $ver
+check_return_code "$0: makebacularel bad return code"
+
+./makedocsrel $bacula $docs $remote $branch $ver
+check_return_code "$0: makedocsrel bad return code"
+
+
+./makewinrel $bacula $remote $branch $ver | tee win$$.log
+check_return_code "$0: makewinrel bad return code"
+
+# strip ./configure strerror from Win log file
+sed -i -e 's%strerror%%' win$$.log
+# check for warning and error messages
+grep -i warning win$$.log >/dev/null
+check_return_code "makeall: Warnings in win$$.log"
 grep -i error win$$.log >/dev/null
-if [ $? -eq 0 ] ; then
-  echo " "
-  echo "Errors in win$$.log"
-  exit 1
-fi
+check_return_code "makeall: Errors in win$$.log"
 rm -f win$$.log
+
+remote=sf
+./makerescuerel $rescue $remote $branch $ver
+check_return_code "$0: makerescuerel bad return code"
+
+exit 0