1) Only archive NEWS file on major and minor relesae, not bug-fixes.
2) Switch back to correct development branch during final release step.
3) Add do_svn_switch helper to ensure package variables are reloaded.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2516
b42882b7-edfa-0310-969c-
e2dbd0fdcd60
do_svn_echo "$@"
[ "${RELEASE_DRY_RUN}" ] || svn "$@"
}
do_svn_echo "$@"
[ "${RELEASE_DRY_RUN}" ] || svn "$@"
}
+do_svn_switch() {
+ do_svn switch "$1"
+ package_info_load
+}
package_info_load_name() {
package_info_load_name() {
do_version_tag_add in-development
}
do_release_step_branch() {
do_version_tag_add in-development
}
do_release_step_branch() {
- do_svn switch "${PACKAGE_BRANCH}"
- package_info_load
+ do_svn_switch "${PACKAGE_BRANCH}"
do_version_commit "$(do_release_step_branch_bump micro)"
do_version_commit "$(do_release_step_branch_bump micro)"
- do_svn switch "${SVN_URL}"
- package_info_load
+ do_svn_switch "${SVN_URL}"
}
do_release_step_bump() {
# major and minor releases require branch version update too
}
do_release_step_bump() {
# major and minor releases require branch version update too
# bump the current tree version as required.
do_version_commit "$(do_release_step_branch_bump "${RELEASE_TYPE}")"
# bump the current tree version as required.
do_version_commit "$(do_release_step_branch_bump "${RELEASE_TYPE}")"
+ [ "${RELEASE_TYPE}" = "micro" ] && return
+
# archive NEWS and create new one from template
do_svn move "NEWS" "NEWS-${RELEASE_VERSION}"
# archive NEWS and create new one from template
do_svn move "NEWS" "NEWS-${RELEASE_VERSION}"
local A=${PACKAGE_TAG}
local B=${A/https/http}
local PACKAGE_BUILD=${B/${USER}@/}
local A=${PACKAGE_TAG}
local B=${A/https/http}
local PACKAGE_BUILD=${B/${USER}@/}
- do_svn switch "${PACKAGE_BUILD}"
+ do_svn_switch "${PACKAGE_BUILD}"
+ do_svn_switch "${SVN_URL}"
}
do_release_step_1() { do_release_step_prep; }
}
do_release_step_1() { do_release_step_prep; }