summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-03-27 23:27:57 +0100
committerSven Gothel <[email protected]>2015-03-27 23:27:57 +0100
commit805b179aa915d49a38cb1471bd6b539d75aea1d1 (patch)
tree660cd23f87c31ba721abe8c6a2f98a7c58b147c4
parentc9e3db639d9a451cdb34d777a01d104cbcfc8bf6 (diff)
git-tag-tar...: Add jcpp and oculusvr-sdk; Use tar.xz compression for sources.
-rwxr-xr-xgit/funcs_git.sh4
-rwxr-xr-xgit/git-tag-tar-changelog.sh6
-rwxr-xr-xgit/git-tar-changelog.sh8
3 files changed, 9 insertions, 9 deletions
diff --git a/git/funcs_git.sh b/git/funcs_git.sh
index d7160a6..d7f9c2d 100755
--- a/git/funcs_git.sh
+++ b/git/funcs_git.sh
@@ -14,8 +14,8 @@ function git-new-milestone() {
mkdir -p ../archive/$new/ChangeLogs
echo "Module $module - Tag $new"
- git archive --format=tar --prefix=$module-$new/ $new | 7z a -si ../archive/$new/Sources/$module-$new.tar.7z
-# git archive --format=tar --prefix=$module-$new/ $new | xz -z -9 > ../archive/$new/Sources/$module-$new.tar.xz
+# git archive --format=tar --prefix=$module-$new/ $new | 7z a -si ../archive/$new/Sources/$module-$new.tar.7z
+ git archive --format=tar --prefix=$module-$new/ $new | xz -z -9 > ../archive/$new/Sources/$module-$new.tar.xz
# git archive --format=zip --prefix=$module-$new/ $new -o ../archive/$new/Sources/$module-$new.zip
git log --no-merges $new ^$last > ../archive/$new/ChangeLogs/$module-ChangeLog-$new.txt
git shortlog --no-merges $new ^$last > ../archive/$new/ChangeLogs/$module-ShortLog-$new.txt
diff --git a/git/git-tag-tar-changelog.sh b/git/git-tag-tar-changelog.sh
index 318d172..87a6072 100755
--- a/git/git-tag-tar-changelog.sh
+++ b/git/git-tag-tar-changelog.sh
@@ -9,15 +9,15 @@ if [ -z "$artifacts" ] ; then
fi
branch=master
-tag_old=v2.1.1
-tag=v2.1.2
+tag_old=v2.3.0
+tag=v2.3.1
sdir=`dirname $0`
thisdir=`pwd`
. $sdir/funcs_git.sh
-for i in gluegen joal joal-demos jogl jogl-demos jocl jocl-demos ; do
+for i in gluegen jcpp joal joal-demos jogl oculusvr-sdk jogl-demos jocl jocl-demos ; do
sha=`grep $i.build.commit $artifacts | awk --field-separator "=" ' { print $2 } ' `
echo $i sha $sha
cd $i
diff --git a/git/git-tar-changelog.sh b/git/git-tar-changelog.sh
index 6339ed1..6556f4e 100755
--- a/git/git-tar-changelog.sh
+++ b/git/git-tar-changelog.sh
@@ -1,15 +1,15 @@
#! /bin/bash
-branch=rc
-tag_old=v2.0.2-rc12
-tag=v2.0.2
+branch=master
+tag_old=v2.3.0
+tag=v2.3.1
sdir=`dirname $0`
thisdir=`pwd`
. $sdir/funcs_git.sh
-for i in gluegen joal joal-demos jogl jogl-demos jocl jocl-demos ; do
+for i in gluegen jcpp joal joal-demos jogl oculusvr-sdk jogl-demos jocl jocl-demos ; do
cd $i
git checkout $branch
git pull jogamp $branch