diff options
Diffstat (limited to 'libxcb/xcb-proto/xcbgen')
| -rw-r--r-- | libxcb/xcb-proto/xcbgen/Makefile.in | 91 | ||||
| -rw-r--r-- | libxcb/xcb-proto/xcbgen/xtypes.py | 28 |
2 files changed, 73 insertions, 46 deletions
diff --git a/libxcb/xcb-proto/xcbgen/Makefile.in b/libxcb/xcb-proto/xcbgen/Makefile.in index 14d4ba311..d4b0d8a5b 100644 --- a/libxcb/xcb-proto/xcbgen/Makefile.in +++ b/libxcb/xcb-proto/xcbgen/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -38,6 +40,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -45,9 +48,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkgpythondir)" -pkgpythonPYTHON_INSTALL = $(INSTALL_DATA) py_compile = $(top_srcdir)/py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -76,6 +93,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PYTHON = @PYTHON@ @@ -145,9 +163,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xcbgen/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign xcbgen/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xcbgen/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign xcbgen/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -165,18 +183,24 @@ $(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-pkgpythonPYTHON: $(pkgpython_PYTHON) @$(NORMAL_INSTALL) test -z "$(pkgpythondir)" || $(MKDIR_P) "$(DESTDIR)$(pkgpythondir)" - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ + @list='$(pkgpython_PYTHON)'; dlist=; list2=; test -n "$(pkgpythondir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ - f=$(am__strip_dir) \ + $(am__strip_dir) \ dlist="$$dlist $$f"; \ - echo " $(pkgpythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pkgpythondir)/$$f'"; \ - $(pkgpythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pkgpythondir)/$$f"; \ + list2="$$list2 $$b$$p"; \ else :; fi; \ done; \ + for file in $$list2; do echo $$file; done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgpythondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgpythondir)" || exit $$?; \ + done || exit $$?; \ if test -n "$$dlist"; then \ if test -z "$(DESTDIR)"; then \ PYTHON=$(PYTHON) $(py_compile) --basedir "$(pkgpythondir)" $$dlist; \ @@ -187,12 +211,17 @@ install-pkgpythonPYTHON: $(pkgpython_PYTHON) uninstall-pkgpythonPYTHON: @$(NORMAL_UNINSTALL) - @list='$(pkgpython_PYTHON)'; dlist=''; for p in $$list; do\ - f=$(am__strip_dir) \ - rm -f "$(DESTDIR)$(pkgpythondir)/$$f"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${f}c"; \ - rm -f "$(DESTDIR)$(pkgpythondir)/$${f}o"; \ - done + @list='$(pkgpython_PYTHON)'; test -n "$(pkgpythondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + filesc=`echo "$$files" | sed 's|$$|c|'`; \ + fileso=`echo "$$files" | sed 's|$$|o|'`; \ + echo " ( cd '$(DESTDIR)$(pkgpythondir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgpythondir)" && rm -f $$files || exit $$?; \ + echo " ( cd '$(DESTDIR)$(pkgpythondir)' && rm -f" $$filesc ")"; \ + cd "$(DESTDIR)$(pkgpythondir)" && rm -f $$filesc || exit $$?; \ + echo " ( cd '$(DESTDIR)$(pkgpythondir)' && rm -f" $$fileso ")"; \ + cd "$(DESTDIR)$(pkgpythondir)" && rm -f $$fileso tags: TAGS TAGS: @@ -216,13 +245,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -253,6 +286,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -271,6 +305,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -279,18 +315,28 @@ install-data-am: install-pkgpythonPYTHON install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -324,6 +370,7 @@ uninstall-am: uninstall-pkgpythonPYTHON mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ uninstall-am uninstall-pkgpythonPYTHON + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libxcb/xcb-proto/xcbgen/xtypes.py b/libxcb/xcb-proto/xcbgen/xtypes.py index 30617b8f4..01d765e59 100644 --- a/libxcb/xcb-proto/xcbgen/xtypes.py +++ b/libxcb/xcb-proto/xcbgen/xtypes.py @@ -235,15 +235,15 @@ class ExprType(Type): def fixed_size(self): return True -class SizedPadType(Type): +class PadType(Type): ''' - Derived class which represents a padding field of given size. + Derived class which represents a padding field. ''' - def __init__(self, size): + def __init__(self, elt): Type.__init__(self, tcard8.name) self.is_pad = True self.size = 1 - self.nmemb = int(size) + self.nmemb = 1 if (elt == None) else int(elt.get('bytes')) def resolve(self, module): self.resolved = True @@ -251,13 +251,6 @@ class SizedPadType(Type): def fixed_size(self): return True -class PadType(SizedPadType): - ''' - Derived class which represents a padding field of given type. - ''' - def __init__(self, elt): - self.nmemb = "1" if (elt == None) else elt.get('bytes') - SizedPadType.__init__(self, self.nmemb) class ComplexType(Type): ''' @@ -281,7 +274,6 @@ class ComplexType(Type): # Resolve all of our field datatypes. for child in list(self.elt): - value_mask_pad = None if child.tag == 'pad': field_name = 'pad' + str(pads) fkey = 'CARD8' @@ -308,7 +300,6 @@ class ComplexType(Type): fkey = 'CARD32' type = ListType(child, module.get_type(fkey), self) visible = True - value_mask_pad = child.get('value-mask-pad') else: # Hit this on Reply continue @@ -320,17 +311,6 @@ class ComplexType(Type): # Recursively resolve the type (could be another structure, list) type.resolve(module) - # Add a value-mask-pad if necessary - if value_mask_pad != None: - vmp_field_name = 'pad' + str(pads) - vmp_fkey = 'CARD8' - vmp_type = SizedPadType(value_mask_pad) - pads = pads + 1 - vmp_visible = False - vmp_field_type = module.get_type_name(vmp_fkey) - vmp_type.make_member_of(module, self, vmp_field_type, vmp_field_name, vmp_visible, True, False) - vmp_type.resolve(module) - self.calc_size() # Figure out how big we are self.resolved = True |