Patch 8.2.0828
Problem: Travis: regexp patttern doesn't work everywhere.
Solution: Use [:blank:] instead of \b. (Ozaki Kiichi, closes #6146)
Files: .travis.yml, ci/config.mk.clang.sed, ci/config.mk.gcc.sed,
ci/config.mk.sed, src/if_ruby.c
*** ../vim-8.2.0827/.travis.yml 2020-05-11 22:13:24.793171617 +0200
--- .travis.yml 2020-05-26 20:03:43.515272289 +0200
***************
*** 125,131 ****
# Append various warning flags to CFLAGS.
# BSD sed needs backup extension specified.
sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
! sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
make ${SHADOWOPT} -j${NPROC}
fi
- echo -en "travis_fold:end:build\\r\\033[0K"
--- 125,136 ----
# Append various warning flags to CFLAGS.
# BSD sed needs backup extension specified.
sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk
! if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then
! # On macOS, the entity of gcc is clang.
! sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk
! else
! sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk
! fi
make ${SHADOWOPT} -j${NPROC}
fi
- echo -en "travis_fold:end:build\\r\\033[0K"
***************
*** 141,151 ****
- do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
- echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
!
! # instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env),
! # exclude some builds on mac os x and linux
! # on mac os x "tiny" is always without GUI
! # linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
jobs:
include:
- <<: *osx
--- 146,155 ----
- do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
- echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
! # Instead of using all environments with both compilers on both systems,
! # exclude some builds on mac os x and linux.
! # On mac os x "tiny" is always without GUI, use 2 compilers in 2 environments.
! # Linux: 2 compilers on some of the environments + gcc on os390
jobs:
include:
- <<: *osx
*** ../vim-8.2.0827/ci/config.mk.clang.sed 2020-04-11 18:01:10.929802359
+0200
--- ci/config.mk.clang.sed 2020-05-26 19:59:40.868194070 +0200
***************
*** 1 ****
! /^RUBY_CFLAGS\b/s/$/ -Wno-error=unknown-attributes
-Wno-error=ignored-attributes/
--- 1,2 ----
! /^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=missing-field-initializers/
! /^RUBY_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unknown-attributes
-Wno-error=ignored-attributes/
*** ../vim-8.2.0827/ci/config.mk.gcc.sed 2020-04-11 18:01:10.929802359
+0200
--- ci/config.mk.gcc.sed 2020-05-26 19:59:40.868194070 +0200
***************
*** 1 ****
! /^CFLAGS\b/s/$/ -Wno-error=maybe-uninitialized/
--- 1 ----
! /^CFLAGS[[:blank:]]*=/s/$/ -Wno-error=maybe-uninitialized/
*** ../vim-8.2.0827/ci/config.mk.sed 2020-04-11 18:01:10.929802359 +0200
--- ci/config.mk.sed 2020-05-26 19:59:40.868194070 +0200
***************
*** 1,2 ****
! /^CFLAGS\b/s/$/ -Wall -Wextra -Wshadow -Werror/
! /^PERL_CFLAGS\b/s/$/ -Wno-error=unused-function/
--- 1,2 ----
! /^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/
! /^PERL_CFLAGS[[:blank:]]*=/s/$/ -Wno-error=unused-function/
*** ../vim-8.2.0827/src/if_ruby.c 2020-04-11 18:01:10.933802350 +0200
--- src/if_ruby.c 2020-05-26 19:59:40.868194070 +0200
***************
*** 100,106 ****
#endif
// On macOS pre-installed Ruby defines "SIZEOF_TIME_T" as "SIZEOF_LONG" so it
! // conflicts with the definition in config.h then causes macro-redifned
warning.
#ifdef SIZEOF_TIME_T
# undef SIZEOF_TIME_T
#endif
--- 100,107 ----
#endif
// On macOS pre-installed Ruby defines "SIZEOF_TIME_T" as "SIZEOF_LONG" so it
! // conflicts with the definition in config.h then causes a macro-redefined
! // warning.
#ifdef SIZEOF_TIME_T
# undef SIZEOF_TIME_T
#endif
***************
*** 113,118 ****
--- 114,124 ----
# include <st.h> // for ST_STOP and ST_CONTINUE
#endif
+ // See above.
+ #ifdef SIZEOF_TIME_T
+ # undef SIZEOF_TIME_T
+ #endif
+
#undef off_t // ruby defines off_t as _int64, Mingw uses long
#undef EXTERN
#undef _
*** ../vim-8.2.0827/src/version.c 2020-05-26 11:37:22.198558963 +0200
--- src/version.c 2020-05-26 20:00:25.080022236 +0200
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 828,
/**/
--
hundred-and-one symptoms of being an internet addict:
185. You order fast food over the Internet
/// Bram Moolenaar -- b...@moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202005261809.04QI9fWh639092%40masaka.moolenaar.net.
