diff options
| author | David M. Syzdek <david@syzdek.net> | 2021-05-06 15:55:33 -0800 |
|---|---|---|
| committer | David M. Syzdek <david@syzdek.net> | 2021-05-06 15:55:33 -0800 |
| commit | 14dfcb48cc5698876919b233c193cc99dd14c8c9 (patch) | |
| tree | e5450df400390a2d38cb42b801ebb9f8dcba82b3 | |
| parent | ad1e7349351f96e9c71328e3db21e5197c56d139 (diff) | |
| download | bindletools-14dfcb48cc5698876919b233c193cc99dd14c8c9.tar.gz bindletools-14dfcb48cc5698876919b233c193cc99dd14c8c9.tar.bz2 bindletools-14dfcb48cc5698876919b233c193cc99dd14c8c9.tar.xz bindletools-14dfcb48cc5698876919b233c193cc99dd14c8c9.zip | |
bindle-git.m4: renaming GPV to GIT_PACKAGE_VERSION
| -rw-r--r-- | m4/bindle-git.m4 | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/m4/bindle-git.m4 b/m4/bindle-git.m4 index 0567b69..7aba3d0 100644 --- a/m4/bindle-git.m4 +++ b/m4/bindle-git.m4 | |||
| @@ -41,7 +41,7 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 41 | # sets vars to known states | 41 | # sets vars to known states |
| 42 | GIT_VERSION_SCRIPT="" # Git package version script. | 42 | GIT_VERSION_SCRIPT="" # Git package version script. |
| 43 | GIT_PACKAGE_VERSION_BUILD="" # Git package version build (x.x.x.gbbbbb). | 43 | GIT_PACKAGE_VERSION_BUILD="" # Git package version build (x.x.x.gbbbbb). |
| 44 | GPV="" # Git package version (x.x.x). | 44 | GIT_PACKAGE_VERSION="" # Git package version (x.x.x). |
| 45 | GIT_PACKAGE_BUILD="" # Git package build (gbbbbb). | 45 | GIT_PACKAGE_BUILD="" # Git package build (gbbbbb). |
| 46 | GIT_CACHED_STRING="" # Cached git package version string. | 46 | GIT_CACHED_STRING="" # Cached git package version string. |
| 47 | GIT_CACHE_FILE="" # Cached git file. | 47 | GIT_CACHE_FILE="" # Cached git file. |
| @@ -115,22 +115,22 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 115 | else | 115 | else |
| 116 | # | 116 | # |
| 117 | # split version string into components | 117 | # split version string into components |
| 118 | GPV=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/\.g[[:xdigit:]]\{1,\}$//g')] | 118 | GIT_PACKAGE_VERSION=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/\.g[[:xdigit:]]\{1,\}$//g')] |
| 119 | GIT_PACKAGE_BUILD=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/.*\.\(g[[:xdigit:]]\{1,\}\)$/\1/g')] | 119 | GIT_PACKAGE_BUILD=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/.*\.\(g[[:xdigit:]]\{1,\}\)$/\1/g')] |
| 120 | GIT_TARBALL_VERSION=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/\.0.g[[:xdigit:]]\{1,\}$/.0/g')] | 120 | GIT_TARBALL_VERSION=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/\.0.g[[:xdigit:]]\{1,\}$/.0/g')] |
| 121 | GIT_PACKAGE_MAJOR=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f1)] | 121 | GIT_PACKAGE_MAJOR=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f1)] |
| 122 | GIT_PACKAGE_MINOR=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f2)] | 122 | GIT_PACKAGE_MINOR=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f2)] |
| 123 | GIT_PACKAGE_PATCH=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f3)] | 123 | GIT_PACKAGE_PATCH=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f3)] |
| 124 | AC_MSG_NOTICE([using git package version ${GPV} (${GIT_PACKAGE_BUILD})]) | 124 | AC_MSG_NOTICE([using git package version ${GIT_PACKAGE_VERSION} (${GIT_PACKAGE_BUILD})]) |
| 125 | # | 125 | # |
| 126 | # generate numeric version | 126 | # generate numeric version |
| 127 | GIT_PACKAGE_VERSION_NUMBER=[$(echo ${GPV} |cut -d. -f1)]; | 127 | GIT_PACKAGE_VERSION_NUMBER=[$(echo ${GIT_PACKAGE_VERSION} |cut -d. -f1)]; |
| 128 | NUM=[$(echo ${GPV} |cut -d. -f2)]; | 128 | NUM=[$(echo ${GIT_PACKAGE_VERSION} |cut -d. -f2)]; |
| 129 | if test "x${NUM}" == "x";then | 129 | if test "x${NUM}" == "x";then |
| 130 | NUM=0; | 130 | NUM=0; |
| 131 | fi | 131 | fi |
| 132 | GIT_PACKAGE_VERSION_NUMBER=[$(printf "${GIT_PACKAGE_VERSION_NUMBER}.%02i" ${NUM})] | 132 | GIT_PACKAGE_VERSION_NUMBER=[$(printf "${GIT_PACKAGE_VERSION_NUMBER}.%02i" ${NUM})] |
| 133 | NUM=[$(echo ${GPV} |cut -d. -f3)] | 133 | NUM=[$(echo ${GIT_PACKAGE_VERSION} |cut -d. -f3)] |
| 134 | if test "x${NUM}" == "x";then | 134 | if test "x${NUM}" == "x";then |
| 135 | NUM=0; | 135 | NUM=0; |
| 136 | fi | 136 | fi |
| @@ -138,7 +138,7 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 138 | AC_MSG_NOTICE([using git numeric version ${GIT_PACKAGE_VERSION_NUMBER}]) | 138 | AC_MSG_NOTICE([using git numeric version ${GIT_PACKAGE_VERSION_NUMBER}]) |
| 139 | # | 139 | # |
| 140 | # set internal variables | 140 | # set internal variables |
| 141 | GIT_PACKAGE_VERSION=${GPV} | 141 | GIT_PACKAGE_VERSION=${GIT_PACKAGE_VERSION} |
| 142 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} | 142 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} |
| 143 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} | 143 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} |
| 144 | VERSION=${GIT_TARBALL_VERSION} | 144 | VERSION=${GIT_TARBALL_VERSION} |
| @@ -171,7 +171,6 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 171 | fi | 171 | fi |
| 172 | 172 | ||
| 173 | # clears vars | 173 | # clears vars |
| 174 | unset GPV | ||
| 175 | unset GIT_CACHED_STRING | 174 | unset GIT_CACHED_STRING |
| 176 | unset GPN | 175 | unset GPN |
| 177 | ])dnl | 176 | ])dnl |
