diff options
| -rwxr-xr-x | git/git-tag-tar-changelog.sh | 4 | ||||
| -rwxr-xr-x | jenkins-builds/funcs_promotion.sh | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/git/git-tag-tar-changelog.sh b/git/git-tag-tar-changelog.sh index 81a570d..78ce8c3 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-rc1 -tag=v2.0-rc2 +tag_old=v2.0-rc2 +tag=v2.0-rc3 sdir=`dirname $0` thisdir=`pwd` diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh index 0851f57..94fc023 100755 --- a/jenkins-builds/funcs_promotion.sh +++ b/jenkins-builds/funcs_promotion.sh @@ -22,6 +22,7 @@ function prom_setup() { mkdir $ldest/javadoc mkdir $ldest/jnlp-files mkdir $ldest/log + mkdir $ldest/resources mkdir $ldest/tmp cd $lthisdir @@ -222,6 +223,9 @@ function prom_promote_module() { fi done cp -av $zfolder/jnlp-files/* ./jnlp-files/ + if [ -e $zfolder/resources ] ; then + cp -av $zfolder/resources/* ./resources/ + fi cd $lthisdir } @@ -267,6 +271,9 @@ function prom_promote_demos() { cp -av tmp/$zfolder/jar ./$module/ cp -av tmp/$zfolder/jnlp-files ./$module/ cp -av tmp/$zfolder/www ./$module/ + if [ -e tmp/$zfolder/resources ] ; then + cp -av tmp/$zfolder/resources ./$module/ + fi cd $lthisdir } |