diff options
| author | David M. Syzdek <david@syzdek.net> | 2021-05-06 16:02:36 -0800 |
|---|---|---|
| committer | David M. Syzdek <david@syzdek.net> | 2021-05-06 16:02:36 -0800 |
| commit | 758d174644b7235f98c7e3956b6abea79bf66aa4 (patch) | |
| tree | 7980cb287efdb941f2e7f8c7d7f64888a217fd13 /m4 | |
| parent | 74b44084f84e8dc2f957c9248af57ee23102123e (diff) | |
| download | bindletools-758d174644b7235f98c7e3956b6abea79bf66aa4.tar.gz bindletools-758d174644b7235f98c7e3956b6abea79bf66aa4.tar.bz2 bindletools-758d174644b7235f98c7e3956b6abea79bf66aa4.tar.xz bindletools-758d174644b7235f98c7e3956b6abea79bf66aa4.zip | |
bindle-git.m4: adjusting white space
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/bindle-git.m4 | 59 |
1 files changed, 35 insertions, 24 deletions
diff --git a/m4/bindle-git.m4 b/m4/bindle-git.m4 index 9a0f1e7..e054ae8 100644 --- a/m4/bindle-git.m4 +++ b/m4/bindle-git.m4 | |||
| @@ -39,15 +39,16 @@ | |||
| 39 | AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | 39 | AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl |
| 40 | 40 | ||
| 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 | GIT_PACKAGE_VERSION="" # 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. |
| 48 | GIT_TARBALL_VERSION="" # Git Tarball Version (x.x.0 or x.x.x.gbbbbb). | 48 | GIT_TARBALL_VERSION="" # Git Tarball Version (x.x.0 or x.x.x.gbbbbb). |
| 49 | GIT_PACKAGE_NAME="" # git package name. | 49 | GIT_PACKAGE_NAME="" # git package name. |
| 50 | GIT_OUTPUT_DIR="" # git out directory | 50 | GIT_OUTPUT_DIR="" # git out directory |
| 51 | |||
| 51 | 52 | ||
| 52 | # git package version script location | 53 | # git package version script location |
| 53 | if test "x$1" != "x";then | 54 | if test "x$1" != "x";then |
| @@ -61,6 +62,7 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 61 | GIT_VERSION_SCRIPT=${ac_aux_dir}/git-package-version.sh | 62 | GIT_VERSION_SCRIPT=${ac_aux_dir}/git-package-version.sh |
| 62 | fi | 63 | fi |
| 63 | 64 | ||
| 65 | |||
| 64 | # git output directory | 66 | # git output directory |
| 65 | if test "x$2" != "x";then | 67 | if test "x$2" != "x";then |
| 66 | if test -d "${2}";then | 68 | if test -d "${2}";then |
| @@ -70,16 +72,19 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 70 | fi | 72 | fi |
| 71 | fi | 73 | fi |
| 72 | 74 | ||
| 75 | |||
| 73 | # sets bindletools directory | 76 | # sets bindletools directory |
| 74 | BINDLEDIR=`dirname ${GIT_VERSION_SCRIPT}` | 77 | BINDLEDIR=`dirname ${GIT_VERSION_SCRIPT}` |
| 75 | BINDLEDIR=`dirname ${BINDLEDIR}` | 78 | BINDLEDIR=`dirname ${BINDLEDIR}` |
| 76 | AC_REQUIRE([AC_BINDLE]) | 79 | AC_REQUIRE([AC_BINDLE]) |
| 77 | 80 | ||
| 81 | |||
| 78 | # attempt to use script to determine version | 82 | # attempt to use script to determine version |
| 79 | if test "x${GIT_VERSION_SCRIPT}" != "x";then | 83 | if test "x${GIT_VERSION_SCRIPT}" != "x";then |
| 80 | GIT_PACKAGE_VERSION_BUILD=$(${GIT_VERSION_SCRIPT} "${srcdir}" "${GIT_OUTPUT_DIR}" 2> /dev/null) | 84 | GIT_PACKAGE_VERSION_BUILD=$(${GIT_VERSION_SCRIPT} "${srcdir}" "${GIT_OUTPUT_DIR}" 2> /dev/null) |
| 81 | fi | 85 | fi |
| 82 | 86 | ||
| 87 | |||
| 83 | # attempt to fall back to cache files | 88 | # attempt to fall back to cache files |
| 84 | if test "x${GIT_PACKAGE_VERSION_BUILD}" == "x";then | 89 | if test "x${GIT_PACKAGE_VERSION_BUILD}" == "x";then |
| 85 | # determines location of cache file | 90 | # determines location of cache file |
| @@ -109,11 +114,12 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 109 | fi | 114 | fi |
| 110 | fi | 115 | fi |
| 111 | 116 | ||
| 117 | |||
| 112 | # Saves data for use in build scripts | 118 | # Saves data for use in build scripts |
| 113 | if test "x${GIT_PACKAGE_VERSION_BUILD}" = "x";then | 119 | if test "x${GIT_PACKAGE_VERSION_BUILD}" = "x";then |
| 114 | AC_MSG_WARN([unable to determine package version from Git tags]) | 120 | AC_MSG_WARN([unable to determine package version from Git tags]) |
| 115 | else | 121 | else |
| 116 | # | 122 | |
| 117 | # split version string into components | 123 | # split version string into components |
| 118 | GIT_PACKAGE_VERSION=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/\.g[[:xdigit:]]\{1,\}$//g')] | 124 | 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')] | 125 | GIT_PACKAGE_BUILD=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |sed -e 's/.*\.\(g[[:xdigit:]]\{1,\}\)$/\1/g')] |
| @@ -122,7 +128,8 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 122 | GIT_PACKAGE_MINOR=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f2)] | 128 | GIT_PACKAGE_MINOR=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f2)] |
| 123 | GIT_PACKAGE_PATCH=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f3)] | 129 | GIT_PACKAGE_PATCH=[$(echo ${GIT_PACKAGE_VERSION_BUILD} |cut -d. -f3)] |
| 124 | AC_MSG_NOTICE([using git package version ${GIT_PACKAGE_VERSION} (${GIT_PACKAGE_BUILD})]) | 130 | AC_MSG_NOTICE([using git package version ${GIT_PACKAGE_VERSION} (${GIT_PACKAGE_BUILD})]) |
| 125 | # | 131 | |
| 132 | |||
| 126 | # generate numeric version | 133 | # generate numeric version |
| 127 | GIT_PACKAGE_VERSION_NUMBER=[$(echo ${GIT_PACKAGE_VERSION} |cut -d. -f1)]; | 134 | GIT_PACKAGE_VERSION_NUMBER=[$(echo ${GIT_PACKAGE_VERSION} |cut -d. -f1)]; |
| 128 | NUM=[$(echo ${GIT_PACKAGE_VERSION} |cut -d. -f2)]; | 135 | NUM=[$(echo ${GIT_PACKAGE_VERSION} |cut -d. -f2)]; |
| @@ -136,27 +143,30 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 136 | fi | 143 | fi |
| 137 | GIT_PACKAGE_VERSION_NUMBER=[$(printf "${GIT_PACKAGE_VERSION_NUMBER}%04i" ${NUM})] | 144 | GIT_PACKAGE_VERSION_NUMBER=[$(printf "${GIT_PACKAGE_VERSION_NUMBER}%04i" ${NUM})] |
| 138 | AC_MSG_NOTICE([using git numeric version ${GIT_PACKAGE_VERSION_NUMBER}]) | 145 | AC_MSG_NOTICE([using git numeric version ${GIT_PACKAGE_VERSION_NUMBER}]) |
| 139 | # | 146 | |
| 147 | |||
| 140 | # set internal variables | 148 | # set internal variables |
| 141 | GIT_PACKAGE_VERSION=${GIT_PACKAGE_VERSION} | 149 | GIT_PACKAGE_VERSION=${GIT_PACKAGE_VERSION} |
| 142 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} | 150 | PACKAGE_VERSION=${GIT_TARBALL_VERSION} |
| 143 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} | 151 | PACKAGE_NUMERIC_VERSION=${GIT_PACKAGE_VERSION_NUMBER} |
| 144 | VERSION=${GIT_TARBALL_VERSION} | 152 | VERSION=${GIT_TARBALL_VERSION} |
| 145 | CONFIG_STATUS_DEPENDENCIES="${GIT_CACHE_FILE} ${CONFIG_STATUS_DEPENDENCIES}" | 153 | CONFIG_STATUS_DEPENDENCIES="${GIT_CACHE_FILE} ${CONFIG_STATUS_DEPENDENCIES}" |
| 146 | # | 154 | |
| 155 | |||
| 147 | # set substitution variables | 156 | # set substitution variables |
| 148 | AC_SUBST([GIT_VERSION_SCRIPT], [${GIT_VERSION_SCRIPT}]) | 157 | AC_SUBST([GIT_VERSION_SCRIPT], [${GIT_VERSION_SCRIPT}]) |
| 149 | AC_SUBST([GIT_PACKAGE_VERSION], [${GIT_PACKAGE_VERSION}]) | 158 | AC_SUBST([GIT_PACKAGE_VERSION], [${GIT_PACKAGE_VERSION}]) |
| 150 | AC_SUBST([GIT_PACKAGE_MAJOR], [${GIT_PACKAGE_MAJOR}]) | 159 | AC_SUBST([GIT_PACKAGE_MAJOR], [${GIT_PACKAGE_MAJOR}]) |
| 151 | AC_SUBST([GIT_PACKAGE_MINOR], [${GIT_PACKAGE_MINOR}]) | 160 | AC_SUBST([GIT_PACKAGE_MINOR], [${GIT_PACKAGE_MINOR}]) |
| 152 | AC_SUBST([GIT_PACKAGE_PATCH], [${GIT_PACKAGE_PATCH}]) | 161 | AC_SUBST([GIT_PACKAGE_PATCH], [${GIT_PACKAGE_PATCH}]) |
| 153 | AC_SUBST([GIT_PACKAGE_VERSION_BUILD], [${GIT_PACKAGE_VERSION_BUILD}]) | 162 | AC_SUBST([GIT_PACKAGE_VERSION_BUILD], [${GIT_PACKAGE_VERSION_BUILD}]) |
| 154 | AC_SUBST([GIT_PACKAGE_VERSION_NUMBER], [${GIT_PACKAGE_VERSION_NUMBER}]) | 163 | AC_SUBST([GIT_PACKAGE_VERSION_NUMBER], [${GIT_PACKAGE_VERSION_NUMBER}]) |
| 155 | AC_SUBST([GIT_PACKAGE_BUILD], [${GIT_PACKAGE_BUILD}]) | 164 | AC_SUBST([GIT_PACKAGE_BUILD], [${GIT_PACKAGE_BUILD}]) |
| 156 | AC_SUBST([PACKAGE_VERSION], [${PACKAGE_VERSION}]) | 165 | AC_SUBST([PACKAGE_VERSION], [${PACKAGE_VERSION}]) |
| 157 | AC_SUBST([VERSION], [${VERSION}]) | 166 | AC_SUBST([VERSION], [${VERSION}]) |
| 158 | AC_SUBST([CONFIG_STATUS_DEPENDENCIES], [${CONFIG_STATUS_DEPENDENCIES}]) | 167 | AC_SUBST([CONFIG_STATUS_DEPENDENCIES], [${CONFIG_STATUS_DEPENDENCIES}]) |
| 159 | # | 168 | |
| 169 | |||
| 160 | # set C/C++/Objc preprocessor macros | 170 | # set C/C++/Objc preprocessor macros |
| 161 | AC_DEFINE_UNQUOTED([GIT_VERSION_SCRIPT], ["${GIT_VERSION_SCRIPT}"], [script which determines package version and build from git repository]) | 171 | AC_DEFINE_UNQUOTED([GIT_VERSION_SCRIPT], ["${GIT_VERSION_SCRIPT}"], [script which determines package version and build from git repository]) |
| 162 | AC_DEFINE_UNQUOTED([GIT_PACKAGE_VERSION], ["${GIT_PACKAGE_VERSION}"], [package version determined from git repository (x.y.z)]) | 172 | AC_DEFINE_UNQUOTED([GIT_PACKAGE_VERSION], ["${GIT_PACKAGE_VERSION}"], [package version determined from git repository (x.y.z)]) |
| @@ -170,6 +180,7 @@ AC_DEFUN([AC_BINDLE_GIT_PACKAGE_VERSION],[dnl | |||
| 170 | AC_DEFINE_UNQUOTED([VERSION], ["${VERSION}"], [package version and optionally build determined from git repository]) | 180 | AC_DEFINE_UNQUOTED([VERSION], ["${VERSION}"], [package version and optionally build determined from git repository]) |
| 171 | fi | 181 | fi |
| 172 | 182 | ||
| 183 | |||
| 173 | # clears vars | 184 | # clears vars |
| 174 | unset GIT_CACHED_STRING | 185 | unset GIT_CACHED_STRING |
| 175 | unset GIT_PACKAGE_NAME | 186 | unset GIT_PACKAGE_NAME |
