git commit: tweakign build script

[iv...@apache.org]

Updated Branches:
  refs/heads/master ad91fa775 -> d01c00295


tweakign build script


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

Branch: refs/heads/master
Commit: d01c002950a2e9bd9f15982d067719a4b262e1a0
Parents: ad91fa7
Author: Igor Vaynberg <ig...@gmail.com>
Authored: Tue Jan 10 10:46:37 2012 -0800
Committer: Igor Vaynberg <ig...@gmail.com>
Committed: Tue Jan 10 10:46:37 2012 -0800

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


http://git-wip-us.apache.org/repos/asf/wicket/blob/d01c0029/release-igor.sh
----------------------------------------------------------------------
diff --git a/release-igor.sh b/release-igor.sh
index d009029..660dc2e 100755
--- a/release-igor.sh
+++ b/release-igor.sh
@@ -33,7 +33,7 @@ stty -echo
 read passphrase
 stty $stty_orig
 
-# test the GPG passphrase to fail-fast:
+# test the GPGP passphrase to fail-fast:
 echo "$passphrase" | gpg --passphrase-fd 0 --armor --output pom.xml.asc --detach-sig pom.xml
 gpg --verify pom.xml.asc
 if [ $? -ne 0 ]; then
@@ -42,16 +42,23 @@ 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)"
+oldbranch=`git branch |grep -e "$branch"|wc -l`
+[ "$oldbranch" -ne 0 ] && git branch -D $branch
+
+echo "Switching to branch $branch"
+git checkout -b $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"
-echo "Failed: need to convert to git"
-exit
-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."
@@ -82,6 +89,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
@@ -104,6 +114,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