build: Stop using xmllint to validate protocol files
The scanner needs to be good enough. If it crashes or fails to report invalid input, that needs to get fixed.
This commit is contained in:
+2
-16
@@ -17,7 +17,7 @@ weston.ini : $(srcdir)/weston.ini.in
|
|||||||
-e 's|@libexecdir[@]|$(libexecdir)|g' \
|
-e 's|@libexecdir[@]|$(libexecdir)|g' \
|
||||||
$< > $@
|
$< > $@
|
||||||
|
|
||||||
all-local : weston.ini validate-protocol-xml
|
all-local : weston.ini
|
||||||
|
|
||||||
AM_CFLAGS = $(GCC_CFLAGS)
|
AM_CFLAGS = $(GCC_CFLAGS)
|
||||||
|
|
||||||
@@ -892,7 +892,7 @@ BUILT_SOURCES += \
|
|||||||
tests/text-protocol.c \
|
tests/text-protocol.c \
|
||||||
tests/text-client-protocol.h
|
tests/text-client-protocol.h
|
||||||
|
|
||||||
protocol_sources = \
|
EXTRA_DIST += \
|
||||||
protocol/desktop-shell.xml \
|
protocol/desktop-shell.xml \
|
||||||
protocol/screenshooter.xml \
|
protocol/screenshooter.xml \
|
||||||
protocol/xserver.xml \
|
protocol/xserver.xml \
|
||||||
@@ -904,20 +904,6 @@ protocol_sources = \
|
|||||||
protocol/xdg-shell.xml \
|
protocol/xdg-shell.xml \
|
||||||
protocol/scaler.xml
|
protocol/scaler.xml
|
||||||
|
|
||||||
if HAVE_XMLLINT
|
|
||||||
.PHONY : validate-protocol-xml
|
|
||||||
|
|
||||||
.%.xml.valid : $(top_srcdir)/protocol/%.xml
|
|
||||||
$(AM_V_GEN)$(XMLLINT) --noout --dtdvalid $(dtddir)/wayland.dtd $^ > $@
|
|
||||||
|
|
||||||
validate-protocol-xml : $(protocol_sources:protocol/%.xml=.%.xml.valid)
|
|
||||||
|
|
||||||
CLEANFILES += $(protocol_sources:protocol/%.xml=.%.xml.valid)
|
|
||||||
EXTRA_DIST += $(protocol_sources)
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
man_MANS = weston.1 weston.ini.5
|
man_MANS = weston.1 weston.ini.5
|
||||||
|
|
||||||
if ENABLE_DRM_COMPOSITOR
|
if ENABLE_DRM_COMPOSITOR
|
||||||
|
|||||||
@@ -474,15 +474,6 @@ if test x$wayland_scanner = x; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
|
PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner)
|
||||||
AC_PATH_PROG(XMLLINT, xmllint)
|
|
||||||
AC_ARG_WITH([dtddir],
|
|
||||||
AS_HELP_STRING([--with-dtddir],
|
|
||||||
[Directory containing the Wayland
|
|
||||||
protocol DTD @<:@default=from pkgconfig@:>@]),
|
|
||||||
[dtddir="$withval"],
|
|
||||||
[dtddir=$($PKG_CONFIG --variable=pkgdatadir wayland-scanner)])
|
|
||||||
AC_SUBST([dtddir])
|
|
||||||
AM_CONDITIONAL([HAVE_XMLLINT], [test "x$XMLLINT" != "x" -a "x$dtddir" != "x"])
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
|
AC_CONFIG_FILES([Makefile src/version.h src/weston.pc])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user