[5/5] git commit: tweaks to build script

[iv...@apache.org]

tweaks to build script


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/644ad0b3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/644ad0b3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/644ad0b3

Branch: refs/heads/build/wicket-1.5.4
Commit: 644ad0b3ca0a94c77cfbb7d7e39b84b80950aeb7
Parents: a74a940
Author: Igor Vaynberg <ig...@gmail.com>
Authored: Tue Jan 10 09:08:19 2012 -0800
Committer: Igor Vaynberg <ig...@gmail.com>
Committed: Tue Jan 10 09:08:19 2012 -0800

----------------------------------------------------------------------
 release-igor.sh |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/644ad0b3/release-igor.sh
----------------------------------------------------------------------
diff --git a/release-igor.sh b/release-igor.sh
index d55ef0b..ea06a30 100755
--- a/release-igor.sh
+++ b/release-igor.sh
@@ -42,14 +42,21 @@ if [ $? -ne 0 ]; then
 fi
 rm pom.xml.asc
 
-echo "modifying poms with the new version: $version"
+branch="build/wicket-$version"
+
+echo "Removing previous build branch $branch (if exists)"
+git branch -D $branch
+echo "Switching to branch $branch"
+git checkout $branch
+
+echo "Modifying poms with the new version: $version"
 mvn5 versions:set -DnewVersion=$version
 mvn5 versions:commit
 find . -name "pom.xml" | xargs sed -i -e "s/1.5-SNAPSHOT/$version/g"
 find . -name "pom.xml" | xargs sed -i -e "s/wicket\/trunk/wicket\/releases\/$version/g"
 
-echo "committing changes"
-svn commit -m "modified poms for release $version"
+echo "Committing changes"
+git commit -am "modified poms for release $version"
 
 # Clear the current NOTICE.txt file
 echo "Creating notice file."
@@ -80,6 +87,9 @@ do
 	echo >> $NOTICE
 done
 
+echo "Committing changes"
+git commit -am "changes to notice files"
+
 # prebuilding to work around javadoc generation problem
 mvn5 clean install -DskipTests=true
 mvn5 javadoc:jar
@@ -102,6 +112,9 @@ gpg --print-md MD5 $filename > $filename.md5
 gpg --print-md SHA1 $filename > $filename.sha
 echo "$passphrase" | gpg --passphrase-fd 0 --armor --output $filename.asc --detach-sig $filename
 
+echo "Publishing build branch"
+git push origin $branch:refs/heads/$branch
+
 echo "Uploading release"
 svn export http://svn.apache.org/repos/asf/wicket/common/KEYS target/dist/KEYS
 ssh people.apache.org mkdir public_html/wicket-$version