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
---
release.sh | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
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
---
release.sh | 35 +++++++++++++++++++++--------------
1 file changed, 21 insertions(+), 14 deletions(-)
======
only in patch2:
unchanged:
--- tools/release.sh (revision 2757)
+++ tools/release.sh (working copy)
@@ -75,7 +75,7 @@
[ "${RELEASE_DRY_RUN}" ] || svn "$@"
}
do_svn_switch() {
- do_svn switch "$1"
+ do_svn switch "$@"
package_info_load
}
@@ -440,14 +440,13 @@
do_version_commit "$(do_release_step_branch_bump micro)"
do_svn_switch "${SVN_URL}"
}
-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" ] && return
-
+do_release_step_news_msg() {
+ cat <<MSG
+Archive released NEWS file: NEWS -> NEWS-${RELEASE_VERSION}
+Create new NEWS file from relesse script template.
+MSG
+}
+do_release_step_news() {
# archive NEWS and create new one from template
do_svn move "NEWS" "NEWS-${RELEASE_VERSION}"
@@ -472,20 +471,28 @@
features and device support, please read the new Developer Manual (or
the BUGS and PATCHES files in the source archive).
NEWS
+ do_svn add NEWS
- MSG=<<MSG
-Archive released NEWS file: NEWS -> NEWS-${RELEASE_VERSION}
-Create new NEWS file from relesse script template.
-MSG
+ local MSG="$(do_release_step_news_msg)"
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() {
local A=${PACKAGE_TAG}
local B=${A/https/http}
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_clean
+ do_svn_switch --relocate "${PACKAGE_BUILD}" "${PACKAGE_TAG}"
do_svn_switch "${SVN_URL}"
}
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
