diff --git a/rc-merge.sh b/rc-merge.sh deleted file mode 100755 index 762a54016687357f55881e8ee5e47e9f91323066..0000000000000000000000000000000000000000 --- a/rc-merge.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -ex -# merge back the RC branch. -svn up -svnmerge merge -S /branches/rc . -svn commit -F svnmerge-commit-message.txt diff --git a/rc.sh b/rc.sh deleted file mode 100755 index ba96418ee951ea542e49c7b0dfc9a235db55a10d..0000000000000000000000000000000000000000 --- a/rc.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -ex -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - - -# -# Kohsuke's automated script to create the RC branch. -# - -# there shouldn't be any unmerged changes in the RC branch -svnmerge merge -S /branches/rc . -pending=$(svn status | grep -v '^?' | wc -l) -if [ $pending != 0 ]; then - echo "unmerged or uncommitted changes" - exit 1 -fi - -# create the release branch -repo=https://www.dev.java.net/svn/hudson -RC=$repo/branches/rc -tag=$repo/tags/hudson-$(show-pom-version pom.xml | sed -e "s/-SNAPSHOT//g" -e "s/\\./_/g")-rc - -svn rm -m "deleting the old RC branch" $RC -svn up -rev=$(svn info --xml . | xmlstarlet sel -t -v /info/entry/@revision) -svn cp -m "tagging the branch point" $repo/trunk/hudson/main@$rev $tag -svn cp -m "creating a new RC branch" $repo/trunk/hudson/main@$rev $RC - -# update changelog.html -WWW=../../www -svn up $WWW/changelog.html -ruby rc.changelog.rb < $WWW/changelog.html > $WWW/changelog.new -mv $WWW/changelog.new $WWW/changelog.html - -pushd $WWW -svn commit -m "RC branch is created" changelog.html -popd - -# re-initialize the tracking -svn up -svnmerge init -F $repo/branches/rc -svn commit -F svnmerge-commit-message.txt