diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-07-31 18:39:19 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-07-31 23:52:27 +0200 |
| commit | 6bdf668e5748a511082efed773b2b127e93fcb1d (patch) | |
| tree | 4096874c27798c4bb6a647899436b1aa0304a3b0 /pygnulib/GLEmiter.py | |
| parent | 18dcc627ddeced96bc192e169bf19e1a38c53374 (diff) | |
| download | gnulib-6bdf668e5748a511082efed773b2b127e93fcb1d.tar.gz | |
gnulib-tool.py: Follow gnulib-tool changes, part 19.
Follow gnulib-tool changes
2015-12-09 Pavel Raiskup <praiskup@redhat.com>
gnulib-tool: allow multiple --local-dir usage
2019-02-14 Bruno Haible <bruno@clisp.org>
gnulib-tool: Improve handling of multiple --local-dir options.
* gnulib-tool (func_reconstruct_cached_dir): When the argument is
absolute, return it unmodified.
(func_compute_relative_local_gnulib_path): Renamed from
func_count_relative_local_gnulib_path. Add comment.
* gnulib-tool.py: Accept multiple --local-dir options and collect the
values into localpath.
* pygnulib/GLConfig.py: Take a localpath argument instead of a localdir
argument.
(getLocalDir, setLocalDir, resetLocalDir): Remove methods.
(getLocalPath, setLocalPath, resetLocalPath): New methods.
* pygnulib/GLFileSystem.py (CopyAction): New class.
(GLFileSystem.lookup): Consider all dirs in localpath.
(GLFileSystem.shouldLink): New method.
(GLFileAssistant): Use shouldLink.
* pygnulib/GLModuleSystem.py (GLModuleSystem.exists): Iterate over all
dirs in localpath.
(GLModuleSystem.list): Likewise.
* pygnulib/GLEmiter.py: Update.
* pygnulib/GLImport.py (GLImport.__init__): Put the argument of
gl_LOCAL_DIR into localpath, not localdir.
(GLImport.actioncmd): Consider all dirs in localpath.
(GLImport.relative_to_destdir, GLImport.relative_to_currdir): New
methods.
(GLImport.gnulib_cache): Combine all dirs in localpath. Use
self.relative_to_destdir.
* pygnulib/GLTestDir.py (GLTestDir.execute): Use shouldLink.
Diffstat (limited to 'pygnulib/GLEmiter.py')
| -rw-r--r-- | pygnulib/GLEmiter.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index c41d4c5518..a5a13e63fb 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -605,7 +605,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ Emit the contents of the library Makefile. Returns str and a bool variable which shows if subdirectories are used. - GLConfig: localdir, sourcebase, libname, pobase, auxdir, makefile, libtool, + GLConfig: localpath, sourcebase, libname, pobase, auxdir, makefile, libtool, macro_prefix, podomain, conddeps, witness_c_macro. destfile is a filename relative to destdir of Makefile being generated. @@ -635,7 +635,6 @@ AC_DEFUN([%V1%_LIBSOURCES], [ raise TypeError('for_test must be a bool, not %s' % type(for_test).__name__) emit = '' - localdir = self.config['localdir'] sourcebase = self.config['sourcebase'] modcache = self.config['modcache'] libname = self.config['libname'] @@ -885,7 +884,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ Emit the contents of the tests Makefile. Returns str and a bool variable which shows if subdirectories are used. - GLConfig: localdir, modules, libname, auxdir, makefile, libtool, + GLConfig: localpath, modules, libname, auxdir, makefile, libtool, sourcebase, m4base, testsbase, macro_prefix, witness_c_macro, single_configure, libtests. @@ -914,7 +913,6 @@ AC_DEFUN([%V1%_LIBSOURCES], [ raise TypeError('for_test must be a bool, not %s' % type(for_test).__name__) emit = '' - localdir = self.config['localdir'] auxdir = self.config['auxdir'] sourcebase = self.config['sourcebase'] modcache = self.config['modcache'] |