[Openocd-svn] r2516 - trunk/tools

[<zw...@ma...>]

Author: zwelch
Date: 2009-07-14 10:52:28 +0200 (Tue, 14 Jul 2009)
New Revision: 2516

Modified:
   trunk/tools/release.sh
Log:
Improve the release script before 0.2.0:
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.


Modified: trunk/tools/release.sh
===================================================================
--- trunk/tools/release.sh	2009-07-14 07:35:29 UTC (rev 2515)
+++ trunk/tools/release.sh	2009-07-14 08:52:28 UTC (rev 2516)
@@ -74,6 +74,10 @@
 	do_svn_echo "$@"
 	[ "${RELEASE_DRY_RUN}" ] || svn "$@"
 }
+do_svn_switch() {
+	do_svn switch "$1"
+	package_info_load
+}
 
 
 package_info_load_name() {
@@ -432,11 +436,9 @@
 	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_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
@@ -444,6 +446,8 @@
 	# 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}"
 
@@ -479,9 +483,10 @@
 	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_svn_switch "${SVN_URL}"
 }
 
 do_release_step_1() { do_release_step_prep; }