From efd023ad327c51bafa5c7df6d6f35796babce4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 13 Jun 2021 09:46:22 +0200 Subject: [PATCH] =?UTF-8?q?generate-version:=20add=20a=20define=20for=20?= =?UTF-8?q?=E2=80=9Cextra=E2=80=9D=20version=20information?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will be set to “rrr-gNNNNNNN” when building from git, and the empty string otherwise. --- generate-version.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/generate-version.sh b/generate-version.sh index cfb85059..b539ce42 100755 --- a/generate-version.sh +++ b/generate-version.sh @@ -22,14 +22,16 @@ else new_version="${default_version}" fi -major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1/') -minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\2/') -patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/') +major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\1/') +minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\2/') +patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\3/') +extra=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\5/') new_version="#define FOOT_VERSION \"${new_version}\" #define FOOT_MAJOR ${major} #define FOOT_MINOR ${minor} -#define FOOT_PATCH ${patch}" +#define FOOT_PATCH ${patch} +#define FOOT_EXTRA \"${extra}\"" if [ -f "${out_file}" ]; then old_version=$(cat "${out_file}")