Commit: patch 9.1.1047: Makefiles uses non-portable syntax

7 views
Skip to first unread message

Christian Brabandt

unread,
Jan 22, 2025, 4:30:19 PM1/22/25
to vim...@googlegroups.com
patch 9.1.1047: Makefiles uses non-portable syntax

Commit: https://github.com/vim/vim/commit/613d0bc128a86870ed978f08981becc619f95d58
Author: Christian Brabandt <c...@256bit.org>
Date: Wed Jan 22 22:21:50 2025 +0100

patch 9.1.1047: Makefiles uses non-portable syntax

Problem: Makefiles uses non-portable syntax
(simo-zz, after v9.1.1029)
Solution: Revert auto-generation of MAJOR/MINOR variables

fixes: #16502
closes: #16503

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/Makefile b/Makefile
index 3151c24aa..12aa1f37d 100644
--- a/Makefile
+++ b/Makefile
@@ -96,14 +96,8 @@ syntaxtest:
# To do all this you need the Unix archive and compiled binaries.
# Before creating an archive first delete all backup files, *.orig, etc.

-# I think it is better to place getting the current version number in the
-# configure script. And then automatically fill in the fields in the files
-# listed below. (Restorer)
-
-MAJOR != grep -E 'VIM_VERSION_MAJOR\s{2,}' src/version.h | \
- awk '{ printf "%d",$$3 }'
-MINOR != grep -E 'VIM_VERSION_MINOR\s{2,}' src/version.h | \
- awk '{ printf "%d",$$3 }'
+MAJOR = 9
+MINOR = 1

# CHECKLIST for creating a new version:
#
diff --git a/src/version.c b/src/version.c
index ad8a7480b..c9f88e93d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1047,
/**/
1046,
/**/
Reply all
Reply to author
Forward
0 new messages