Update git tar changelog scripts; Add jogamp clone/do-branches scripts

5 files changed, 66 insertions, 8 deletions

diff --git a/git/funcs_git.sh b/git/funcs_git.sh
index 86b8f2c..10b0a35 100755
--- a/git/funcs_git.sh
+++ b/git/funcs_git.sh
@@ -10,10 +10,13 @@ function git-new-milestone() {
         exit 1
     fi
 
+    mkdir -p ../archive/Sources
+    mkdir -p ../archive/ChangeLogs
+
     echo "Module $module - Tag $new"
-    git archive --format=tar --prefix=$module-$new/ $new | xz -z -9 > ../archive/$module-$new.tar.xz
-    git archive --format=zip --prefix=$module-$new/ $new -o ../archive/$module-$new.zip
-    git log --no-merges $new ^$last > ../archive/$module-ChangeLog-$new
-    git shortlog --no-merges $new ^$last > ../archive/$module-ShortLog-$new
-    git diff --stat --summary -M $last $new > ../archive/$module-diffstat-$new
+    git archive --format=tar --prefix=$module-$new/ $new | xz -z -9 > ../archive/Sources/$module-$new.tar.xz
+#   git archive --format=zip --prefix=$module-$new/ $new -o ../archive/Sources/$module-$new.zip
+    git log --no-merges $new ^$last > ../archive/ChangeLogs/$module-ChangeLog-$new.txt
+    git shortlog --no-merges $new ^$last > ../archive/ChangeLogs/$module-ShortLog-$new.txt
+    git diff --stat --summary -M $last $new > ../archive/ChangeLogs/$module-diffstat-$new.txt
 }
diff --git a/git/git-jogamp-clone-all.sh b/git/git-jogamp-clone-all.sh
new file mode 100644
index 0000000..8b8e7b7
--- /dev/null
+++ b/git/git-jogamp-clone-all.sh
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+for j in gluegen  joal  joal-demos  jocl  jocl-demos  jogl  jogl-demos ; do
+    cd $j
+    echo 
+    echo MODULE $j
+    echo
+    git clone -o jogamp -b master file:///srv/scm/$j.git
+done
diff --git a/git/git-jogamp-do-branches.sh b/git/git-jogamp-do-branches.sh
new file mode 100755
index 0000000..7929074
--- /dev/null
+++ b/git/git-jogamp-do-branches.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+branchfile=$1
+shift
+remote=$1
+shift
+
+if [ -z "$branchfile" -o -z "$remote" ] ; then 
+    echo Usage $0 branchfile remote
+    echo branchfile containing branchnames without ref path
+    echo remote is your remote repo
+    exit 1
+fi
+
+for j in gluegen  joal  joal-demos  jocl  jocl-demos  jogl  jogl-demos ; do
+    cd $j
+    echo 
+    echo MODULE $j
+    echo
+    for i in `cat $branchfile` ; do 
+        git checkout --track -b $i $remote/$i 
+        git checkout master 
+    #    git branch -r -D $i 
+    done
+    cd ..
+done
diff --git a/git/git-tag-tar-changelog.sh b/git/git-tag-tar-changelog.sh
index 78ce8c3..babcf95 100755
--- a/git/git-tag-tar-changelog.sh
+++ b/git/git-tag-tar-changelog.sh
@@ -9,8 +9,8 @@ if [ -z "$artifacts" ] ; then
 fi
 
 branch=rc
-tag_old=v2.0-rc2
-tag=v2.0-rc3
+tag_old=v2.0-rc4
+tag=v2.0-rc5
 
 sdir=`dirname $0`
 thisdir=`pwd`
@@ -23,7 +23,7 @@ for i in gluegen joal joal-demos jogl jogl-demos jocl jocl-demos ; do
     cd $i
     git checkout $branch
     git pull jogamp $branch
-    git tag -u 0x8ED60127 -m "Signed Candidate $i $tag $sha" $tag $sha
+    git tag -s -u 0x8ED60127 -m "$tag" $tag $sha
     git-new-milestone $i $tag_old $tag
     cd $thisdir
     echo done $i
diff --git a/git/git-tar-changelog.sh b/git/git-tar-changelog.sh
new file mode 100755
index 0000000..ca16483
--- /dev/null
+++ b/git/git-tar-changelog.sh
@@ -0,0 +1,20 @@
+#! /bin/bash
+
+branch=rc
+tag_old=v2.0-rc4
+tag=v2.0-rc5
+
+sdir=`dirname $0`
+thisdir=`pwd`
+
+. $sdir/funcs_git.sh
+
+for i in gluegen joal joal-demos jogl jogl-demos jocl jocl-demos ; do
+    cd $i
+    git checkout $branch
+    git pull jogamp $branch
+    git-new-milestone $i $tag_old $tag
+    cd $thisdir
+    echo done $i
+    echo
+done