[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 124/142] meson: generate version.texi
From: |
Paolo Bonzini |
Subject: |
[PATCH 124/142] meson: generate version.texi |
Date: |
Tue, 28 Jan 2020 18:53:24 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile | 6 ------
docs/meson.build | 4 ++++
docs/version.texi.in | 2 ++
3 files changed, 6 insertions(+), 6 deletions(-)
create mode 100644 docs/version.texi.in
diff --git a/Makefile b/Makefile
index c8681ddec7..2614138f62 100644
--- a/Makefile
+++ b/Makefile
@@ -379,12 +379,6 @@ MAKEINFOFLAGS=--no-split --number-sections
$(MAKEINFOINCLUDES)
TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)"
-DCONFDIR="$(qemu_confdir)"
TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
-docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
- $(call quiet-command,(\
- echo "@set VERSION $(VERSION)" && \
- echo "@set CONFDIR $(qemu_confdir)" \
- )> $@,"GEN","$@")
-
%.html: %.texi docs/version.texi
$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers
\
--html $< -o $@,"GEN","$@")
diff --git a/docs/meson.build b/docs/meson.build
index 0f86c0b522..124987dc57 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,7 @@
+configure_file(output: 'version.texi',
+ input: 'version.texi.in',
+ configuration: config_host)
+
sphinx = find_program('sphinx-build', required: build_docs)
SPHINX_ARGS = [sphinx, '-W', '-q', '-d', '@PRIVATE_DIR@',
diff --git a/docs/version.texi.in b/docs/version.texi.in
new file mode 100644
index 0000000000..0a723b8be6
--- /dev/null
+++ b/docs/version.texi.in
@@ -0,0 +1,2 @@
+@set VERSION @VERSION@
+@set CONFDIR @qemu_confdir@
--
2.21.0
- [PATCH 115/142] meson: bsd-user, (continued)
- [PATCH 115/142] meson: bsd-user, Paolo Bonzini, 2020/01/28
- [PATCH 112/142] meson: target, Paolo Bonzini, 2020/01/28
- [PATCH 116/142] meson: cpu-emu, Paolo Bonzini, 2020/01/28
- [PATCH 117/142] meson: softmmu, Paolo Bonzini, 2020/01/28
- [PATCH 118/142] meson: plugins, Paolo Bonzini, 2020/01/28
- [PATCH 120/142] meson: generate systemtap tapset files, Paolo Bonzini, 2020/01/28
- [PATCH 121/142] build-sys/rules.mak: remove version.o, Paolo Bonzini, 2020/01/28
- [PATCH 119/142] Aaaaallelujah!, Paolo Bonzini, 2020/01/28
- [PATCH 122/142] remove Makefile.target, Paolo Bonzini, 2020/01/28
- [PATCH 123/142] meson: sphinx-build, Paolo Bonzini, 2020/01/28
- [PATCH 124/142] meson: generate version.texi,
Paolo Bonzini <=
- [PATCH 126/142] meson: add NSIS building, Paolo Bonzini, 2020/01/28
- [PATCH 125/142] meson: build texi doc, Paolo Bonzini, 2020/01/28
- [PATCH 127/142] meson: install some scripts, Paolo Bonzini, 2020/01/28
- [PATCH 128/142] meson: install edk2, Paolo Bonzini, 2020/01/28
- [PATCH 130/142] meson: install edk2 json descriptors, Paolo Bonzini, 2020/01/28
- [PATCH 129/142] meson: install blobs, Paolo Bonzini, 2020/01/28
- [PATCH 132/142] meson: install desktop file, Paolo Bonzini, 2020/01/28
- [PATCH 131/142] meson: install icons, Paolo Bonzini, 2020/01/28
- [PATCH 133/142] meson: convert pc-bios/keymaps/Makefile, Paolo Bonzini, 2020/01/28
- [PATCH 134/142] meson: convert po/, Paolo Bonzini, 2020/01/28