[Xcb-commit] 6 commits - libXamine xcb xcb-proto
Josh Triplett
josh at kemper.freedesktop.org
Sat Mar 4 18:37:27 PST 2006
libXamine/.gitignore | 2 +
xcb-proto/.gitignore | 2 +
xcb-proto/configure.ac | 6 ++++
xcb-proto/src/Makefile.am | 6 ++++
xcb-proto/src/extensions/glx.xml | 2 -
xcb-proto/src/extensions/randr.xml | 2 -
xcb-proto/src/xcb.xsd | 53 ++++++++++++++++++++-----------------
xcb/.gitignore | 2 +
8 files changed, 49 insertions(+), 26 deletions(-)
New commits:
diff-tree ce50eed62796c940548be3d1f4aa82a501f54e43 (from b373bbfa006e529f3e65408b0ac6a14dc0ab4afc)
Author: Josh Triplett <josh at freedesktop.org>
Date: Sat Mar 4 18:35:53 2006 -0800
Add *.tar.{bz2,gz} to .gitignore for the benefit of "make distcheck".
diff --git a/libXamine/.gitignore b/libXamine/.gitignore
index 17c3c9f..75b546f 100644
--- a/libXamine/.gitignore
+++ b/libXamine/.gitignore
@@ -20,3 +20,5 @@ libXamine.pc
libtool
ltmain.sh
missing
+*.tar.bz2
+*.tar.gz
diff --git a/xcb-proto/.gitignore b/xcb-proto/.gitignore
index 3d5e104..181a4a1 100644
--- a/xcb-proto/.gitignore
+++ b/xcb-proto/.gitignore
@@ -15,3 +15,5 @@ ltmain.sh
missing
mkinstalldirs
*.pc
+*.tar.bz2
+*.tar.gz
diff --git a/xcb/.gitignore b/xcb/.gitignore
index 83a8f06..ed62141 100644
--- a/xcb/.gitignore
+++ b/xcb/.gitignore
@@ -16,3 +16,5 @@ ltmain.sh
missing
mkinstalldirs
*.pc
+*.tar.bz2
+*.tar.gz
diff-tree b373bbfa006e529f3e65408b0ac6a14dc0ab4afc (from 0ab29c287567e87fb36a1c4768d4fd784fa3c700)
Author: Josh Triplett <josh at freedesktop.org>
Date: Sat Mar 4 18:29:40 2006 -0800
Validate protocol descriptions against schema in "make check", using xmllint. These tests will also run when doing "make distcheck" to create a distribution.
diff --git a/xcb-proto/configure.ac b/xcb-proto/configure.ac
index 2baaab4..5b52e6c 100644
--- a/xcb-proto/configure.ac
+++ b/xcb-proto/configure.ac
@@ -8,6 +8,12 @@ AC_INIT([XCBProto],
AC_CONFIG_SRCDIR([xcb-proto.pc.in])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AC_PATH_PROG(XMLLINT, xmllint, no)
+AM_CONDITIONAL(HAVE_XMLLINT, test "x$XMLLINT" != "xno")
+if test "$XSLTPROC" = "no"; then
+ AC_MSG_WARN([xmllint not found; unable to validate against schema.])
+fi
+
xcbincludedir='${includedir}/X11/XCB'
AC_SUBST(xcbincludedir)
diff --git a/xcb-proto/src/Makefile.am b/xcb-proto/src/Makefile.am
index e2d519e..566f176 100644
--- a/xcb-proto/src/Makefile.am
+++ b/xcb-proto/src/Makefile.am
@@ -20,3 +20,9 @@ nobase_xcbinclude_HEADERS = xcb.xsd
extensions/xprint.xml \
extensions/xv.xml \
extensions/xvmc.xml
+
+if HAVE_XMLLINT
+check-local:
+ $(XMLLINT) --noout --schema $(srcdir)/xcb.xsd \
+ $(srcdir)/*.xml $(srcdir)/extensions/*.xml
+endif
diff-tree 0ab29c287567e87fb36a1c4768d4fd784fa3c700 (from 83b17c6e7fba13e687ac9fcee715b84251a8c330)
Author: Josh Triplett <josh at freedesktop.org>
Date: Sat Mar 4 14:07:04 2006 -0800
In XML Schema, attributes default to optional unless explicitly marked use="required"; add use="required" to all required attributes. Add fake error number to error name="Generic" in glx.xml, since error is now a required attribute.
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 4f5e423..0acab27 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -59,7 +59,7 @@ The patch that fixed this server bug in
<typedef oldname="CARD32" newname="BOOL32" />
<!-- Errors -->
- <error name="Generic">
+ <error name="Generic" number="-1"> <!-- FIXME: fake number -->
<field type="CARD32" name="bad_value" />
<field type="CARD16" name="minor_opcode" />
<field type="CARD8" name="major_opcode" />
diff --git a/xcb-proto/src/xcb.xsd b/xcb-proto/src/xcb.xsd
index 23dc352..8cac620 100644
--- a/xcb-proto/src/xcb.xsd
+++ b/xcb-proto/src/xcb.xsd
@@ -30,7 +30,7 @@ authorization from the authors.
<xsd:element name="xcb">
<xsd:complexType>
<xsd:group ref="macro" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="header" type="xsd:string" />
+ <xsd:attribute name="header" type="xsd:string" use="required" />
<xsd:attribute name="extension-xname" type="xsd:string" use="optional" />
<xsd:attribute name="extension-name" type="xsd:string" use="optional" />
</xsd:complexType>
@@ -39,14 +39,14 @@ authorization from the authors.
<!-- Padding -->
<xsd:element name="pad">
<xsd:complexType>
- <xsd:attribute name="bytes" type="xsd:integer" />
+ <xsd:attribute name="bytes" type="xsd:integer" use="required" />
</xsd:complexType>
</xsd:element>
<!-- Type for fields or parameters with attributes "name" and "type" -->
<xsd:complexType name="var">
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="type" type="xsd:string" use="required" />
</xsd:complexType>
<!-- field replaces FIELD, PARAM, and REPLY. -->
@@ -77,7 +77,7 @@ authorization from the authors.
<xsd:group ref="expression" />
<xsd:group ref="expression" />
</xsd:sequence>
- <xsd:attribute name="op">
+ <xsd:attribute name="op" use="required">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:pattern value="\+|-|\*|/|&|<<" />
@@ -106,9 +106,9 @@ authorization from the authors.
<!-- BITMASK/LISTofVALUE parameter pairs. -->
<xsd:element name="valueparam">
<xsd:complexType>
- <xsd:attribute name="value-mask-type" type="xsd:string" />
- <xsd:attribute name="value-mask-name" type="xsd:string" />
- <xsd:attribute name="value-list-name" type="xsd:string" />
+ <xsd:attribute name="value-mask-type" type="xsd:string" use="required" />
+ <xsd:attribute name="value-mask-name" type="xsd:string" use="required" />
+ <xsd:attribute name="value-list-name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
@@ -123,21 +123,21 @@ authorization from the authors.
<!-- Type for a structure -->
<xsd:complexType name="struct">
<xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />
- <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
<!-- Type for a packet structure -->
<xsd:complexType name="packet-struct">
<xsd:group ref="fields" minOccurs="0" maxOccurs="unbounded" />
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="number" type="xsd:integer" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="number" type="xsd:integer" use="required" />
</xsd:complexType>
<!-- Type for a packet structure copy -->
<xsd:complexType name="packet-struct-copy">
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="number" type="xsd:integer" />
- <xsd:attribute name="ref" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="number" type="xsd:integer" use="required" />
+ <xsd:attribute name="ref" type="xsd:string" use="required" />
</xsd:complexType>
<!-- Type for hex integers -->
@@ -172,16 +172,18 @@ authorization from the authors.
</xsd:complexType>
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" />
- <xsd:attribute name="opcode" type="xsd:integer" />
- <xsd:attribute name="combine-adjacent" type="xsd:boolean" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="opcode" type="xsd:integer" use="required" />
+ <xsd:attribute name="combine-adjacent" type="xsd:boolean"
+ use="optional"/>
</xsd:complexType>
</xsd:element>
<xsd:element name="event">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="packet-struct">
- <xsd:attribute name="no-sequence-number" type="xsd:boolean" />
+ <xsd:attribute name="no-sequence-number" type="xsd:boolean"
+ use="optional" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -193,7 +195,7 @@ authorization from the authors.
<xsd:element name="union" type="struct" />
<xsd:element name="xidtype">
<xsd:complexType>
- <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
<xsd:element name="enum">
@@ -202,17 +204,17 @@ authorization from the authors.
<xsd:element name="item">
<xsd:complexType>
<xsd:group ref="expression" minOccurs="0" maxOccurs="1" />
- <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
<xsd:element name="typedef">
<xsd:complexType>
- <xsd:attribute name="oldname" type="xsd:string" />
- <xsd:attribute name="newname" type="xsd:string" />
+ <xsd:attribute name="oldname" type="xsd:string" use="required" />
+ <xsd:attribute name="newname" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
<!-- The import element allows a protocol description to reference the
diff-tree 83b17c6e7fba13e687ac9fcee715b84251a8c330 (from parents)
Merge: 17217d38b55b1934c60bc6aafb57eb8583d96b29 5c7fc608157bb7f243874dd535ef656212b8d7d9
Author: Josh Triplett <josh at freedesktop.org>
Date: Sat Mar 4 13:46:17 2006 -0800
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb
diff-tree 17217d38b55b1934c60bc6aafb57eb8583d96b29 (from 497b8f6b2a191de522218fa043b13a6c251b85fe)
Author: Josh Triplett <josh at freedesktop.org>
Date: Fri Feb 24 16:10:42 2006 -0800
Update the schema: a reply may contain a valueparam.
diff --git a/xcb-proto/src/xcb.xsd b/xcb-proto/src/xcb.xsd
index 47f8c69..23dc352 100644
--- a/xcb-proto/src/xcb.xsd
+++ b/xcb-proto/src/xcb.xsd
@@ -165,7 +165,10 @@ authorization from the authors.
</xsd:choice>
<xsd:element name="reply" minOccurs="0" maxOccurs="1">
<xsd:complexType>
- <xsd:group ref="fields" minOccurs="1" maxOccurs="unbounded" />
+ <xsd:choice minOccurs="1" maxOccurs="unbounded">
+ <xsd:group ref="fields" />
+ <xsd:element ref="valueparam" />
+ </xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:sequence>
diff-tree 497b8f6b2a191de522218fa043b13a6c251b85fe (from 6437d3696868cf453e0d892be959afe41111c037)
Author: Josh Triplett <josh at freedesktop.org>
Date: Fri Feb 24 15:59:48 2006 -0800
Remove stray character from randr.xml
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index a85b69c..2dbbfa4 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -58,7 +58,7 @@ authorization from the authors.
<reply>
<pad bytes="1" />
<field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />i
+ <field type="CARD32" name="minor_version" />
<pad bytes="16" />
</reply>
</request>
More information about the xcb-commit
mailing list