averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix configure not parsing Vim version correctly

Browse Source 
Fix the script to parse Vim version correct as version.h had a refactor.
Also, make sure if the output version string doesn't look right, we will
fail the configure script so we know something is wrong after merging
from Vim upstream.

Fix #1011
This commit is contained in:
Yee Cheng Chin
2020-03-09 04:23:09 -07:00
parent 3533c60e02
commit 963525558d
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/auto/configure
Vendored
+9 -3
View File
@@ -14903,10 +14903,16 @@ $as_echo "using default" >&6; }
fi
vim_short_version_string=`grep 'define.*VIM_VERSION_SHORT' $srcdir/version.h|sed -E -e 's/.*"([0-9.]*)".*/\1/'`
vim_major_version_string=`grep -m 1 'define.*VIM_VERSION_MAJOR' $srcdir/version.h|sed -E -e 's/^.*([0-9]+).*/\1/'`
vim_minor_version_string=`grep -m 1 'define.*VIM_VERSION_MINOR' $srcdir/version.h|sed -E -e 's/^.*([0-9]+).*/\1/'`
snapshot=`grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([0-9]+),.*/\1/'`
vim_short_version_string="$vim_short_version_string.$snapshot"
XCODEFLAGS="$XCODEFLAGS VIM_SHORT_VERSION_STRING=$vim_short_version_string"
vim_short_version_string="$vim_major_version_string.$vim_minor_version_string.$snapshot"
if echo "$vim_short_version_string" | grep -q "^\d\+\.\d\+\.\d\+$"; then
XCODEFLAGS="$XCODEFLAGS VIM_SHORT_VERSION_STRING=$vim_short_version_string"
else
as_fn_error $? "could not parse Vim version: $vim_short_version_string" "$LINENO" 5
fi
fi
src/configure.ac
+9 -3
View File
@@ -4543,10 +4543,16 @@ if test "x$MACOS_X" = "xyes"; then
[ AC_MSG_RESULT(using default) ])
dnl Set CFBundleShortVersionString of Info.plist
vim_short_version_string=`grep 'define.*VIM_VERSION_SHORT' $srcdir/version.h|sed -E -e 's/.*"([[0-9.]]*)".*/\1/'`
vim_major_version_string=`grep -m 1 'define.*VIM_VERSION_MAJOR' $srcdir/version.h|sed -E -e 's/^.*([[0-9]]+).*/\1/'`
vim_minor_version_string=`grep -m 1 'define.*VIM_VERSION_MINOR' $srcdir/version.h|sed -E -e 's/^.*([[0-9]]+).*/\1/'`
snapshot=`grep -C2 "Add new patch number below this line" $srcdir/version.c|tail -1|sed -E -e 's/^ *([[0-9]]+),.*/\1/'`
vim_short_version_string="$vim_short_version_string.$snapshot"
XCODEFLAGS="$XCODEFLAGS VIM_SHORT_VERSION_STRING=$vim_short_version_string"
vim_short_version_string="$vim_major_version_string.$vim_minor_version_string.$snapshot"
if echo "$vim_short_version_string" | grep -q "^\d\+\.\d\+\.\d\+$"; then
XCODEFLAGS="$XCODEFLAGS VIM_SHORT_VERSION_STRING=$vim_short_version_string"
else
AC_MSG_ERROR(could not parse Vim version: $vim_short_version_string)
fi
AC_SUBST(XCODEFLAGS)
fi