diff options
| author | dbrownell <dbrownell@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-10-07 05:43:05 +0000 |
|---|---|---|
| committer | dbrownell <dbrownell@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-10-07 05:43:05 +0000 |
| commit | b1f7b35983eade493bfadd9e5abee4ae3dab630d (patch) | |
| tree | 7008d18454bf83d29fa41208d0f898c7b2edd3b6 /tools | |
| parent | 0da2f750a1d437b50b21ac7ee766188a47b37fad (diff) | |
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 'tools')
| -rwxr-xr-x | tools/release.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/release.sh b/tools/release.sh index 106799ce..f1ed4a73 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -97,7 +97,7 @@ package_info_load() { PACKAGE_VERSION="$(package_info_load_version)" [ "${RELEASE_VERSION}" ] || \ - RELEASE_VERSION=${PACKAGE_VERSION/-in-development/} + RELEASE_VERSION=${PACKAGE_VERSION/-dev/} [ "${PACKAGE_NAME}" -a "${PACKAGE_VERSION}" ] || \ die "package information is missing from configure script" @@ -427,7 +427,7 @@ do_commit() { package_info_load svn_setup_load - [ "${PACKAGE_VERSION/in-development/}" = "${PACKAGE_VERSION}" ] || \ + [ "${PACKAGE_VERSION/dev/}" = "${PACKAGE_VERSION}" ] || \ die "'${PACKAGE_NAME}-${PACKAGE_VERSION}' cannot be released" [ "${PACKAGE_VERSION%.0}" = "${PACKAGE_VERSION}" ] || \ @@ -437,7 +437,7 @@ do_commit() { do_release_step_prep() { - do_version tag remove in-development + do_version tag remove dev # reset RELEASE_VERSION now to allow release version to be detected export RELEASE_VERSION= } @@ -447,7 +447,7 @@ do_release_step_branch_bump() { local TYPE="$1" echo "Bump ${TYPE} version and add tag:" do_version_bump ${TYPE} - do_version_tag_add in-development + do_version_tag_add dev } do_release_step_branch() { do_svn_switch "${PACKAGE_BRANCH}" |