Update release scripts

diff --git a/bacula/release/ReleaseProcedure.txt b/bacula/release/ReleaseProcedure.txt
index 0aa407eee27735e581acec557a176d617c36cffd..f21da791f6eb31226954270e0eb743200a12733c 100644 (file)
--- a/bacula/release/ReleaseProcedure.txt
+++ b/bacula/release/ReleaseProcedure.txt
@@ -68,8 +68,16 @@ These are the steps to complete for making a new release.
 
 19. Update the news item to announce the release.
 
-20. Send the release announcement to the users, devel, and announce 
+20. Send the release announcement to the users, devel, and announce
     mailing lists.
 
-21. Update the link to the release version in the "Current Release" 
+21. Update the link to the release version in the "Current Release"
     in the menu (inc/header.php).
+
+22. See the document website-release.txt to update the bacula.org
+    website to release the new files.
+
+23. See the document update_website.txt for how to update the bacula.org
+    website for the new release.
+
+

diff --git a/bacula/release/clean b/bacula/release/clean
index deccc1447dc3f219724a6f228768f0142c2cf7c3..7ff05d53a78cc43f699b112a8feb87cf43d8dd7d 100755 (executable)
--- a/bacula/release/clean
+++ b/bacula/release/clean
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2018 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Remove old baculas
-rm -f bacula-* win*.log
+rm -rf bacula-* win*.log build.log

diff --git a/bacula/release/makeall b/bacula/release/makeall
index 73b5d7a824a74227f5628be20493c737e103e0e9..e179d821fa3c1de2666db53600bc819696f1f6d3 100755 (executable)
--- a/bacula/release/makeall
+++ b/bacula/release/makeall
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2017 Kern Sibbald
+# Copyright (C) 2000-2018 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Make full release
@@ -13,5 +13,8 @@ echo "Creating release version: ${ver}"
 
 cd $cwd
 
+#./makedriversrel $drivers origin $branch $ver
+echo "Creating main Bacula release"
 ./makebacularel $bacula $remote $branch $ver
+echo "Creating docs release"
 ./makedocsrel $bacula $docs $remote $branch $ver

diff --git a/bacula/release/makebacularel b/bacula/release/makebacularel
index 0d8947a314506ac1656740c227740e19ed616c50..f15daee45315d5eebcb89db8c856bab11c256c49 100755 (executable)
--- a/bacula/release/makebacularel
+++ b/bacula/release/makebacularel
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2017 Kern Sibbald
+# Copyright (C) 2000-2018 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # This script is used to make a Bacula release
@@ -11,7 +11,7 @@
 #  do not run it in the Bacula source or Git directory, but
 #  in a special release directory.
 #
-# Commit all changes, update the language files, 
+# Commit all changes, update the language files,
 #    export the release, make a release tar.
 #
 # source config
@@ -35,9 +35,9 @@ if [ $? -ne 0 ]; then
    echo "Directory: $1 does not exist"
    exit 1
 fi
-src=`pwd` 
+src=`pwd`
 current=`git branch | awk '/*/ { print $2 }'`
-cd $base_dir 
+cd $base_dir
 if [ $?  -ne 0 ]; then
    echo "Directory: $1 does not exist"
    exit 1
@@ -66,7 +66,7 @@ if [ a$updatepo != ano ]; then
    ./configure --enable-client-only
    cd po
    make update-po
-   cd ${src}   
+   cd ${src}
 fi
 
 git tag -d ${fulltag}
@@ -93,7 +93,7 @@ if [ $? != 0 ] ; then
 fi
 echo "Exported release into ${cwd}/$base_pkg-$ver.tar.gz"
 cd ${cwd}
-tar xfz $base_pkg-$ver.tar.gz 
+tar xfz $base_pkg-$ver.tar.gz
 # First remove Enterprise Win32 plugin source
 cd $base_pkg-$ver/bacula
 cp -fp ReleaseNotes ChangeLog src/version.h ${cwd}/

diff --git a/bacula/release/package-list b/bacula/release/package-list
index cfce827d0d0348d1149f00845119126d4dcff254..575e9527c5b97f9d1e9318ba40531e489178699c 100644 (file)
--- a/bacula/release/package-list
+++ b/bacula/release/package-list
@@ -6,3 +6,7 @@ bacula-gui-@ver@.tar.gz
 bacula-gui-@ver@.tar.gz.sig
 bacula-regress-@ver@.tar.gz
 bacula-regress-@ver@.tar.gz.sig
+bacula-win32-@ver@.exe
+bacula-win32-@ver@.exe.sig
+bacula-win64-@ver@.exe
+bacula-win64-@ver@.exe.sig

diff --git a/bacula/release/pushtags b/bacula/release/pushtags
index 07fd59212235b98b4afbe4c1575bce83b82d7181..d8c071199c755177df6e90e3b9b9e267e1de2b0d 100755 (executable)
--- a/bacula/release/pushtags
+++ b/bacula/release/pushtags
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2017 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Push tags

diff --git a/bacula/release/upload b/bacula/release/upload
index ceb3213f63f8426962740b9416688a85ab5e2acb..307175762c3c3a5fc0f399241e129ac4f6bfde1b 100755 (executable)
--- a/bacula/release/upload
+++ b/bacula/release/upload
@@ -1,13 +1,12 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2017 Kern Sibbald
+# Copyright (C) 2000-2019 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # Upload to File Release System on serfullver
 #
 . ./config
 
-ver="7.9.0"
 RSYNC="rsync -av --no-g --progress $upload_opt"
 
 do_upload()
@@ -21,12 +20,12 @@ EOF
 
 echo "Uploading source"
 for i in bacula-$ver* bacula-*-$ver*; do \
-   echo "Uplod $i to ${where}:/home/src/$ver"
+   echo "Upload $i to ${where}:/home/src/$ver"
    $RSYNC $i ${where}:/home/src/$ver/; \
 done
 
 # Upload release notes
-echo "Uplod ReleaseNotes to ${where}:/home/src/$ver"
+echo "Uplode ReleaseNotes to ${where}:/home/src/$ver"
 $RSYNC ReleaseNotes ${where}:/home/src/$ver/
 echo "Uplod ChangeLog to ${where}:/home/src/$ver"
 $RSYNC ChangeLog ${where}:/home/src/$ver/