summaryrefslogtreecommitdiff
path: root/doc/manual
diff options
context:
space:
mode:
authordbrownell <dbrownell@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-10-07 05:43:05 +0000
committerdbrownell <dbrownell@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-10-07 05:43:05 +0000
commitb1f7b35983eade493bfadd9e5abee4ae3dab630d (patch)
tree7008d18454bf83d29fa41208d0f898c7b2edd3b6 /doc/manual
parent0da2f750a1d437b50b21ac7ee766188a47b37fad (diff)
downloadopenocd_libswd-b1f7b35983eade493bfadd9e5abee4ae3dab630d.tar.gz
openocd_libswd-b1f7b35983eade493bfadd9e5abee4ae3dab630d.tar.bz2
openocd_libswd-b1f7b35983eade493bfadd9e5abee4ae3dab630d.tar.xz
openocd_libswd-b1f7b35983eade493bfadd9e5abee4ae3dab630d.zip
Change version labels to work better with GIT
- The guess-rev.sh script is now a tweaked version of "setlocalversion" as seen in Linux, U-Boot, and various other projects. When it finds source control support (git, hg, svn) it uses IDs from there. Else (specific to this project) it reports itself as "-snapshot", e.g. from gitweb. I verified this new "guess-rev.sh" script runs under Cygwin. - Also update the generic version strings to be like "0.3.0-dev" (during development) instead of the very long "0.3.0-in-development". These also show up in the PDF docs. For better tracking, we might eventually change these strings to include the version IDs too. - Change the startup banner version strings so they include the guess-rev output. Development and release versions with GIT will be like Open On-Chip Debugger 0.3.0-dev-00282-g7191a4f-dirty (2009-10-05-20:57) Open On-Chip Debugger 0.3.0 (2009-10-05-20:57) instead of the previous SVN-specific (even when using git-svn!) Open On-Chip Debugger 0.3.0-in-development (2009-10-05-01:39) svn:exported Open On-Chip Debugger 0.3.0 (2009-10-05-01:39) Release git-svn-id: svn://svn.berlios.de/openocd/trunk@2809 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/release.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual/release.txt b/doc/manual/release.txt
index c4779660..2ba652de 100644
--- a/doc/manual/release.txt
+++ b/doc/manual/release.txt
@@ -62,9 +62,9 @@ the minor version will @a also be zero (<code>y = 0, z = 0</code>).
@subsection releaseversiontags Version Tags
After these required numeric components, the version string may contain
-one or more <i>version tags</i>, such as '-rc1' or '-in-development'.
+one or more <i>version tags</i>, such as '-rc1' or '-dev'.
-The trunk and all branches should have the tag '-in-development' in
+The trunk and all branches should have the tag '-dev' in
their version number. This tag helps developers identify reports
created from the Subversion repository, and it can be detected and
manipulated by the release script. Specifically, this tag will be
@@ -218,7 +218,7 @@ The following steps should be followed to produce each release:
- This material should be produced during the development cycle.
- Add a new item for each @c NEWS-worthy contribution, when committed.
-# bump library version if our API changed (not yet required)
- -# Remove -in-development tag from package version:
+ -# Remove -dev tag from package version in configure.in:
- For major/minor releases, remove version tag from trunk, @a or
- For bug-fix releases, remove version tag from release branch.
-# Branch or tag the required tree in the Subversion repository: