[gimp/meson: 555/805] Add basic files for devel-docs. Not working because of include_dir to source_root missing. Ticket pe
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 555/805] Add basic files for devel-docs. Not working because of include_dir to source_root missing. Ticket pe
- Date: Fri, 2 Feb 2018 15:20:31 +0000 (UTC)
commit 1db3c7fe155c19f57dfecb819740dbb1df457e36
Author: Félix Piédallu <felix piedallu me>
Date: Mon Jan 8 16:56:15 2018 +0100
Add basic files for devel-docs. Not working because of include_dir to source_root missing. Ticket pending.
devel-docs/app/meson.build | 42 ++++++++++++++++++
devel-docs/libgimp/meson.build | 77 ++++++++++++++++++---------------
devel-docs/libgimpbase/meson.build | 45 +++++++++++++++++++
devel-docs/libgimpcolor/meson.build | 38 ++++++++++++++++
devel-docs/libgimpconfig/meson.build | 41 +++++++++++++++++
devel-docs/libgimpmath/meson.build | 38 ++++++++++++++++
devel-docs/libgimpmodule/meson.build | 38 ++++++++++++++++
devel-docs/libgimpthumb/meson.build | 40 +++++++++++++++++
devel-docs/libgimpwidgets/meson.build | 61 ++++++++++++++++++++++++++
devel-docs/meson.build | 18 ++++----
meson.build | 7 +--
11 files changed, 397 insertions(+), 48 deletions(-)
---
diff --git a/devel-docs/app/meson.build b/devel-docs/app/meson.build
new file mode 100644
index 0000000..cf767ba
--- /dev/null
+++ b/devel-docs/app/meson.build
@@ -0,0 +1,42 @@
+module_name = 'app'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ content_files: [],
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ fixxref_args: [
+ '--extra-dir=' + join_paths(meson.current_build_dir(), '..', 'libgimpbase', 'html'),
+ '--extra-dir=' + join_paths(meson.current_build_dir(), '..', 'libgimpcolor', 'html'),
+ '--extra-dir=' + join_paths(meson.current_build_dir(), '..', 'libgimpconfig', 'html'),
+ '--extra-dir=' + join_paths(meson.current_build_dir(), '..', 'libgimpmath', 'html'),
+ '--extra-dir=' + join_paths(meson.current_build_dir(), '..', 'libgimpwidgets', 'html'),
+ ],
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ scanobjs_args: [
+ '--cflags=-I'+ meson.source_root(),
+ ],
+ ignore_headers: [
+ 'gimp-intl.h',
+ 'gimpdbusservice-glue.h',
+ 'gimphelp-ids.h',
+ 'gimpimage-convert-data.h',
+ 'gimpimage-convert-fsdither.h',
+ 'gimprc-blurbs.h',
+ ],
+ html_assets: [],
+ html_args: [],
+ main_sgml: module_name + '-docs.sgml',
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ install: true,
+ # install_dir: ,
+)
diff --git a/devel-docs/libgimp/meson.build b/devel-docs/libgimp/meson.build
index 16faebe..2c792af 100644
--- a/devel-docs/libgimp/meson.build
+++ b/devel-docs/libgimp/meson.build
@@ -1,36 +1,33 @@
-# version_file = configure_file
+module_name = 'libgimp'
-gnome.gtkdoc('libgimp',
- main_sgml: 'libgimp-docs.sgml',
- src_dir: [
- join_paths(meson.source_root(), 'libgimp'),
- ],
- scan_args: [
- '--deprecated-guards="GIMP_DISABLE_DEPRECATED"',
- ],
- scanobjs_args: [
- '--verbose',
- ],
- include_directories: [
- include_directories('../../../'),
- ],
- gobject_typesfile: join_paths(meson.source_root(), meson.current_source_dir(), 'libgimp.types'),
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
- dependencies: [
- gtk2, glib
- ],
- fixxref_args: [
- '--extra-dir='+join_paths(meson.source_root(), 'libgimpbase/html'),
- '--extra-dir='+join_paths(meson.source_root(), 'libgimpcolor/html'),
- '--extra-dir='+join_paths(meson.source_root(), 'libgimpconfig/html'),
- '--extra-dir='+join_paths(meson.source_root(), 'libgimpmath/html'),
- '--extra-dir='+join_paths(meson.source_root(), 'libgimpwidgets/html'),
+gimp_dep = declare_dependency(
+ include_directories: rootInclude,
+ link_with: [
+ libgimp,
+ libgimpui,
+ libgimpbase,
+ libgimpcolor,
+ libgimpconfig,
+ libgimpmath,
+ libgimpui,
+ libgimpwidgets,
+ ]
+)
- # '--extra-dir='+join_paths(meson.build_root(), 'libgimpbase/html'),
- # '--extra-dir='+join_paths(meson.build_root(), 'libgimpcolor/html'),
- # '--extra-dir='+join_paths(meson.build_root(), 'libgimpconfig/html'),
- # '--extra-dir='+join_paths(meson.build_root(), 'libgimpmath/html'),
- # '--extra-dir='+join_paths(meson.build_root(), 'libgimpwidgets/html'),
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
],
ignore_headers: [
'gimptilebackendplugin.h',
@@ -39,13 +36,23 @@ gnome.gtkdoc('libgimp',
'libgimp-intl.h',
'stdplugins-intl.h',
],
- content_files: [
- 'libgimp-sections.txt',
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ gimp_dep,
],
- html_args: [
+ scanobjs_args: [
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
],
mkdb_args: [
- # '--name-space=gimp',
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ ],
+ html_assets: [
+ ],
+ html_args: [
],
- install: false,
)
diff --git a/devel-docs/libgimpbase/meson.build b/devel-docs/libgimpbase/meson.build
new file mode 100644
index 0000000..a28ecba
--- /dev/null
+++ b/devel-docs/libgimpbase/meson.build
@@ -0,0 +1,45 @@
+module_name = 'libgimpbase'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
+ ],
+ ignore_headers: [
+ 'gimpbase-private.h',
+ 'gimpbase.h',
+ 'gimpcompatenums.h',
+ 'gimpprotocol.h',
+ 'gimpreloc.h',
+ 'gimpwin32-io.h',
+ 'gimpwire.h',
+ ],
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ scanobjs_args: [
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
+ ],
+ mkdb_args: [
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ ],
+ html_assets: [
+ ],
+ html_args: [
+ ],
+)
diff --git a/devel-docs/libgimpcolor/meson.build b/devel-docs/libgimpcolor/meson.build
new file mode 100644
index 0000000..ec8e94e
--- /dev/null
+++ b/devel-docs/libgimpcolor/meson.build
@@ -0,0 +1,38 @@
+module_name = 'libgimpcolor'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
+ ],
+ ignore_headers: [
+ ],
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ scanobjs_args: [
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
+ ],
+ mkdb_args: [
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ ],
+ html_assets: [
+ ],
+ html_args: [
+ ],
+)
diff --git a/devel-docs/libgimpconfig/meson.build b/devel-docs/libgimpconfig/meson.build
new file mode 100644
index 0000000..d32eec2
--- /dev/null
+++ b/devel-docs/libgimpconfig/meson.build
@@ -0,0 +1,41 @@
+module_name = 'libgimpconfig'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
+ ],
+ ignore_headers: [
+ ],
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ scanobjs_args: [
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
+ ],
+ mkdb_args: [
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpbase', 'html'),
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpcolor', 'html'),
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpmath', 'html'),
+ ],
+ html_assets: [
+ ],
+ html_args: [
+ ],
+)
diff --git a/devel-docs/libgimpmath/meson.build b/devel-docs/libgimpmath/meson.build
new file mode 100644
index 0000000..79b42ec
--- /dev/null
+++ b/devel-docs/libgimpmath/meson.build
@@ -0,0 +1,38 @@
+module_name = 'libgimpmath'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
+ ],
+ ignore_headers: [
+ ],
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ scanobjs_args: [
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
+ ],
+ mkdb_args: [
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ ],
+ html_assets: [
+ ],
+ html_args: [
+ ],
+)
diff --git a/devel-docs/libgimpmodule/meson.build b/devel-docs/libgimpmodule/meson.build
new file mode 100644
index 0000000..ac62326
--- /dev/null
+++ b/devel-docs/libgimpmodule/meson.build
@@ -0,0 +1,38 @@
+module_name = 'libgimpmodule'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
+ ],
+ ignore_headers: [
+ ],
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ scanobjs_args: [
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
+ ],
+ mkdb_args: [
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ ],
+ html_assets: [
+ ],
+ html_args: [
+ ],
+)
diff --git a/devel-docs/libgimpthumb/meson.build b/devel-docs/libgimpthumb/meson.build
new file mode 100644
index 0000000..d841298
--- /dev/null
+++ b/devel-docs/libgimpthumb/meson.build
@@ -0,0 +1,40 @@
+module_name = 'libgimpthumb'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
+ ],
+ ignore_headers: [
+ 'libgimpthumb.h',
+ ],
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ scanobjs_args: [
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
+ ],
+ mkdb_args: [
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpmath', 'html'),
+ ],
+ html_assets: [
+ ],
+ html_args: [
+ ],
+)
diff --git a/devel-docs/libgimpwidgets/meson.build b/devel-docs/libgimpwidgets/meson.build
new file mode 100644
index 0000000..6361d3d
--- /dev/null
+++ b/devel-docs/libgimpwidgets/meson.build
@@ -0,0 +1,61 @@
+module_name = 'libgimpwidgets'
+
+version_data = configuration_data()
+version_data.set('GIMP_VERSION', meson.project_version())
+configure_file(
+ input : 'version.in',
+ output: 'version',
+ configuration: version_data,
+)
+
+gnome.gtkdoc(module_name,
+ main_sgml: module_name + '-docs.sgml',
+ gobject_typesfile: join_paths(meson.current_source_dir(), module_name + '.types'),
+ src_dir: join_paths(meson.source_root(), module_name),
+
+ content_files: [
+ 'visual-index.html'
+ ],
+ ignore_headers: [
+ 'gimpcolorprofilestore-private.h',
+ 'gimpeevl.h',
+ 'gimpwidgets-private.h',
+ ],
+
+ dependencies: [
+ fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ ],
+ scanobjs_args: [
+ '--type-init-func="do { void babl_init (void); babl_init (); } while (0)"',
+ ],
+ scan_args: [
+ '--deprecated-guards=GIMP_DISABLE_DEPRECATED',
+ ],
+ mkdb_args: [
+ '--name-space=gimp',
+ ],
+ fixxref_args: [
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimp', 'html'),
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpbase', 'html'),
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpcolor', 'html'),
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpconfig','html'),
+ '--extra-dir='+ join_paths(meson.current_build_dir(), '..', 'libgimpmath', 'html'),
+ ],
+ html_assets: [
+ # '$(top_srcdir)/icons/Color/12/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/16/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/18/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/20/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/22/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/24/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/32/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/48/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/64/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/128/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/192/gimp-*.png',
+ # '$(top_srcdir)/icons/Color/256/gimp-*.png',
+ # '$(srcdir)/images/gimp-widget-*.png',
+ ],
+ html_args: [
+ ],
+)
diff --git a/devel-docs/meson.build b/devel-docs/meson.build
index 375650d..de928ba 100644
--- a/devel-docs/meson.build
+++ b/devel-docs/meson.build
@@ -1,12 +1,12 @@
if have_gtk_doc
# subdir('app')
- # subdir('libgimp')
- # subdir('libgimpbase')
- # subdir('libgimpcolor')
- # subdir('libgimpconfig')
- # subdir('libgimpmath')
- # subdir('libgimpmodule')
- # subdir('libgimpthumb')
- # subdir('libgimpwidgets')
- # subdir('tools')
endif
+subdir('libgimp')
+subdir('libgimpbase')
+subdir('libgimpcolor')
+subdir('libgimpconfig')
+subdir('libgimpmath')
+subdir('libgimpmodule')
+subdir('libgimpthumb')
+subdir('libgimpwidgets')
+# subdir('tools')
diff --git a/meson.build b/meson.build
index 9f7dc33..4c91648 100644
--- a/meson.build
+++ b/meson.build
@@ -843,10 +843,6 @@ subdir('m4macros')
subdir('menus')
subdir('themes')
-# Docs
-subdir('devel-docs')
-subdir('docs')
-
# Libraries (order here is important!)
subdir('libgimpcolor')
subdir('libgimpmath')
@@ -867,6 +863,9 @@ subdir('tools/pdbgen')
# build/windows/gimp-plug-ins.rc
# build/windows/gimp.rc
+# Docs
+subdir('devel-docs')
+subdir('docs')
# configure_file(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]