aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-13 07:46:22 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-13 15:19:35 +0000
commitefd023ad327c51bafa5c7df6d6f35796babce4f8 (patch)
treeee3c4a8b024df1759c039094c8f625399eb133b4
parentReplace tab indents with spaces in config.h (diff)
generate-version: add a define for “extra” version information
This will be set to “rrr-gNNNNNNN” when building from git, and the empty string otherwise.
-rwxr-xr-xgenerate-version.sh10
1 files 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}")