[gnunet] branch master updated: BUILD: Meson, better handbook generation

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new de0e87f75 BUILD: Meson, better handbook generation
de0e87f75 is described below

commit de0e87f752f868e8e7b6de7a455cf3c52fe1fa40
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Sep 29 22:19:06 2023 +0200

    BUILD: Meson, better handbook generation
---
 contrib/gana             |  2 +-
 contrib/sphinx           |  2 +-
 doc/handbook/meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++
 doc/meson.build          | 24 +-----------------------
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index c9bda2187..c1dc2dc97 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit c9bda21875ea1775f88b71de735d527132e45922
+Subproject commit c1dc2dc975742c929a523c22d91f7d4f82787230
diff --git a/contrib/sphinx b/contrib/sphinx
index 0cccef450..9c5b9d904 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 0cccef450b037a48170402117f7d3b6c0a4272af
+Subproject commit 9c5b9d9040d21542eff792e26624cf9669b127aa
diff --git a/doc/handbook/meson.build b/doc/handbook/meson.build
new file mode 100644
index 000000000..9d33a277b
--- /dev/null
+++ b/doc/handbook/meson.build
@@ -0,0 +1,42 @@
+fs = import('fs')
+makeinfo = find_program('makeinfo', native: true, required: false)
+sphinx = find_program('sphinx-build', native: true, required: false)
+
+if fs.exists('html')
+  install_subdir('html',
+                 install_dir: docdir,
+                 strip_directory: false)
+else
+  if sphinx.found()
+    sphinxhandbook = custom_target('handbook-html',
+      output: 'html',
+      command: [sphinx,
+              '-M', 'html',
+              meson.project_source_root()/'contrib'/'sphinx', 
meson.current_build_dir()],
+      install: true,
+      install_dir: docdir)
+  endif
+endif
+
+if fs.exists('texinfo')
+  install_data('handbook/texinfo/gnunet.info',
+               install_dir: get_option('infodir'))
+else
+  if sphinx.found()
+    sphinxhandbooktexi = custom_target('handbook-texinfo',
+      output: ['texinfo'],
+      command: [sphinx,
+              '-M', 'texinfo',
+              meson.project_source_root()/'contrib'/'sphinx', 
meson.current_build_dir()],
+      install: false,
+      install_dir: get_option('infodir'))
+    custom_target('gnunet.info',
+    output: 'gnunet.info',
+    depends: sphinxhandbooktexi,
+    command: [makeinfo, '--no-split', '--no-headers',
+              meson.current_build_dir()/'texinfo'/'gnunet.texi', '-o', 
'@OUTPUT0@'],
+      install: true,
+      install_dir: get_option('infodir'))
+  endif
+endif
+
diff --git a/doc/meson.build b/doc/meson.build
index 6bbc2b43e..84b3cfde2 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,24 +1,2 @@
-fs = import('fs')
-
-if fs.exists('handbook'/'html')
-  install_subdir('handbook/html',
-                 install_dir: docdir,
-                 strip_directory: false)
-else
-  sphinx = find_program('sphinx-build', native: true, required: true)
-
-  if sphinx.found()
-    sphinxhandbook = custom_target('handbook',
-      output: 'handbook',
-      command: [sphinx,
-              '-b', 'html',
-              #'-b', 'info',
-              meson.project_source_root()/'contrib'/'sphinx', 
'@OUTPUT@'/'html'],
-      install: true,
-      install_dir: docdir)
-  endif
-endif
-
-#install_data('handbook/texinfo/gnunet.texi',
-#             install_dir: get_option('infodir'))
+subdir('handbook')
 subdir('man')

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.