diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-06 10:45:25 +0100 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-06 14:50:48 +0100 |
commit | 70fbff01c7ce191452964e7e5123e61e3f88f466 (patch) | |
tree | b81f3b02a2a1634d19e4d2a70b191527e80877cc | |
parent | 57764340d6d1168796e04b9f6098bc0451661139 (diff) | |
download | ptxdist-70fbff01c7ce191452964e7e5123e61e3f88f466.tar.gz ptxdist-70fbff01c7ce191452964e7e5123e61e3f88f466.tar.xz |
[ptxdist] let variables of PTXDIST_VERSION_* reflect timed releases
The upcomming releases of ptxdist will follow a time based scheme:
ptxdist-xxxx.yy.z
^^^^ ^^ ^----------- Bugfix Number, starting at 0
\ \------------- Month
\---------------- Year
This patch removed the old PTXDIST_VERSION_* variables:
- PTXDIST_VERSION_MAJOR
- PTXDIST_VERSION_MINOR
- PTXDIST_VERSION_MICRO
- PTXDIST_VERSION_EXTRA
and replaces them according to the new scheme with:
- PTXDIST_VERSION_YEAR
- PTXDIST_VERSION_MONTH
- PTXDIST_VERSION_BUGFIX
(For the first release the VERSION_EXTRA will be dropped and may be
added later again)
There is one new variable:
- PTXDIST_VERSION_SCM
holding version information from the version control system
(SCM = Source code Control Management). It's the appendix known from the
linux kernel like '-gb91d1ff-dirty'.
The variable:
- PTXDIST_VERSION_FULL
consists of '$year.$month.$bugfix$scm'. For example:
'2010.01.0-gb91d1ff-dirty'
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rwxr-xr-x | bin/ptxdist | 8 | ||||
-rw-r--r-- | configure.ac | 37 | ||||
-rw-r--r-- | scripts/ptxdist_version.sh.in | 14 |
3 files changed, 25 insertions, 34 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 9dea52d3e..2ab8bab75 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2374,10 +2374,12 @@ setup_export() { PTXDIST_COLLECTIONCONFIG \ PTXDIST_BOARDSETUP \ \ + PTXDIST_VERSION_YEAR \ + PTXDIST_VERSION_MONTH \ + PTXDIST_VERSION_BUGFIX \ + \ + PTXDIST_VERSION_SCM \ PTXDIST_VERSION_FULL \ - PTXDIST_VERSION_MAJOR \ - PTXDIST_VERSION_MINOR \ - PTXDIST_VERSION_MICRO \ \ PTXDIST_WORKSPACE \ \ diff --git a/configure.ac b/configure.ac index dc3f50ce9..a42810249 100644 --- a/configure.ac +++ b/configure.ac @@ -406,31 +406,18 @@ AC_SUBST(BASH_COMPLETION_DIR) dnl dnl versions dnl -VERSION_MAJOR=` echo "$PACKAGE_VERSION" | \ - sed -e "s/-/./g" | \ - (IFS=. read VERSION_MAJOR VERSION_MINOR VERSION_MICRO VERSION_EXTRA; echo $VERSION_MAJOR)` -VERSION_MINOR=` echo "$PACKAGE_VERSION" | \ - sed -e "s/-/./g" | \ - (IFS=. read VERSION_MAJOR VERSION_MINOR VERSION_MICRO VERSION_EXTRA; echo $VERSION_MINOR)` -VERSION_MICRO=` echo "$PACKAGE_VERSION" | \ - sed -e "s/-/./g" | \ - (IFS=. read VERSION_MAJOR VERSION_MINOR VERSION_MICRO VERSION_EXTRA; echo $VERSION_MICRO)` -VERSION_EXTRA=` echo "$PACKAGE_VERSION" | \ - sed -e "s/-/./g" | \ - (IFS=. read VERSION_MAJOR VERSION_MINOR VERSION_MICRO VERSION_EXTRA; echo $VERSION_EXTRA)` - -if test -n "$VERSION_EXTRA"; then - VERSION_EXTRA_SEP="-" -else - VERSION_EXTRA_SEP="" -fi - -AC_SUBST(PACKAGE_VERSION) -AC_SUBST(VERSION_MAJOR) -AC_SUBST(VERSION_MINOR) -AC_SUBST(VERSION_MICRO) -AC_SUBST(VERSION_EXTRA_SEP) -AC_SUBST(VERSION_EXTRA) +orig_ifs="${IFS}" +IFS=. +set -- ${PACKAGE_VERSION} +IFS="${orig_ifs}" + +PTXDIST_VERSION_YEAR="${1}" +PTXDIST_VERSION_MONTH="${2}" +PTXDIST_VERSION_BUGFIX="${3}" + +AC_SUBST(PTXDIST_VERSION_YEAR) +AC_SUBST(PTXDIST_VERSION_MONTH) +AC_SUBST(PTXDIST_VERSION_BUGFIX) AC_MSG_RESULT([]) AC_CONFIG_FILES( \ diff --git a/scripts/ptxdist_version.sh.in b/scripts/ptxdist_version.sh.in index dea466fbb..eb5ca80b9 100644 --- a/scripts/ptxdist_version.sh.in +++ b/scripts/ptxdist_version.sh.in @@ -1,9 +1,11 @@ # -*-sh-*- + # -# Version Definitions for PTXdist +# Version Definitions for ptxdist # -PTXDIST_VERSION_FULL=@PACKAGE_VERSION@ -PTXDIST_VERSION_MAJOR=@VERSION_MAJOR@ -PTXDIST_VERSION_MINOR=@VERSION_MINOR@ -PTXDIST_VERSION_MICRO=@VERSION_MICRO@ -PTXDIST_VERSION_EXTRA=@VERSION_EXTRA_SEP@@VERSION_EXTRA@ +PTXDIST_VERSION_YEAR="@PTXDIST_VERSION_YEAR@" +PTXDIST_VERSION_MONTH="@PTXDIST_VERSION_MONTH@" +PTXDIST_VERSION_BUGFIX="@PTXDIST_VERSION_BUGFIX@" + +PTXDIST_VERSION_SCM="$("${PTXDIST_TOPDIR:=.}/scripts/kernel/setlocalversion" "${PTXDIST_TOPDIR}")" +PTXDIST_VERSION_FULL="${PTXDIST_VERSION_YEAR}.${PTXDIST_VERSION_MONTH}.${PTXDIST_VERSION_BUGFIX}${PTXDIST_VERSION_SCM}" |