[accerciser] Use yelp-tools instead of gnome-doc-utils
- From: Javier HernÃndez AntÃnez <jhernandez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [accerciser] Use yelp-tools instead of gnome-doc-utils
- Date: Mon, 3 Sep 2012 23:38:24 +0000 (UTC)
commit 5541174d79aae7dd8ff04469ccaf0f5ab252d348
Author: Oliver Propst <oliver propst gmail com>
Date: Tue Sep 4 01:34:38 2012 +0200
Use yelp-tools instead of gnome-doc-utils
.gitignore | 3 ---
Makefile.am | 2 --
autogen.sh | 9 ++++++++-
configure.in | 2 +-
help/Makefile.am | 13 ++++++-------
help/accerciser.omf.in | 11 -----------
src/lib/accerciser/accerciser.py | 4 ++--
7 files changed, 17 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4054155..72c9963 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@
config.*
*.spec
*.mo
-*.omf
*.gmo
*~
accerciser-*.tar.gz
@@ -23,11 +22,9 @@ py-compile
intltool-*
aclocal.m4
autom4te.cache
-omf.make
xmldocs.make
src/accerciser
i18n.py
install-sh
-gnome-doc-utils.make
stamp-it
POTFILES
diff --git a/Makefile.am b/Makefile.am
index 00ceda2..d256650 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,6 @@ EXTRA_DIST = \
$(desktop_DATA) \
pyreqs.py \
accerciser.spec \
- gnome-doc-utils.make \
$(INTLTOOL) \
$(gsettings_files)
@@ -36,6 +35,5 @@ DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
- gnome-doc-utils.make \
$(gsettings_SCHEMAS)
diff --git a/autogen.sh b/autogen.sh
index 74df883..1b9420f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,5 +3,12 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
+
+GNOMEDOC=`which yelp-build`
+if test -z $GNOMEDOC; then
+echo "*** The tools to build the documentation are not found,"
+echo " please install the yelp-tool package ***"
+fi
+
REQUIRED_AUTOMAKE_VERSION=1.7.2
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index 00e13be..b25e26d 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR(src/accerciser.in)
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE([enable])
-GNOME_DOC_INIT([0.17.3])
+YELP_HELP_INIT
dnl == check for python ==
AM_PATH_PYTHON(2.7)
diff --git a/help/Makefile.am b/help/Makefile.am
index b230c01..1a98d09 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
-DOC_ID = accerciser
-DOC_FIGURES = \
+HELP_ID= accerciser
+
+HELP_MEDIA = \
figures/accerciser-logo.png \
figures/highlighting.png \
figures/accerciser_preferences.png \
@@ -18,7 +19,7 @@ DOC_FIGURES = \
figures/validator_report.png \
figures/global-hotkeys.png
-DOC_PAGES = \
+HELP_FILES = \
api_browser_plugin.page \
desktop_tree_view.page \
event_monitor_plugin.page \
@@ -32,6 +33,4 @@ DOC_PAGES = \
quick_select_plugin.page \
validator_plugin.page
-DISTCLEANFILES = accerciser-C.omf
-DOC_LINGUAS = ca cs de el en_GB es fr gl it ja oc pl pt_BR sl sv uk zh_CN
-dist-hook: doc-dist-hook
+HELP_LINGUAS = ca cs de el en_GB es fr gl it ja oc pl pt_BR sl sv uk zh_CN
diff --git a/src/lib/accerciser/accerciser.py b/src/lib/accerciser/accerciser.py
index 8b18581..ec703a5 100644
--- a/src/lib/accerciser/accerciser.py
+++ b/src/lib/accerciser/accerciser.py
@@ -144,9 +144,9 @@ class Main(Tools):
@param widget: The widget that emitted the signal that this callback caught.
@type widget: L{gtk.Widget}
'''
- uri = "ghelp:accerciser"
+ uri = "help:accerciser"
if page:
- uri += "?%s" % page
+ uri += "/%s" % page
gtk.show_uri(gdk.Screen.get_default(),
uri,
gtk.get_current_event_time())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]