[PATCH] doc: Correct missing file warnings from files explicitly moved during build.

Bryce Harrington bryce at osg.samsung.com
Thu Jan 8 12:18:30 PST 2015


On Wed, Jan 07, 2015 at 06:44:06PM -0800, Jon A. Cruz wrote:
> ---
>  doc/publican/Makefile.am | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
> index 278da12..1e3cde0 100644
> --- a/doc/publican/Makefile.am
> +++ b/doc/publican/Makefile.am
> @@ -91,13 +91,19 @@ $(builddir)/en-US/ProtocolInterfaces.xml: $(top_srcdir)/protocol/wayland.xml $(s
>  
>  # * we don't want wayland-{server|client}_8h.xml to avoid duplicating output methods,
>  #   move it out of the way first.
> +# * create empty placeholders for moved files.
>  # * use doxygen's combine.xslt to merge the xml files into one single file
>  # * pipe that through the doxygen-to-publican stylesheet
>  # * move wayland-<foo>_8h.xml back to its original location
>  $(builddir)/en-US/%API.xml: $(doxydir)/xml/%/index.xml $(srcdir)/doxygen-to-publican.xsl | $(builddir)/en-US
> +	$(AM_V_at)rm -rf $(doxydir)/xml/$*/saved
>  	$(AM_V_at)$(MKDIR_P) $(doxydir)/xml/$*/saved
>  	$(AM_V_at)mv $(doxydir)/xml/$*/wayland-*_8h.xml \
>  		$(doxydir)/xml/$*/saved
> +	$(AM_V_at)for file in $(doxydir)/xml/$*/saved/*; \
> +		do TARG=$(doxydir)/xml/$*/`basename $${file}`; \
> +		echo "<?xml version='1.0' encoding='UTF-8' standalone='no'?><doxygen/>" > $${TARG}; \
> +		done
>  	$(AM_V_GEN)$(XSLTPROC) $(doxydir)/xml/$*/combine.xslt \
>  		$(doxydir)/xml/$*/index.xml | \
>  		$(XSLTPROC) --stringparam which $* \

The original warnings are:

  GEN      en-US/ProtocolInterfaces.xml
  GEN      en-US/ClientAPI.xml
warning: failed to load external entity "../../doc/doxygen/xml/Client/wayland-client_8h.xml"
warning: failed to load external entity "../../doc/doxygen/xml/Client/wayland-util_8h.xml"
  GEN      en-US/ServerAPI.xml
warning: failed to load external entity "../../doc/doxygen/xml/Server/wayland-server_8h.xml"
warning: failed to load external entity "../../doc/doxygen/xml/Server/wayland-util_8h.xml"
  GEN      Wayland/en-US/html/css
  GEN      Wayland/en-US/html/css/brand.css

But with this patch applied:

  GEN      en-US/ProtocolInterfaces.xml
  GEN      en-US/ClientAPI.xml
  GEN      en-US/ServerAPI.xml
  GEN      Wayland/en-US/html/css
  GEN      Wayland/en-US/html/css/brand.css

No other issues seem to crop up during build.  Looks good to me.

Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>
Tested-by: Bryce Harrington <bryce at osg.samsung.com>


More information about the wayland-devel mailing list