[anjuta] Port to new documentation infrastruture

[Javier JardÃn <jjardon src gnome org>]

commit 02fad1a3ca03f91fc28eb09c37237470a406c3db
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Sep 4 13:38:05 2012 +0900

    Port to new documentation infrastruture
    
    Use yelp-tools instead gnome-doc-utils

 autogen.sh                                         |    1 -
 configure.ac                                       |    2 +-
 libanjuta/anjuta-utils.c                           |    4 +-
 .../C/{anjuta-build-tutorial.xml => index.docbook} |    0
 manuals/anjuta-build-tutorial/Makefile.am          |   14 +++++++-----
 .../anjuta-build-tutorial-C.omf                    |   21 --------------------
 manuals/anjuta-faqs/Makefile.am                    |   11 ++++-----
 manuals/anjuta-manual/Makefile.am                  |   11 ++++-----
 manuals/anjuta-manual/anjuta-manual.omf.in         |    9 --------
 plugins/am-project/tests/anjuta.lst                |    6 ++--
 plugins/am-project/tests/nemiver.lst               |    1 -
 plugins/am-project/tests/nemiver.shar              |   21 +++++++++----------
 plugins/starter/starter.ui                         |    4 +-
 13 files changed, 36 insertions(+), 69 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 845d783..951a943 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,6 @@ test -n "$srcdir" || srcdir=.
 (
  cd "$srcdir" &&
  gtkdocize &&
- gnome-doc-prepare --automake --copy --force &&
  autopoint --force &&
  AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install
 ) || exit
diff --git a/configure.ac b/configure.ac
index d655e3c..106c1b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,7 +384,7 @@ GTK_DOC_CHECK([1.4])
 dnl ***************************************************************************
 dnl User manual
 dnl ***************************************************************************
-GNOME_DOC_INIT([0.18])
+YELP_HELP_INIT
 
 dnl Define convenience macros
 dnl -------------------------
