[gnome-builder] build: move conf.py.in to conf.py
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: move conf.py.in to conf.py
- Date: Mon, 19 Jun 2017 21:31:55 +0000 (UTC)
commit 93338e18adb06dcf399f6aff12dbb4025d297cb7
Author: Christian Hergert <chergert redhat com>
Date: Mon Jun 19 14:31:40 2017 -0700
build: move conf.py.in to conf.py
We need this to be non-configuration_data based so that readthedocs can
process them without running meson/etc (which it can't).
doc/{conf.py.in => conf.py} | 4 ++--
doc/meson.build | 11 +----------
2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/doc/conf.py.in b/doc/conf.py
similarity index 99%
rename from doc/conf.py.in
rename to doc/conf.py
index 7c58cd5..96e589b 100644
--- a/doc/conf.py.in
+++ b/doc/conf.py
@@ -58,9 +58,9 @@ author = 'Christian Hergert, et al.'
# built documents.
#
# The short X.Y version.
-version = @VERSION@
+version = '3.25'
# The full version, including alpha/beta/rc tags.
-release = @VERSION@
+release = '3.25.2-nightly'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/doc/meson.build b/doc/meson.build
index 2081aae..1336e6a 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,19 +1,10 @@
if get_option('with_docs')
-conf_py_data = configuration_data()
-conf_py_data.set_quoted('VERSION', meson.project_version())
-
-configure_file(
- input: 'conf.py.in',
- output: 'conf.py',
- configuration: conf_py_data,
-)
-
sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: false)
if sphinx.found()
custom_target('en user documentation',
- command: [sphinx, '-b', 'html', '-c', meson.current_build_dir(),
meson.current_source_dir(), '@OUTPUT@'],
+ command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(),
meson.current_source_dir(), '@OUTPUT@'],
output: 'en',
build_by_default: true)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]