From eb73a5c4db1dfa37a5bed13c7a0aa09ba7e4d3a6 Mon Sep 17 00:00:00 2001 From: Dmitry Selyutin Date: Sun, 1 Oct 2017 20:29:47 +0300 Subject: [PATCH] pygnulib.py: determine the final file lists --- pygnulib.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pygnulib.py b/pygnulib.py index e261b7b79e..fee836e8c2 100755 --- a/pygnulib.py +++ b/pygnulib.py @@ -16,6 +16,7 @@ from pygnulib.error import UnknownModuleError from pygnulib.config import Base as BaseConfig from pygnulib.config import Cache as CacheConfig +from pygnulib.module import filelist from pygnulib.module import dummy_required from pygnulib.module import libtests_required from pygnulib.module import transitive_closure @@ -123,6 +124,26 @@ def import_hook(script, gnulib, namespace, verbosity, options, *args, **kwargs): if notice.strip(): print("Notice from module {0}:".format(name), file=sys.stdout) print("\n".join(" " + line for line in notice.splitlines()), file=sys.stdout) + + # Determine the final file lists. + main_files = filelist(main, config.ac_version) + tests_files = filelist(tests, config.ac_version) + for file in tests_files: + if file.startswith("lib/"): + tests_files.remove(file) + file = "tests=lib/" + file[len("lib/"):] + tests_files.add(file) + files = main_files | tests_files + if verbosity >= 0: + print("File list:", file=sys.stdout) + for file in sorted(files): + if file.startswith("tests=lib/"): + name = file[len("tests=lib/"):] + src = "lib/" + name + dst = "tests/" + name + print(" ", src, " -> ", dst, file=sys.stdout, sep="") + else: + print(" ", file, file=sys.stdout, sep="") return os.EX_OK -- 2.39.5