diff --git a/libanjuta/anjuta-utils.c b/libanjuta/anjuta-utils.c
index 76b46b7..2967ca8 100644
--- a/libanjuta/anjuta-utils.c
+++ b/libanjuta/anjuta-utils.c
@@ -1916,9 +1916,9 @@ anjuta_util_help_display (GtkWidget   *parent,
 	gchar *command;
 
 
-	command = g_strdup_printf ("yelp ghelp:%s%s%s",
+	command = g_strdup_printf ("yelp help:%s%s%s",
 	                           doc_id,
-	                           item == NULL ? "" : "?",
+	                           item == NULL ? "" : "/",
 	                           item == NULL ? "" : item);
 
 	if (!g_spawn_command_line_async (command, &error) &&
diff --git a/manuals/anjuta-build-tutorial/C/anjuta-build-tutorial.xml b/manuals/anjuta-build-tutorial/C/index.docbook
similarity index 100%
rename from manuals/anjuta-build-tutorial/C/anjuta-build-tutorial.xml
rename to manuals/anjuta-build-tutorial/C/index.docbook
diff --git a/manuals/anjuta-build-tutorial/Makefile.am b/manuals/anjuta-build-tutorial/Makefile.am
index 39ebddf..2634961 100644
--- a/manuals/anjuta-build-tutorial/Makefile.am
+++ b/manuals/anjuta-build-tutorial/Makefile.am
@@ -1,9 +1,11 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
-DOC_MODULE = anjuta-build-tutorial
-DOC_ENTITIES = anjuta-build-tutorial.xml 
-DOC_AM_CPPFLAGS =
-DOC_FIGURES = figures/autotools-process.png \
+ YELP_HELP_RULES@
+
+HELP_ID = anjuta-build-tutorial
+
+HELP_FILES = \
+	index.docbook
+
+HELP_FIGURES = figures/autotools-process.png \
 	      figures/configure-process.png \
    	      figures/new-project-message.png \
               figures/build_preferences.png \
diff --git a/manuals/anjuta-faqs/Makefile.am b/manuals/anjuta-faqs/Makefile.am
index a2f97fa..318f486 100644
--- a/manuals/anjuta-faqs/Makefile.am
+++ b/manuals/anjuta-faqs/Makefile.am
@@ -1,8 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 
+HELP_ID = anjuta-faqs
 
-DOC_ID = anjuta-faqs
-DOC_PAGES = \
+HELP_FILES = \
 	index.page \
 	editor-maximize.page \
 	editor-scintilla.page \
@@ -12,8 +12,7 @@ DOC_PAGES = \
 	general-windows.page \
 	project-existing.page \
 	project-resource.page
-DOC_LINGUAS = de
-DOC_FIGURES =
 
-dist-hook: doc-dist-hook
+HELP_LINGUAS = de
+
 -include $(top_srcdir)/git.mk
diff --git a/manuals/anjuta-manual/Makefile.am b/manuals/anjuta-manual/Makefile.am
index ab05622..d4a6d0f 100644
--- a/manuals/anjuta-manual/Makefile.am
+++ b/manuals/anjuta-manual/Makefile.am
@@ -1,9 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 
-dist-hook: doc-dist-hook
+HELP_ID = anjuta-manual
 
-DOC_ID = anjuta-manual
-DOC_PAGES = \
+HELP_FILES = \
 	index.page \
 	anjuta-code-assist.page \
 	anjuta-code-help.page \
@@ -73,9 +72,9 @@ DOC_PAGES = \
 	run-run.page \
 	widget-index.page
 	
-DOC_FIGURES = figures/anjuta_logo.png \
+HELP_FIGURES = figures/anjuta_logo.png \
 	      figures/anjuta-in-action.png
 
-DOC_LINGUAS = cs da de el es eu fr gl ja oc pt_BR ro sl sv th uk zh_CN
+HELP_LINGUAS = cs da de el es eu fr gl ja oc pt_BR ro sl sv th uk zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/plugins/am-project/tests/anjuta.lst b/plugins/am-project/tests/anjuta.lst
index 6d9e36c..7c68ba5 100644
--- a/plugins/am-project/tests/anjuta.lst
+++ b/plugins/am-project/tests/anjuta.lst
@@ -2839,13 +2839,13 @@ ROOT (): anjuta
             SOURCE (): git.mk
         GROUP (): anjuta-manual
             SOURCE (): manuals/anjuta-manual/Makefile.am
-            SOURCE (): gnome-doc-utils.make
+            SOURCE (): git.mk
         GROUP (): anjuta-faqs
             SOURCE (): manuals/anjuta-faqs/Makefile.am
-            SOURCE (): gnome-doc-utils.make
+            SOURCE (): git.mk
         GROUP (): anjuta-build-tutorial
             SOURCE (): manuals/anjuta-build-tutorial/Makefile.am
-            SOURCE (): gnome-doc-utils.make
+            SOURCE (): git.mk
         SOURCE (): manuals/Makefile.am
         SOURCE (): git.mk
     GROUP (): mime
diff --git a/plugins/am-project/tests/nemiver.lst b/plugins/am-project/tests/nemiver.lst
index 8c81f76..06509da 100644
--- a/plugins/am-project/tests/nemiver.lst
+++ b/plugins/am-project/tests/nemiver.lst
@@ -549,7 +549,6 @@ ROOT (): nemiver
         SOURCE (): docs/Makefile.am
     GROUP (): help
         SOURCE (): help/Makefile.am
-        SOURCE (): gnome-doc-utils.make
     TARGET (): publicheaders
         PROPERTY (Installation directory): publicheadersdir
         SOURCE (): config.h
diff --git a/plugins/am-project/tests/nemiver.shar b/plugins/am-project/tests/nemiver.shar
index 5e75e1d..1eef638 100644
--- a/plugins/am-project/tests/nemiver.shar
+++ b/plugins/am-project/tests/nemiver.shar
@@ -81,12 +81,12 @@ ${echo} "x - SKIPPING nemiver/help/Makefile.am (file already exists)"
 else
 ${echo} "x - extracting nemiver/help/Makefile.am (text)"
   sed 's/^X//' << 'SHAR_EOF' > 'nemiver/help/Makefile.am' &&
-Xinclude $(top_srcdir)/gnome-doc-utils.make
-Xdist-hook: doc-dist-hook
-XDOC_MODULE = nemiver
-XDOC_ENTITIES =
-XDOC_INCLUDES = legal.xml
-XDOC_FIGURES = \
+X YELP_HELP_RULES@
+XHELP_ID = nemiver
+XHELP_FILES = \
+X	index.docbook \
+X	legal.xml
+XHELP_FIGURES = \
 X			  figures/attach-dialog.png \
 X			  figures/execute-dialog.png \
 X			  figures/load-core-dialog.png \
@@ -101,7 +101,7 @@ X			  figures/registers-view.png \
 X			  figures/connect-remote-dialog.png \
 X			  figures/enabled-breakpoint.png \
 X			  figures/disabled-breakpoint.png
-XDOC_LINGUAS = cs de es oc sv
+XHELP_LINGUAS = cs de es oc sv
 SHAR_EOF
 :
 if test $? -ne 0
@@ -683,8 +683,8 @@ XINSTALL \
 XCOPYING \
 XCOPYRIGHT \
 X$(headers) \
-X$(INTLTOOL_FILES) \
-Xgnome-doc-utils.make
+X$(INTLTOOL_FILES)
+X
 X
 Xdoc:
 X	$(MAKE) -C docs doc
@@ -765,8 +765,7 @@ X	@echo ""
 X	@echo "Last but not least, do not forget to bump up the micro"
 X	@echo "version component to the next (odd) number and commit."
 X
-XDISTCLEANFILES = $(INTLTOOL_FILES:.in=) \
-X	gnome-doc-utils.make
+XDISTCLEANFILES = $(INTLTOOL_FILES:.in=)
 X
 XDISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
 SHAR_EOF
diff --git a/plugins/starter/starter.ui b/plugins/starter/starter.ui
index 9a31270..7da4df1 100644
--- a/plugins/starter/starter.ui
+++ b/plugins/starter/starter.ui
@@ -225,7 +225,7 @@
                         <property name="halign">start</property>
                         <property name="use_action_appearance">False</property>
                         <property name="relief">none</property>
-                        <property name="uri">ghelp:anjuta-manual</property>
+                        <property name="uri">help:anjuta-manual</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -243,7 +243,7 @@
                         <property name="halign">start</property>
                         <property name="use_action_appearance">False</property>
                         <property name="relief">none</property>
-                        <property name="uri">ghelp:anjuta-faqs</property>
+                        <property name="uri">help:anjuta-faqs</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>