[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] ver_extract 00b07598d: * builds/toplevel.mk: Simplify versio
From: |
Werner Lemberg |
Subject: |
[freetype2] ver_extract 00b07598d: * builds/toplevel.mk: Simplify version extraction. |
Date: |
Thu, 24 Aug 2023 08:14:12 -0400 (EDT) |
branch: ver_extract
commit 00b07598d96f7c6c96d2d32dbbb9cd11b3adeacd
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>
* builds/toplevel.mk: Simplify version extraction.
---
builds/toplevel.mk | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 7530be753..8d5063ebb 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -198,29 +198,22 @@ modules:
include $(TOP_DIR)/builds/modules.mk
-# get FreeType version string, using a
-# poor man's `sed' emulation with make's built-in string functions
+# get FreeType version string using built-in string functions
#
hash := \#
work := $(strip $(shell $(CAT) \
$(subst /,$(SEP),$(TOP_DIR)/include/freetype/freetype.h)))
-work := $(subst |,x,$(work))
-work := $(subst $(space),|,$(work))
-work := $(subst $(hash)define|FREETYPE_MAJOR|,$(space),$(work))
-work := $(word 2,$(work))
-major := $(subst |,$(space),$(work))
-major := $(firstword $(major))
-
-work := $(subst $(hash)define|FREETYPE_MINOR|,$(space),$(work))
-work := $(word 2,$(work))
-minor := $(subst |,$(space),$(work))
-minor := $(firstword $(minor))
-
-work := $(subst $(hash)define|FREETYPE_PATCH|,$(space),$(work))
-work := $(word 2,$(work))
-patch := $(subst |,$(space),$(work))
-patch := $(firstword $(patch))
+
+work := $(subst $(hash)define$(space)FREETYPE_MAJOR$(space),MAjOR=,$(work))
+work := $(subst $(hash)define$(space)FREETYPE_MINOR$(space),MInOR=,$(work))
+work := $(subst $(hash)define$(space)FREETYPE_PATCH$(space),PAtCH=,$(work))
+
+major := $(subst MAjOR=,,$(filter MAjOR=%,$(work)))
+minor := $(subst MInOR=,,$(filter MInOR=%,$(work)))
+patch := $(subst PAtCH=,,$(filter PAtCH=%,$(work)))
+
+work :=
# ifneq ($(findstring x0x,x$(patch)x),)
# version := $(major).$(minor)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] ver_extract 00b07598d: * builds/toplevel.mk: Simplify version extraction.,
Werner Lemberg <=