From 7893efb2418fb044cb136783e67325b41eda41fa Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 3 Dec 2024 10:52:27 -0800 Subject: [PATCH] extensions.py: move globbing into python script This will be helpful for Meson, which doesn't do globing in it's DSL --- Makefile.am | 2 +- src/extensions.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3664c76..dc119fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,5 +37,5 @@ tests_test_LDADD = libxcb-errors.la $(XCB_LIBS) CLEANFILES = src/extensions.c src/extensions.c: src/extensions.py - $(AM_V_GEN)$(PYTHON) $(srcdir)/src/extensions.py $@.tmp ${XCBPROTO_XCBINCLUDEDIR}/*.xml && \ + $(AM_V_GEN)$(PYTHON) $(srcdir)/src/extensions.py $@.tmp ${XCBPROTO_XCBINCLUDEDIR} && \ mv $@.tmp $@ diff --git a/src/extensions.py b/src/extensions.py index 0e35e5c..5d20a0d 100755 --- a/src/extensions.py +++ b/src/extensions.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import argparse -import sys +import glob from xml.etree.cElementTree import parse class Module(object): @@ -114,11 +114,11 @@ def main(): # Parse the xml file parser = argparse.ArgumentParser() parser.add_argument('output') - parser.add_argument('inputs', nargs='+') + parser.add_argument('xml_dir') args = parser.parse_args() modules = [] - for input_file in args.inputs: + for input_file in glob.glob(args.xml_dir + '/*.xml'): parseFile(input_file, modules) assert xproto != None