Author: mvidner Date: Tue Jul 29 09:23:45 2008 New Revision: 49472 URL: http://svn.opensuse.org/viewcvs/yast?rev=49472&view=rev Log: Process the docs in one run to be able to disambiguate overloaded builtins. Modified: trunk/core/libycp/doc/ (props changed) trunk/core/libycp/doc/Makefile.am trunk/core/libycp/doc/builtins.xml Modified: trunk/core/libycp/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/doc/Makefile.am?rev=49472&r1=49471&r2=49472&view=diff ============================================================================== --- trunk/core/libycp/doc/Makefile.am (original) +++ trunk/core/libycp/doc/Makefile.am Tue Jul 29 09:23:45 2008 @@ -5,8 +5,7 @@ htmldir = $(docdir)/libycp builtin = $(wildcard $(srcdir)/../src/YCPBuiltin*.cc) -builtinxml := $(builtin:%.cc=%.xml) -xmlfiles := $(foreach xml,$(builtinxml),$(notdir $(xml))) +xmlfiles = combined.xml htmlfiles = $(wildcard html/*.html) @@ -21,7 +20,7 @@ YDOC := $(shell pkg-config --variable=ybindir yast2-devtools)/ydoc2 RENT := $(shell pkg-config --variable=ybindir yast2-devtools)/replace_entities $(xmlfiles) : $(builtin) - $(YDOC) -o $@.tmp ../src/$(subst xml,cc,$@) + $(YDOC) -o $@.tmp $^ $(XSLTPROC) $(XSLTPROC_FLAGS) @STYLESHEET_YDOC@ $@.tmp > $@ $(RENT) $@ rm $@.tmp @@ -40,3 +39,6 @@ install-data-local: mkdir -p $(DESTDIR)$(htmldir) cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir) + +check-manual: + xmllint --noout --valid builtins.xml Modified: trunk/core/libycp/doc/builtins.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/doc/builtins.xml?rev=49472&r1=49471&r2=49472&view=diff ============================================================================== --- trunk/core/libycp/doc/builtins.xml (original) +++ trunk/core/libycp/doc/builtins.xml Tue Jul 29 09:23:45 2008 @@ -1,17 +1,8 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "/usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd"[ -<!ENTITY YCPBuiltinInteger SYSTEM "YCPBuiltinInteger.xml"> -<!ENTITY YCPBuiltinString SYSTEM "YCPBuiltinString.xml"> -<!ENTITY YCPBuiltinMap SYSTEM "YCPBuiltinMap.xml"> -<!ENTITY YCPBuiltinList SYSTEM "YCPBuiltinList.xml"> -<!ENTITY YCPBuiltinPath SYSTEM "YCPBuiltinPath.xml"> -<!ENTITY YCPBuiltinTerm SYSTEM "YCPBuiltinTerm.xml"> -<!ENTITY YCPBuiltinMisc SYSTEM "YCPBuiltinMisc.xml"> -<!ENTITY YCPBuiltinFloat SYSTEM "YCPBuiltinFloat.xml"> -<!ENTITY YCPBuiltinByteblock SYSTEM "YCPBuiltinByteblock.xml"> - +<!ENTITY combined SYSTEM "combined.xml"> ]> <book> @@ -37,14 +28,7 @@ <toc> </toc> - &YCPBuiltinInteger; - &YCPBuiltinString; - &YCPBuiltinMap; - &YCPBuiltinList; - &YCPBuiltinPath; - &YCPBuiltinTerm; - &YCPBuiltinMisc; - &YCPBuiltinFloat; - &YCPBuiltinByteblock; + + &combined; </book> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org