gtk-doc r591 - in trunk: . examples tests

[stefkost svn gnome org]

Author: stefkost
Date: Sat Jun 28 13:56:15 2008
New Revision: 591
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=591&view=rev

Log:
	patch by: David NeÄas <yeti physics muni cz>
	* examples/Makefile.am:
	* gtk-doc.make:
	* gtk-doc.notmpl.make:
	* gtkdoc-mkhtml.in:
	* tests/gtk-doc.make:
	* tests/gtk-doc.notmpl.make:
	  Add searchpath to gtkdoc.mkhtml. Fixes #460753



Modified:
   trunk/ChangeLog
   trunk/examples/Makefile.am
   trunk/gtk-doc.make
   trunk/gtk-doc.notmpl.make
   trunk/gtkdoc-mkhtml.in
   trunk/tests/gtk-doc.make
   trunk/tests/gtk-doc.notmpl.make

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Sat Jun 28 13:56:15 2008
@@ -35,6 +35,9 @@
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
 MKTMPL_OPTIONS=
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=
+
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=

Modified: trunk/gtk-doc.make
==============================================================================
--- trunk/gtk-doc.make	(original)
+++ trunk/gtk-doc.make	Sat Jun 28 13:56:15 2008
@@ -107,7 +107,7 @@
 	@-chmod -R u+w $(srcdir)
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)

Modified: trunk/gtk-doc.notmpl.make
==============================================================================
--- trunk/gtk-doc.notmpl.make	(original)
+++ trunk/gtk-doc.notmpl.make	Sat Jun 28 13:56:15 2008
@@ -92,7 +92,7 @@
 	@-chmod -R u+w $(srcdir)
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)

Modified: trunk/gtkdoc-mkhtml.in
==============================================================================
--- trunk/gtkdoc-mkhtml.in	(original)
+++ trunk/gtkdoc-mkhtml.in	Sat Jun 28 13:56:15 2008
@@ -2,22 +2,26 @@
 #
 
 usage="\
-Usage: gtkdoc-mkhtml MODULE DRIVER_FILE"
+Usage: gtkdoc-mkhtml [--path=SEARCH_PATH] MODULE DRIVER_FILE [BACKEND_OPTIONS...]"
 
 #echo "args $0\n";
 
-if test "x$1" = "x--version"; then
-      echo "@VERSION@"
-      exit 0
-fi
-
-if test $# -ne 2; then
+searchpath=
+case "X$1" in
+    X--version) echo "@VERSION@"; exit 0;;
+    X--help) echo "$usage"; exit 0;;
+    X--path=*) searchpath="${1#*=}"; shift;;
+esac
+ 
+if test $# -lt 2; then
       echo "${usage}" 1>&2
       exit 1
 fi
 
 module=$1
-document=$2
+shift
+document=$1
+shift
 
 # FIXME: this is a hack to run uninstalled
 if test "x$0" = "x../../../gtkdoc-mkhtml" ; then
@@ -32,8 +36,16 @@
 
 if head -n 1 $document | grep "<?xml" > /dev/null; then
   is_xml=true
+  path_option='--path'
 else
   is_xml=false
+  path_option='--directory'
+fi
+
+if test "X$searchpath" == "X"; then
+    path_arg=
+else
+    path_arg="$path_option $searchpath"
 fi
 
 # Delete the old index.sgml file, if it exists.
@@ -42,14 +54,14 @@
 fi
 
 if $is_xml; then
-  @XSLTPROC@ --nonet --xinclude \
+  @XSLTPROC@ $path_arg --nonet --xinclude \
       --stringparam gtkdoc.bookname $module \
       --stringparam gtkdoc.version "@VERSION@" \
-      $gtkdocdir/gtk-doc.xsl $document || exit $?
+      "$@" $gtkdocdir/gtk-doc.xsl $document || exit $?
 else
-  @JADE@ -t @SGML_FORMAT_TYPE@ -w no-idref -d $gtkdocdir/gtk-doc.dsl \
+  @JADE@ $path_arg -t @SGML_FORMAT_TYPE@ -w no-idref -d $gtkdocdir/gtk-doc.dsl \
       -V "gtkdoc-bookname=$module" -V "gtkdoc-version= VERSION@" \
-      $gtkdocdir/gtk-doc.dcl $document || exit $?
+      "$@" $gtkdocdir/gtk-doc.dcl $document || exit $?
 fi
 
 # copy navigation images and stylesheets to html directory ...

Modified: trunk/tests/gtk-doc.make
==============================================================================
--- trunk/tests/gtk-doc.make	(original)
+++ trunk/tests/gtk-doc.make	Sat Jun 28 13:56:15 2008
@@ -104,7 +104,7 @@
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
-	gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
 	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \

Modified: trunk/tests/gtk-doc.notmpl.make
==============================================================================
--- trunk/tests/gtk-doc.notmpl.make	(original)
+++ trunk/tests/gtk-doc.notmpl.make	Sat Jun 28 13:56:15 2008
@@ -89,7 +89,7 @@
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \
-	gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+	gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
 	@echo 'gtk-doc: Fixing cross-references'
 	@PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \