From: David B. <dbr...@us...> - 2009-11-05 02:55:08
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via ecd9c0d8bf27f2a8d626ce535a2e7ee48a61bd28 (commit) via 6455ae4a59079020dc4e0b9ad0bf1a29f69d6cfa (commit) from efa7f8b4bb2cab3f71a5f943c625576505b369f0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ecd9c0d8bf27f2a8d626ce535a2e7ee48a61bd28 Author: David Brownell <dbr...@us...> Date: Wed Nov 4 17:49:06 2009 -0800 Release docs: fix notes We currently do something unusual: version codes in config.in get updated after the release, which means that "git describe" won't match up to development version labels. Comment that trouble spot. We can fix this by switching away from the major/minor/micro type release numbering, as various other projects have done. The major numbers basically don't tend to change, and doing a good job with micro versions is so annoying that they rarely change either. diff --git a/doc/manual/release.txt b/doc/manual/release.txt index fa075ee..737cf13 100644 --- a/doc/manual/release.txt +++ b/doc/manual/release.txt @@ -156,7 +156,8 @@ can be useful when tracking down bugs. (Note that at this writing, the tags do not directly correspond to <code>git describe</code> output. The hash ID can be used with <code>git show</code>, but -the preceding segments can't.) +the relevant repository tag isn't <em>0.3.0-rc1-dev</em>; +this might change in the future.) @section releasewho Release Manager @@ -293,17 +294,21 @@ The following steps should be followed to produce each release: - If producing the next RC in a series, bump the rc number -# Commit that version change. -# Create a git tag for the final commit, with a tag name matching - the version string in <code>configure.in</code>: + the version string in <code>configure.in</code> (including <em>-rcN</em> + where relevant): @verbatim PACKAGE_VERSION="x.y.z" PACKAGE_TAG="v${PACKAGE_VERSION}" git tag -m "The openocd-${PACKAGE_VERSION} release." "${PACKAGE_TAG}" @endverbatim --# Prepare to resume normal development on mainline: - - Restore @c -dev version tag. - - To start a new major (or minor) release cycle on the @c master branch: - - Archive @c NEWS file as "<code>doc/news/NEWS-${PACKAGE_VERSION}</code>". - - Create a new @c NEWS file for the next release +-# Prepare to resume normal development on mainline (major or minor release) + - Update the version label + - Restore @c -dev version tag. + - For a new minor release cycle, increment the release's minor number + - For a new major release cycle, increment the release's major number + and zero its minor number + - Archive @c NEWS file as "<code>doc/news/NEWS-${PACKAGE_VERSION}</code>". + - Create a new @c NEWS file for the next release - Commit those changes, and push the commit and the release tag to mainline. -# Produce the package source archives: commit 6455ae4a59079020dc4e0b9ad0bf1a29f69d6cfa Author: David Brownell <dbr...@us...> Date: Wed Nov 4 17:12:53 2009 -0800 Doc: fix broken link Signed-off-by: David Brownell <dbr...@us...> diff --git a/doc/manual/release.txt b/doc/manual/release.txt index d05ac74..fa075ee 100644 --- a/doc/manual/release.txt +++ b/doc/manual/release.txt @@ -10,7 +10,7 @@ This page provides an introduction to the OpenOCD Release Processes: activities for each release cycle. - @ref releasehow - Outlines all of the steps for the processes used to produce and release the package source archives. -- @ref releasescript - Introduces the automated @c release.sh script. +- @ref releasescriptcmds - Introduces the automated @c release.sh script. @section releasewhy Why Produce Releases? ----------------------------------------------------------------------- Summary of changes: doc/manual/release.txt | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) hooks/post-receive -- Main OpenOCD repository |