tcwg-llvm-release: Run release script for branches

Update our scripts so we can run test-release.sh with a custom git ref.
This should allow us to test master or release/N.x without a tag. We
already had this functionality before, but it was using the deprecated
'-svn-path' parameter instead of the current '-git-ref'.

Also remove the custom trunk "release candidate", since there's no need
to treat master as a special branch. I will also update the Jenkins job
accordingly.

Change-Id: Iccac0eba68bfec60cdec7f2e7b96e993afd11936

1 files changed, 5 insertions, 9 deletions

diff --git a/tcwg-llvm-release.sh b/tcwg-llvm-release.sh
index e5746231..5e1b5433 100755
--- a/tcwg-llvm-release.sh
+++ b/tcwg-llvm-release.sh
@@ -15,7 +15,7 @@ BASEDIR=$(dirname "$(readlink -f "$0")")
 # Syntax
 SYN_WORKSPACE="--workspace=/path/to/workspace"
 SYN_RELEASE="--release=M.m.p"
-SYN_CANDIDATE="--candidate=N (or 'final')"
+SYN_CANDIDATE="--candidate=N (or 'final' or 'branch=*')"
 SYN_BUILDJOBS="--buildjobs=N (def. CPUS)"
 SYN_TOOLCHAIN="--toolchain=http://url/for/tarball"
 SYN_TOOLCHAIN_FILE="--toolchain-file=<file-name> (file name to copy the produced toolchain file name)"
@@ -56,15 +56,11 @@ while [ "$#" -gt 0 ]; do
             RCCALL="-final"
             RCTAG=""
             RCDIR="final";;
-          trunk)
-            RCCALL="-svn-path trunk"
+          git-ref=*)
+            GITREF="${CANDIDATE#git-ref=}"
+            RCCALL="-git-ref $GITREF"
             RCTAG=""
-            RCDIR="trunk";;
-          branch=*)
-            BRANCHNAME="branches/${CANDIDATE#branch=}"
-            RCCALL="-svn-path $BRANCHNAME"
-            RCTAG=""
-            RCDIR="`echo $BRANCHNAME | sed -e 's,/,_,g'`";;
+            RCDIR="`echo $GITREF | sed -e 's,/,_,g'`";;
           *)
             if [[ "$CANDIDATE" -gt 0 ]]; then
               RCCALL="-rc $CANDIDATE"