gtk-doc r655 - in trunk: . tests

[stefkost svn gnome org]

Author: stefkost
Date: Fri Jan 23 08:02:04 2009
New Revision: 655
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=655&view=rev

Log:
	patch by: David NeÄas <yeti physics muni cz>
	* gtkdoc-mkhtml.in:
	* gtkdoc-mkman.in:
	* tests/gtk-doc.make:
	* tests/gtk-doc.notmpl.make:
	  Less quirky way of knowing that we run uninstalled, which is only
	  needed for the tests anyway. In addition to the patch, make same
	  changes in mkman, add a shift to arg parsing to not loop and change
	  the makefiles for the tests. Fixes #568702.



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-mkhtml.in
   trunk/gtkdoc-mkman.in
   trunk/tests/gtk-doc.make
   trunk/tests/gtk-doc.notmpl.make

Modified: trunk/gtkdoc-mkhtml.in
==============================================================================
--- trunk/gtkdoc-mkhtml.in	(original)
+++ trunk/gtkdoc-mkhtml.in	Fri Jan 23 08:02:04 2009
@@ -9,10 +9,12 @@
 # parse options, ignore unknown options for future extensions
 
 searchpath=
+uninstalled=no
 while true; do
     case "X$1" in
         X--version) echo "@VERSION@"; exit 0;;
         X--help) echo "$usage"; exit 0;;
+        X--uninstalled) uninstalled=yes; shift;;
         X--path=*) searchpath=`echo $1 | sed s/.*=//`; shift;;
         X--*) shift;;
         X*) break;;
@@ -29,17 +31,15 @@
 document=$1
 shift
 
-# FIXME: this is a hack to detect uninstalled
-if test "x$0" = "x prefix@/bin/gtkdoc-mkhtml" ; then
-      #echo "installed"
+if test $uninstalled = yes; then
+      # this does not work from buiddir!=srcdir
+      gtkdocdir=`dirname $0`
+      #echo "uninstalled, gtkdocdir=$gtkdocdir"
+else
       # the first two are needed to resolve datadir
       prefix= prefix@
       datarootdir= datarootdir@
       gtkdocdir= datadir@/gtk-doc/data
-else
-      #echo "uninstalled"
-      # this does not work from buiddir!=srcdir
-      gtkdocdir=`dirname $0`
 fi
 
 if head -n 1 $document | grep "<?xml" > /dev/null; then

Modified: trunk/gtkdoc-mkman.in
==============================================================================
--- trunk/gtkdoc-mkman.in	(original)
+++ trunk/gtkdoc-mkman.in	Fri Jan 23 08:02:04 2009
@@ -7,10 +7,12 @@
 # parse options, ignore unknown options for future extensions
 
 searchpath=
+uninstalled=no
 while true; do
     case "X$1" in
         X--version) echo "@VERSION@"; exit 0;;
         X--help) echo "$usage"; exit 0;;
+        X--uninstalled) uninstalled=yes; shift;;
         X--path=*) searchpath=`echo $1 | sed s/.*=//`; shift;;
         X--*) shift;;
         X*) break;;
@@ -27,32 +29,42 @@
 document=$1
 shift
 
-# FIXME: this is a hack to run uninstalled
-if test "x$0" = "x prefix@/bin/gtkdoc-mkhtml" ; then
-      #echo "installed"
+if test $uninstalled = yes; then
+      # this does not work from buiddir!=srcdir
+      gtkdocdir=`dirname $0`
+      #echo "uninstalled, gtkdocdir=$gtkdocdir"
+else
       # the first two are needed to resolve datadir
       prefix= prefix@
       datarootdir= datarootdir@
       gtkdocdir= datadir@/gtk-doc/data
-else
-      #echo "uninstalled"
-      gtkdocdir=`dirname $0`
 fi
 
 if head -n 1 $document | grep "<?xml" > /dev/null; then
   is_xml=true
+  path_option='--path'
 else
   is_xml=false
+  path_option='--directory'
 fi
 
-# see http://bugzilla.gnome.org/show_bug.cgi?id=467488
-# 
-# XSLTPROC@ --nonet --xinclude \
-#  --stringparam gtkdoc.bookname $module
-#  --stringparam gtkdoc.version"@VERSION@" \
-#  manpages/docbook.xsl $document || exit $?
+# we could do "$path_option $PWD "
+# to avoid needing rewriting entities that are copied from the header
+# into docs under xml
+if test "X$searchpath" = "X"; then
+    path_arg=
+else
+    path_arg="$path_option $searchpath"
+fi
 
+# would it make sens to create man pages only for certain refentries
+# e.g. for tools
 if $is_xml; then
+  # see http://bugzilla.gnome.org/show_bug.cgi?id=467488
+  @XSLTPROC@ $path_arg --nonet --xinclude \
+      --stringparam gtkdoc.bookname $module
+      --stringparam gtkdoc.version"@VERSION@" \
+      manpages/docbook.xsl $document || exit $?
 else
   for i in `cd sgml;ls *.sgml` do
     j=`echo $i | sed 's/.sgml/.man/'`

Modified: trunk/tests/gtk-doc.make
==============================================================================
--- trunk/tests/gtk-doc.make	(original)
+++ trunk/tests/gtk-doc.make	Fri Jan 23 08:02:04 2009
@@ -109,7 +109,7 @@
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
-	gtkdoc-mkhtml --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+	gtkdoc-mkhtml --uninstalled --path="$(abs_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) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \

Modified: trunk/tests/gtk-doc.notmpl.make
==============================================================================
--- trunk/tests/gtk-doc.notmpl.make	(original)
+++ trunk/tests/gtk-doc.notmpl.make	Fri Jan 23 08:02:04 2009
@@ -94,7 +94,7 @@
 	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	@cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
-	gtkdoc-mkhtml --path="$(abs_srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)  $(MKHTML_OPTIONS)
+	gtkdoc-mkhtml --uninstalled --path="$(abs_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) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \