diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | TODO | 4 | ||||
| -rwxr-xr-x | build-helpers/package-version | 3 |
4 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 191238c..619414f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,7 +75,7 @@ tag: @echo "Do you really want to tag this as release 'v$(TAG)'? Enter to continue, Ctrl-C to abort." @read msgfile="$$PWD/TAG-MESSAGE"; \ - cd "$(top_srcdir)" && $(GIT) tag -s -F "$$msgfile" "v$(TAG)"; \ + cd "$(top_srcdir)" && $(GIT) tag -s -F "$$msgfile" "$(PACKAGE_TARNAME)-$(TAG)"; \ rm -f "$$msgfile" endif @@ -1,4 +1,6 @@ -nbb 0.1.x +nbb 0.2 + * Switch to release tags including the package name + * Make automake's "nbb make" depend on configure etc. nbb 0.1 * Initial public standalone version of nbb. @@ -16,6 +16,10 @@ nbb-0.2 * Make sure the "if cmp ... mv .. rm" in make rules are correct and useful, and the cmp is silent. * Make automake's "nbb make" depend on configure etc. + * Switch to release tags including the package name + + +nbb-0.3 - License review. Every source file needs a license. Trace back origin of all code. - Useful logging infrastructure, and --debug etc user interface. diff --git a/build-helpers/package-version b/build-helpers/package-version index 61a3018..f81bcd4 100755 --- a/build-helpers/package-version +++ b/build-helpers/package-version @@ -21,7 +21,8 @@ if test -f "$top_srcdir/$version_stamp"; then # dist source tree cat "$top_srcdir/$version_stamp" | ${TR-tr} -d '\012' elif test -d "$GIT_DIR"; then # git source tree git_describe=`${GIT-git} describe 2>/dev/null || echo devel` - echo "$git_describe" | ${SED-sed} 's/^v//;s/-/./;s/-g/-/' | ${TR-tr} -d '\012' + # change tags like "foo-conf-1.2" to "1.2" + echo "$git_describe" | ${SED-sed} 's/^\([A-Za-z0-9_-]\{1,\}\)-\([0-9]\)/\2/;s/-/./;s/-g/-/' | ${TR-tr} -d '\012' else # ??? echo "devel" | ${TR-tr} -d '\012' fi |