From e6d92d4fefe1376a107cce5dbac3af84cf9a1054 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 17 Mar 2021 00:16:49 +0200 Subject: [PATCH] meson: Generate version.texi for guile, mu4e So we can build from a clean git clone. --- guile/meson.build | 11 ++++++----- meson.build | 16 ++++++++++++++++ mu4e/meson.build | 3 ++- version.texi.in | 4 ++++ 4 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 version.texi.in diff --git a/guile/meson.build b/guile/meson.build index f333d47c..ff6e84f8 100644 --- a/guile/meson.build +++ b/guile/meson.build @@ -55,13 +55,14 @@ lib_guile_mu = shared_module( if makeinfo.found() custom_target('mu_guile_info', - input: 'mu-guile.texi', - output: 'mu-guile.info', + input: 'mu-guile.texi', + output: 'mu-guile.info', install: true, install_dir: infodir, - command: [makeinfo, - '-o', join_paths(meson.current_build_dir(), 'mu-guile.info'), - join_paths(meson.current_source_dir(), 'mu-guile.texi')]) + command: [makeinfo, + '-o', join_paths(meson.current_build_dir(), 'mu-guile.info'), + join_paths(meson.current_source_dir(), 'mu-guile.texi'), + '-I', join_paths(meson.current_build_dir(), '..')]) endif guile_scm_dir=join_paths(datadir, 'guile', 'site', '3.0', 'mu') diff --git a/meson.build b/meson.build index e2eec9a8..aec9d661 100644 --- a/meson.build +++ b/meson.build @@ -157,6 +157,22 @@ config_h_dep=declare_dependency( include_directories: include_directories(['.'])) ################################################################################ + + +################################################################################ +# write out version.texi (for texiinfo builds in mu4e, guile) +version_texi_data=configuration_data() +version_texi_data.set('VERSION', meson.project_version()) +version_texi_data.set('EDITION', meson.project_version()) +version_texi_data.set('UPDATED', run_command('date', '+%d %B %Y').stdout().strip()) +version_texi_data.set('UPDATEDMONTH', run_command('date', '+%B %Y').stdout().strip()) + +configure_file(input: 'version.texi.in', + output: 'version.texi', + configuration: version_texi_data) +################################################################################ + + ################################################################################ # subdirs subdir('lib') diff --git a/mu4e/meson.build b/mu4e/meson.build index ea2971c5..2cc3d9a1 100644 --- a/mu4e/meson.build +++ b/mu4e/meson.build @@ -78,5 +78,6 @@ if makeinfo.found() install: true, command: [makeinfo, '-o', join_paths(meson.current_build_dir(), 'mu4e.info'), - join_paths(meson.current_source_dir(), 'mu4e.texi')]) + join_paths(meson.current_source_dir(), 'mu4e.texi'), + '-I', join_paths(meson.current_build_dir(), '..')]) endif diff --git a/version.texi.in b/version.texi.in new file mode 100644 index 00000000..77a20733 --- /dev/null +++ b/version.texi.in @@ -0,0 +1,4 @@ +@set UPDATED @UPDATED@ +@set UPDATED-MONTH @UPDATEDMONTH@ +@set EDITION @VERSION@ +@set VERSION @VERSION@