[2/3] brooklyn-dist git commit: Updates to the release scripts for new artifacts

[sv...@apache.org]

Updates to the release scripts for new artifacts

Adds the Go CLI and fixes an issue with the RPM. Also some minor fixes
to the environment detection script.

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/29b0490f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/29b0490f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/29b0490f

Branch: refs/heads/master
Commit: 29b0490fee370a7ec0e06779cb820e86d13d6878
Parents: a717767
Author: Richard Downer <ri...@apache.org>
Authored: Wed Jun 29 16:54:17 2016 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Aug 9 16:29:21 2016 +0100

----------------------------------------------------------------------
 release/environment.sh            |  6 +++---
 release/make-release-artifacts.sh | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29b0490f/release/environment.sh
----------------------------------------------------------------------
diff --git a/release/environment.sh b/release/environment.sh
index 5f7642b..47f3280 100755
--- a/release/environment.sh
+++ b/release/environment.sh
@@ -84,20 +84,20 @@ detect_version
 
 if [ -z "${release_version}" ]; then
     release_version=${current_version%-SNAPSHOT}
-    [ "${release_version}" = "${current_version}" ] && fail Could not detect release version. Please provide using the -r option.
+    [ "${release_version}" = "${current_version}" ] && fail Could not detect release version. Please provide using the -v option.
 else
     [ "${release_version}" = "${current_version}" ] && { echo >&2 The provided release version is the same as the current version.; confirm || exit; }
 fi
 
 if [ -z "${continue_version}" ]; then
-    continue_version=$( perl -e 'die unless "'"$current_version"'" =~ /^(\d+)\.(\d+)\.(\d+)(.*)$/; printf "%d.%d.0-SNAPSHOT\n", $1, $2+1' ) || fail Could not detect the continuing version. Please provide using the -c option.
+    continue_version=$( perl -e 'die unless "'"$current_version"'" =~ /^(\d+)\.(\d+)\.(\d+)(.*)$/; printf "%d.%d.0-SNAPSHOT\n", $1, $2+1' ) || fail Could not detect the continuing version. Please provide using the -d option.
 else
     [ "${continue_version}" = "${current_version}" ] && { echo >&2 The provided continue version is the same as the current version.; confirm || exit; }
     [ "${continue_version}" = "${release_version}" ] && { echo >&2 The provided continue version is the same as the release version.; confirm || exit; }
 fi
 
 echo >&2 "The current version is: ${current_version}"
-echo >&2 "The release version is: ${release_version}"
+echo >&2 "The release version is: ${release_version} release candidate ${rc_suffix}"
 echo >&2 "The continuing version is: ${continue_version}"
 confirm || exit
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/29b0490f/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 310b3b6..6aa7788 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -212,6 +212,24 @@ mv ${bin_staging_dir}/brooklyn-dist-${current_version} ${bin_staging_dir}/${rele
 ( cd ${bin_staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-bin.zip ${release_name}-bin )
 
 ###############################################################################
+# CLI release
+set +x
+echo "Make CLI artifacts"
+set -x
+
+for p in linux windows macosx; do
+    mkdir ${bin_staging_dir}/${release_name}-client-cli-${p}
+    rsync -a ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/ ${bin_staging_dir}/${release_name}-client-cli-${p} --exclude '*.386' --exclude '*.amd64'
+done
+cp ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/linux.386/br ${bin_staging_dir}/${release_name}-client-cli-linux
+cp ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/windows.386/br.exe ${bin_staging_dir}/${release_name}-client-cli-windows
+cp ${bin_staging_dir}/${release_name}-bin/bin/brooklyn-client-cli/darwin.amd64/br ${bin_staging_dir}/${release_name}-client-cli-macosx
+for p in linux windows macosx; do
+    ( cd ${bin_staging_dir} && tar czf ${artifact_dir}/${artifact_name}-client-cli-${p}.tar.gz ${release_name}-client-cli-${p} )
+    ( cd ${bin_staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-client-cli-${p}.zip ${release_name}-client-cli-${p} )
+done
+
+###############################################################################
 # Vagrant release
 set +x
 echo "Proceeding to rename and repackage vagrant environment release"
@@ -237,7 +255,7 @@ cp ${src_staging_dir}/brooklyn-dist/packaging/target/rpm/apache-brooklyn/RPMS/no
 which sha256sum >/dev/null || alias sha256sum='shasum -a 256' && shopt -s expand_aliases
 
 ( cd ${artifact_dir} &&
-    for a in *.tar.gz *.zip; do
+    for a in *.tar.gz *.zip *.rpm; do
         md5sum -b ${a} > ${a}.md5
         sha1sum -b ${a} > ${a}.sha1
         sha256sum -b ${a} > ${a}.sha256