diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-07-13 17:43:37 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-09 12:12:22 +0100 |
commit | 5029d1fb1523e111df482c2a6f69ac9758310691 (patch) | |
tree | 8bd1379f0e19e4736343070689adc1934883da48 /meta/recipes-gnome/gtk-doc | |
parent | 94317f52cec76eeec6dcf885cd1e83dc37f40614 (diff) | |
download | poky-5029d1fb1523e111df482c2a6f69ac9758310691.tar.gz |
gtk-doc: add a recipe, remove gtk-doc-stub
(From OE-Core rev: 8b958312d360e6692dc7c6dd3d2b2591301f9e59)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gtk-doc')
3 files changed, 218 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch new file mode 100644 index 0000000000..99ae4d4417 --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-error-out-if-xsltproc-is-not-found.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 8b7fbbb405959f2868ad6eadd7dd00018758a8a5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 7 Sep 2016 14:52:04 +0300 | ||
4 | Subject: [PATCH] Do not error out if xsltproc is not found. | ||
5 | |||
6 | This allows us to drop the hard xsltproc dependency, if we're not | ||
7 | going to actually run the gtkdoc scripts (when api documentation is | ||
8 | disabled). | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index b0c88d7..2a61d6e 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -58,7 +58,7 @@ dnl Check for xsltproc | ||
21 | dnl | ||
22 | AC_PATH_PROG([XSLTPROC], [xsltproc]) | ||
23 | if test -z "$XSLTPROC"; then | ||
24 | - AC_MSG_ERROR([xsltproc not found]) | ||
25 | + AC_MSG_WARN([xsltproc not found]) | ||
26 | fi | ||
27 | |||
28 | dnl | ||
29 | -- | ||
30 | 2.9.3 | ||
31 | |||
diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch new file mode 100644 index 0000000000..477fc9ae8c --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch | |||
@@ -0,0 +1,139 @@ | |||
1 | From 6fab82b93c7bd301eb42448515b02f7cb3306897 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 31 Aug 2016 16:44:46 +0300 | ||
4 | Subject: [PATCH] Do not hardocode paths to perl/python in scripts. | ||
5 | |||
6 | Doing so when the interpreters are somewhere deep in a sysroot directory | ||
7 | can reach the shebang line limit, and resulting scripts wouldn't work | ||
8 | on targets either. | ||
9 | |||
10 | Upstream-Status: Inappropriate [oe-core specific] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | gtkdoc-check.in | 2 +- | ||
14 | gtkdoc-common.pl.in | 2 +- | ||
15 | gtkdoc-depscan.in | 2 +- | ||
16 | gtkdoc-fixxref.in | 2 +- | ||
17 | gtkdoc-mkdb.in | 2 +- | ||
18 | gtkdoc-mktmpl.in | 2 +- | ||
19 | gtkdoc-rebase.in | 2 +- | ||
20 | gtkdoc-scan.in | 2 +- | ||
21 | gtkdoc-scangobj.in | 2 +- | ||
22 | tests/tools.sh.in | 4 ++-- | ||
23 | 10 files changed, 11 insertions(+), 11 deletions(-) | ||
24 | |||
25 | diff --git a/gtkdoc-check.in b/gtkdoc-check.in | ||
26 | index 560d69b..b60857f 100755 | ||
27 | --- a/gtkdoc-check.in | ||
28 | +++ b/gtkdoc-check.in | ||
29 | @@ -1,4 +1,4 @@ | ||
30 | -#!@PERL@ -w | ||
31 | +#!/usr/bin/env perl | ||
32 | # -*- cperl -*- | ||
33 | # | ||
34 | # gtk-doc - GTK DocBook documentation generator. | ||
35 | diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in | ||
36 | index 4747396..cfadb78 100644 | ||
37 | --- a/gtkdoc-common.pl.in | ||
38 | +++ b/gtkdoc-common.pl.in | ||
39 | @@ -1,4 +1,4 @@ | ||
40 | -#!@PERL@ -w | ||
41 | +#!/usr/bin/env perl | ||
42 | # -*- cperl -*- | ||
43 | # | ||
44 | # gtk-doc - GTK DocBook documentation generator. | ||
45 | diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in | ||
46 | index 83af01b..917e247 100644 | ||
47 | --- a/gtkdoc-depscan.in | ||
48 | +++ b/gtkdoc-depscan.in | ||
49 | @@ -1,4 +1,4 @@ | ||
50 | -#!@PYTHON@ | ||
51 | +#!/usr/bin/env python | ||
52 | |||
53 | import gzip, os.path, re | ||
54 | |||
55 | diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in | ||
56 | index 3d9e8d0..d55190b 100755 | ||
57 | --- a/gtkdoc-fixxref.in | ||
58 | +++ b/gtkdoc-fixxref.in | ||
59 | @@ -1,4 +1,4 @@ | ||
60 | -#!@PERL@ -w | ||
61 | +#!/usr/bin/env perl | ||
62 | # -*- cperl -*- | ||
63 | # | ||
64 | # gtk-doc - GTK DocBook documentation generator. | ||
65 | diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in | ||
66 | index 8dd6d5e..d808750 100755 | ||
67 | --- a/gtkdoc-mkdb.in | ||
68 | +++ b/gtkdoc-mkdb.in | ||
69 | @@ -1,4 +1,4 @@ | ||
70 | -#!@PERL@ -w | ||
71 | +#!/usr/bin/env perl | ||
72 | # -*- cperl -*- | ||
73 | # | ||
74 | # gtk-doc - GTK DocBook documentation generator. | ||
75 | diff --git a/gtkdoc-mktmpl.in b/gtkdoc-mktmpl.in | ||
76 | index c64dfd3..2f46c18 100755 | ||
77 | --- a/gtkdoc-mktmpl.in | ||
78 | +++ b/gtkdoc-mktmpl.in | ||
79 | @@ -1,4 +1,4 @@ | ||
80 | -#!@PERL@ -w | ||
81 | +#!/usr/bin/env perl | ||
82 | # -*- cperl -*- | ||
83 | # | ||
84 | # gtk-doc - GTK DocBook documentation generator. | ||
85 | diff --git a/gtkdoc-rebase.in b/gtkdoc-rebase.in | ||
86 | index 375482d..cf05b45 100644 | ||
87 | --- a/gtkdoc-rebase.in | ||
88 | +++ b/gtkdoc-rebase.in | ||
89 | @@ -1,4 +1,4 @@ | ||
90 | -#!@PERL@ -w | ||
91 | +#!/usr/bin/env perl | ||
92 | # -*- cperl -*- | ||
93 | # | ||
94 | # gtk-doc - GTK DocBook documentation generator. | ||
95 | diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in | ||
96 | index 048e5c9..78c6136 100755 | ||
97 | --- a/gtkdoc-scan.in | ||
98 | +++ b/gtkdoc-scan.in | ||
99 | @@ -1,4 +1,4 @@ | ||
100 | -#!@PERL@ -w | ||
101 | +#!/usr/bin/env perl | ||
102 | # -*- cperl -*- | ||
103 | # | ||
104 | # gtk-doc - GTK DocBook documentation generator. | ||
105 | diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in | ||
106 | index fb66b76..67ee8f7 100644 | ||
107 | --- a/gtkdoc-scangobj.in | ||
108 | +++ b/gtkdoc-scangobj.in | ||
109 | @@ -1,4 +1,4 @@ | ||
110 | -#!@PERL@ -w | ||
111 | +#!/usr/bin/env perl | ||
112 | # -*- cperl -*- | ||
113 | # | ||
114 | # gtk-doc - GTK DocBook documentation generator. | ||
115 | diff --git a/tests/tools.sh.in b/tests/tools.sh.in | ||
116 | index a114a42..7073883 100644 | ||
117 | --- a/tests/tools.sh.in | ||
118 | +++ b/tests/tools.sh.in | ||
119 | @@ -11,7 +11,7 @@ echo "Running suite(s): gtk-doc-$suite"; | ||
120 | |||
121 | # test perl scripts | ||
122 | for file in gtkdoc-check gtkdoc-fixxref gtkdoc-mkdb gtkdoc-mktmpl gtkdoc-rebase gtkdoc-scan gtkdoc-scangobj ; do | ||
123 | - @PERL@ -cwT `which $file` | ||
124 | + perl -cwT `which $file` | ||
125 | if test $? = 1 ; then failed=`expr $failed + 1`; fi | ||
126 | tested=`expr $tested + 1` | ||
127 | done | ||
128 | @@ -34,7 +34,7 @@ done | ||
129 | |||
130 | |||
131 | # test python scripts | ||
132 | -@PYTHON@ -m py_compile `which gtkdoc-depscan` | ||
133 | +python -m py_compile `which gtkdoc-depscan` | ||
134 | if test $? != 0 ; then failed=`expr $failed + 1`; fi | ||
135 | tested=`expr $tested + 1` | ||
136 | |||
137 | -- | ||
138 | 2.9.3 | ||
139 | |||
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb new file mode 100644 index 0000000000..9b9f191e0c --- /dev/null +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.25.bb | |||
@@ -0,0 +1,48 @@ | |||
1 | SUMMARY = "Documentation generator for glib-based software" | ||
2 | DESCRIPTION = "Gtk-doc is a set of scripts that extract specially formatted comments \ | ||
3 | from glib-based software and produce a set of html documentation files from them" | ||
4 | HOMEPAGE = "http://www.gtk.org/gtk-doc/" | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
7 | |||
8 | inherit gnomebase perlnative | ||
9 | |||
10 | # Configure the scripts correctly (and build their dependencies) only if they are actually | ||
11 | # going to be used; otheriwse we need only the m4/makefile includes from the gtk-doc tarball. | ||
12 | PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "api-documentation", "working-scripts", "", d)}" | ||
13 | |||
14 | # This will cause target gtk-doc to hardcode paths of native dependencies | ||
15 | # into its scripts. This means that target gtk-doc package is broken; | ||
16 | # hopefully no one minds because its scripts are not used for anything during build | ||
17 | # and shouldn't be used on targets. | ||
18 | PACKAGECONFIG[working-scripts] = "--with-highlight=source-highlight,--with-highlight=no,libxslt-native xmlto-native source-highlight-native" | ||
19 | |||
20 | SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ | ||
21 | file://0001-Do-not-error-out-if-xsltproc-is-not-found.patch \ | ||
22 | " | ||
23 | |||
24 | SRC_URI[archive.md5sum] = "0dc6570953112a464a409fb99258ccbc" | ||
25 | SRC_URI[archive.sha256sum] = "1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42" | ||
26 | |||
27 | BBCLASSEXTEND = "native" | ||
28 | |||
29 | # Do not check for XML catalogs when building because that | ||
30 | # information is not used for anything during build. Recipe | ||
31 | # dependencies make sure we have all the right bits. | ||
32 | do_configure_prepend() { | ||
33 | sed -i -e 's,^JH_CHECK_XML_CATALOG.*,,' ${S}/configure.ac | ||
34 | } | ||
35 | |||
36 | FILES_${PN} += "${datadir}/sgml" | ||
37 | FILES_${PN}-dev += "${libdir}/cmake" | ||
38 | FILES_${PN}-doc = "" | ||
39 | |||
40 | SYSROOT_PREPROCESS_FUNCS_append_class-native = " gtkdoc_makefiles_sysroot_preprocess" | ||
41 | gtkdoc_makefiles_sysroot_preprocess() { | ||
42 | # Patch the gtk-doc makefiles so that the qemu wrapper is used to run transient binaries | ||
43 | # instead of libtool wrapper or running them directly | ||
44 | sed -i \ | ||
45 | -e "s|GTKDOC_RUN =.*|GTKDOC_RUN = \$(top_builddir)/gtkdoc-qemuwrapper|" \ | ||
46 | ${SYSROOT_DESTDIR}${datadir}/gtk-doc/data/gtk-doc*make | ||
47 | } | ||
48 | |||