From 7d60a47a4358e6574470daabe4fc54a400e44454 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Wed, 28 Feb 2024 22:15:04 -0800 Subject: [PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 35. Follow gnulib-tool change 2023-05-28 Bruno Haible warnings, manywarnings: Assume autoconf >= 2.64. * pygnulib/GLConfig.py (GLConfig.default, GLConfig.getAutoconfVersion) (GLConfig.setAutoconfVersion, resetAutoconfVersion): Set required Autoconf version to 2.64. * pygnulib/GLError.py (GLError.__init__, GLError.__repr__): Likewise. * pygnulib/GLImport.py (GLImport.__init__): Likewise. * pygnulib/constants.py (DEFAULT_AUTOCONF_MINVERSION): Likewise. * pygnulib/main.py: Likewise. --- ChangeLog | 14 ++++++++++++++ gnulib-tool.py.TODO | 26 -------------------------- pygnulib/GLConfig.py | 10 +++++----- pygnulib/GLError.py | 4 ++-- pygnulib/GLImport.py | 2 +- pygnulib/constants.py | 4 ++-- pygnulib/main.py | 2 +- 7 files changed, 25 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index c16681c772..82263fbd8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2024-02-29 Collin Funk + + gnulib-tool.py: Follow gnulib-tool changes, part 35. + Follow gnulib-tool change + 2023-05-28 Bruno Haible + warnings, manywarnings: Assume autoconf >= 2.64. + * pygnulib/GLConfig.py (GLConfig.default, GLConfig.getAutoconfVersion) + (GLConfig.setAutoconfVersion, resetAutoconfVersion): Set required + Autoconf version to 2.64. + * pygnulib/GLError.py (GLError.__init__, GLError.__repr__): Likewise. + * pygnulib/GLImport.py (GLImport.__init__): Likewise. + * pygnulib/constants.py (DEFAULT_AUTOCONF_MINVERSION): Likewise. + * pygnulib/main.py: Likewise. + 2024-02-29 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 34. diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index cd1274a7be..d942119be0 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -620,32 +620,6 @@ Date: Sun Dec 27 01:21:22 2020 +0100 -------------------------------------------------------------------------------- -commit 15ce5a630b02af7c7104650dfb18e443b4111564 -Author: Bruno Haible -Date: Sun Aug 16 12:12:32 2020 +0200 - - Assume autoconf >= 2.64. - - * gnulib-tool (DEFAULT_AUTOCONF_MINVERSION): Set to 2.64. - * DEPENDENCIES: Require Autoconf 2.64 or newer. - * NEWS: Mention the changed requirement. - * m4/00gnulib.m4 (_m4_divert_diversion, AC_DEFUN_ONCE): Remove macros. - * m4/gnulib-common.m4 (AS_VAR_IF, AS_VAR_COPY): Remove macros. - * m4/absolute-header.m4 (gl_ABSOLUTE_HEADER): Quote pushdef'ed - variables. - * m4/include_next.m4 (gl_NEXT_HEADERS_INTERNAL): Likewise. - * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Likewise. - * m4/warnings.m4 (gl_COMPILER_OPTION_IF): Likewise. - (gl_UNKNOWN_WARNINGS_ARE_ERRORS(C), gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++), - gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)): Define through AC_DEFUN. - * m4/manywarnings.m4 (gl_MANYWARN_ALL_GCC(C), gl_MANYWARN_ALL_GCC(C++)): - Likewise. - * m4/iconv.m4 (AM_ICONV): Define through AC_DEFUN_ONCE directly. - * m4/libunistring.m4 (gl_LIBUNISTRING): Likewise. - * m4/configmake.m4: Update comment. - --------------------------------------------------------------------------------- - commit baec1bac1602ba8534320c295e120f7b658400f4 Author: Bruno Haible Date: Sat Feb 22 15:15:01 2020 +0100 diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py index ae83bd6155..4284c73ad9 100644 --- a/pygnulib/GLConfig.py +++ b/pygnulib/GLConfig.py @@ -271,7 +271,7 @@ class GLConfig(object): elif key == 'include_guard_prefix': return 'GL' elif key == 'ac_version': - return 2.59 + return 2.64 elif key == 'verbosity': return 0 elif key in ['modules', 'avoids', 'tests', 'incl_test_categories', 'excl_test_categories']: @@ -943,11 +943,11 @@ class GLConfig(object): # Define ac_version methods. def getAutoconfVersion(self): - '''Return preferred autoconf version. Default value is 2.59.''' + '''Return preferred autoconf version. Default value is 2.64.''' return self.table['ac_version'] def setAutoconfVersion(self, ac_version): - '''Specify preferred autoconf version. Default value is 2.59.''' + '''Specify preferred autoconf version. Default value is 2.64.''' if type(ac_version) is float or type(ac_version) is int: self.table['ac_version'] = float(ac_version) else: # if ac_version has not int or float type @@ -955,8 +955,8 @@ class GLConfig(object): % type(ac_version).__name__) def resetAutoconfVersion(self): - '''Specify preferred autoconf version. Default value is 2.59.''' - self.table['ac_version'] = 2.59 + '''Specify preferred autoconf version. Default value is 2.64.''' + self.table['ac_version'] = 2.64 # Define symbolic methods. def checkSymbolic(self): diff --git a/pygnulib/GLError.py b/pygnulib/GLError.py index bd8b3b2956..5c7420e8b1 100644 --- a/pygnulib/GLError.py +++ b/pygnulib/GLError.py @@ -45,7 +45,7 @@ class GLError(Exception): 1: file does not exist in GLFileSystem: 2: cannot patch file inside GLFileSystem: 3: configure file does not exist: - 4: minimum supported autoconf version is 2.59, not + 4: minimum supported autoconf version is 2.64, not 5: is expected to contain gl_M4_BASE([]) 6: missing sourcebase argument 7: missing docbase argument @@ -78,7 +78,7 @@ class GLError(Exception): elif errno == 3: message = "configure file does not exist: %s" % repr(errinfo) elif errno == 4: - message = "minimum supported autoconf version is 2.59, not %s" % repr(errinfo) + message = "minimum supported autoconf version is 2.64, not %s" % repr(errinfo) elif errno == 5: message = "%s is expected to contain gl_M4_BASE([%s])" % (repr(os.path.join(errinfo, 'gnulib-comp.m4')), repr(errinfo)) elif errno == 6: diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index fca2333ec5..e18a9601ec 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -112,7 +112,7 @@ class GLImport(object): version = sorted(set([ float(version) for version in versions ]))[-1] self.config.setAutoconfVersion(version) - if version < 2.59: + if version < 2.64: raise GLError(4, version) # Get other cached variables. diff --git a/pygnulib/constants.py b/pygnulib/constants.py index 22430f0df3..0f6f5c67f0 100644 --- a/pygnulib/constants.py +++ b/pygnulib/constants.py @@ -121,8 +121,8 @@ TESTS = \ } # Define AUTOCONF minimum version -DEFAULT_AUTOCONF_MINVERSION = 2.59 -# You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH +DEFAULT_AUTOCONF_MINVERSION = 2.64 +# You can set AUTOCONFPATH to empty if autoconf 2.64 is already in your PATH AUTOCONFPATH = '' # You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH AUTOMAKEPATH = '' diff --git a/pygnulib/main.py b/pygnulib/main.py index 443300c439..93fd637f24 100644 --- a/pygnulib/main.py +++ b/pygnulib/main.py @@ -1210,7 +1210,7 @@ if __name__ == '__main__': elif errno == 3: message += 'cannot find %s - make sure you run gnulib-tool from within your package\'s directory' % errinfo elif errno == 4: - message += 'minimum supported autoconf version is 2.59. Try adding' + message += 'minimum supported autoconf version is 2.64. Try adding' message += 'AC_PREREQ([%s])' % constants.DEFAULT_AUTOCONF_MINVERSION message += ' to your configure.ac.' elif errno == 5: -- 2.39.5