[PATCH wayland v2] Remove protocol/wayland.dtd

Auke Booij auke at tulcod.com
Thu Oct 8 06:35:34 PDT 2015


The wayland scanner defines the protocol. The DTD specification is not used.
---
 Makefile.am          |  4 ++--
 protocol/wayland.dtd | 29 -----------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 protocol/wayland.dtd

diff --git a/Makefile.am b/Makefile.am
index 58f5595..ffad16b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,8 @@ dist_aclocal_DATA = wayland-scanner.m4
 
 dist_pkgdata_DATA =				\
 	wayland-scanner.mk			\
-	protocol/wayland.xml			\
-	protocol/wayland.dtd
+	protocol/wayland.xml
+
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
diff --git a/protocol/wayland.dtd b/protocol/wayland.dtd
deleted file mode 100644
index b8b1573..0000000
--- a/protocol/wayland.dtd
+++ /dev/null
@@ -1,29 +0,0 @@
-<!ELEMENT protocol (copyright?, interface+)>
-  <!ATTLIST protocol name CDATA #REQUIRED>
-<!ELEMENT copyright (#PCDATA)>
-<!ELEMENT interface (description?,(request|event|enum)+)>
-  <!ATTLIST interface name CDATA #REQUIRED>
-  <!ATTLIST interface version CDATA #REQUIRED>
-<!ELEMENT request (description?,arg*)>
-  <!ATTLIST request name CDATA #REQUIRED>
-  <!ATTLIST request type CDATA #IMPLIED>
-  <!ATTLIST request since CDATA #IMPLIED>
-<!ELEMENT event (description?,arg*)>
-  <!ATTLIST event name CDATA #REQUIRED>
-  <!ATTLIST event since CDATA #IMPLIED>
-<!ELEMENT enum (description?,entry*)>
-  <!ATTLIST enum name CDATA #REQUIRED>
-  <!ATTLIST enum since CDATA #IMPLIED>
-<!ELEMENT entry (description?)>
-  <!ATTLIST entry name CDATA #REQUIRED>
-  <!ATTLIST entry value CDATA #REQUIRED>
-  <!ATTLIST entry summary CDATA #IMPLIED>
-  <!ATTLIST entry since CDATA #IMPLIED>
-<!ELEMENT arg (description?)>
-  <!ATTLIST arg name CDATA #REQUIRED>
-  <!ATTLIST arg type CDATA #REQUIRED>
-  <!ATTLIST arg summary CDATA #IMPLIED>
-  <!ATTLIST arg interface CDATA #IMPLIED>
-  <!ATTLIST arg allow-null CDATA #IMPLIED>
-<!ELEMENT description (#PCDATA)>
-  <!ATTLIST description summary CDATA #REQUIRED>
-- 
2.5.3



More information about the wayland-devel mailing list