projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve the release script before 0.2.0:
[fw/openocd]
/
tools
/
release.sh
diff --git
a/tools/release.sh
b/tools/release.sh
index 583cd20c075828c628f0ef7cc09ee31390121460..21f9f04a87ca91382e34876e3aacf33b84a3c50a 100755
(executable)
--- a/
tools/release.sh
+++ b/
tools/release.sh
@@
-74,6
+74,10
@@
do_svn() {
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() {
@@
-432,11
+436,9
@@
do_release_step_branch_bump() {
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
@@
-444,6
+446,8
@@
do_release_step_bump() {
# 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}"
@@
-479,9
+483,10
@@
do_release_step_package() {
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_stage
do_clean
do_stage
do_clean
+ do_svn_switch "${SVN_URL}"
}
do_release_step_1() { do_release_step_prep; }
}
do_release_step_1() { do_release_step_prep; }