imi415
/
openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix release script bugs after experience from 0.2.0: 

- The NEWS step failed due to an empty commit comment.
- The final release step would have failed, because the steps to switch
  from the secure to insecure repository (and back again) require both
  switch and a URL relocation steps


git-svn-id: svn://svn.berlios.de/openocd/trunk@2782 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-09-30 23:19:53 +00:00
parent 32599fab1a
commit 8624535b80
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/release.sh
View File

@ -75,7 +75,7 @@ do_svn() {
[ "${RELEASE_DRY_RUN}" ] || svn "$@" [ "${RELEASE_DRY_RUN}" ] || svn "$@"
} }
do_svn_switch() { do_svn_switch() {
do_svn switch "$1" do_svn switch "$@"
package_info_load package_info_load
} }
@ -440,14 +440,13 @@ do_release_step_branch() {
do_version_commit "$(do_release_step_branch_bump micro)" do_version_commit "$(do_release_step_branch_bump micro)"
do_svn_switch "${SVN_URL}" do_svn_switch "${SVN_URL}"
} }
do_release_step_bump() { do_release_step_news_msg() {
# major and minor releases require branch version update too cat <<MSG
[ "${RELEASE_TYPE}" = "micro" ] || do_release_step_branch Archive released NEWS file: NEWS -> NEWS-${RELEASE_VERSION}
# bump the current tree version as required. Create new NEWS file from relesse script template.
do_version_commit "$(do_release_step_branch_bump "${RELEASE_TYPE}")" MSG
}
[ "${RELEASE_TYPE}" = "micro" ] && return do_release_step_news() {
# archive NEWS and create new one from template # archive NEWS and create new one from template
do_svn move "NEWS" "NEWS-${RELEASE_VERSION}" do_svn move "NEWS" "NEWS-${RELEASE_VERSION}"
@ -472,20 +471,28 @@ For more information about contributing test reports, bug fixes, or new
features and device support, please read the new Developer Manual (or features and device support, please read the new Developer Manual (or
the BUGS and PATCHES files in the source archive). the BUGS and PATCHES files in the source archive).
NEWS NEWS
do_svn add NEWS
MSG=<<MSG local MSG="$(do_release_step_news_msg)"
Archive released NEWS file: NEWS -> NEWS-${RELEASE_VERSION}
Create new NEWS file from relesse script template.
MSG
do_svn commit -m "${MSG}" NEWS NEWS-${RELEASE_VERSION} do_svn commit -m "${MSG}" NEWS NEWS-${RELEASE_VERSION}
} }
do_release_step_bump() {
# major and minor releases require branch version update too
[ "${RELEASE_TYPE}" = "micro" ] || do_release_step_branch
# bump the current tree version as required.
do_version_commit "$(do_release_step_branch_bump "${RELEASE_TYPE}")"
[ "${RELEASE_TYPE}" = "micro" ] || do_release_step_news
}
do_release_step_package() { do_release_step_package() {
local A=${PACKAGE_TAG} local A=${PACKAGE_TAG}
local B=${A/https/http} local B=${A/https/http}
local PACKAGE_BUILD=${B/${USER}@/} local PACKAGE_BUILD=${B/${USER}@/}
do_svn_switch "${PACKAGE_BUILD}" do_svn_switch "${PACKAGE_TAG}"
do_svn_switch --relocate "${PACKAGE_TAG}" "${PACKAGE_BUILD}"
do_stage do_stage
do_clean do_clean
do_svn_switch --relocate "${PACKAGE_BUILD}" "${PACKAGE_TAG}"
do_svn_switch "${SVN_URL}" do_svn_switch "${SVN_URL}"
} }