Skip to content

Commit 5fd3f3c

Browse files
committed
build: Substitute doc configs
Since Meson uses out-of-tree builds, we need to make the paths in the config replaceable before we can switch to Meson.
1 parent 6b05c9a commit 5fd3f3c

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

configure.ac

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,19 @@ fi
296296
AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes")
297297
AC_SUBST(DOXYGEN_EXCLUDED)
298298

299+
DOXYXML_BUILD_PATH="$PWD/doc"
300+
AC_SUBST(DOXYXML_BUILD_PATH)
301+
302+
DOXYGEN_SOURCE_ROOT="$PWD"
303+
AC_SUBST(DOXYGEN_SOURCE_ROOT)
304+
299305
# Set pkg-config variables before generation.
300306
AC_SUBST(PKG_CONFIG_REQUIRES)
301307

302308
AC_CONFIG_FILES([
303309
doc/Doxyfile
304310
doc/Makefile
311+
doc/source/conf.py
305312
gegl/libmypaint-gegl-]libmypaint_api_platform_version()[.pc:gegl/libmypaint-gegl.pc.in
306313
gegl/Makefile
307314
libmypaint-]libmypaint_api_platform_version()[.pc:libmypaint.pc.in

doc/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
source/conf.py
12
Doxyfile
23
doxygen/
34
build/

doc/Doxyfile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "libmypaint"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 0.1
41+
PROJECT_NUMBER = @LIBMYPAINT_VERSION@
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO =
5858
# entered, it will be relative to the location where doxygen was started. If
5959
# left blank the current directory will be used.
6060

61-
OUTPUT_DIRECTORY =
61+
OUTPUT_DIRECTORY = @DOXYXML_BUILD_PATH@
6262

6363
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
6464
# directories (in 2 levels) under the output directory of each output format and
@@ -819,7 +819,7 @@ WARN_LOGFILE =
819819
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
820820
# Note: If this tag is empty the current directory is searched.
821821

822-
INPUT = ../..
822+
INPUT = @DOXYGEN_SOURCE_ROOT@
823823

824824
# This tag can be used to specify the character encoding of the source files
825825
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

doc/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
EXTRA_DIST = \
2-
source/conf.py \
32
source/index.rst
43

54
if ENABLE_DOCS

doc/source/conf.py renamed to doc/source/conf.py.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
# Breathe setup, for integrating doxygen content
3939
extensions.append('breathe')
40-
doxyxml_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../doxygen')
40+
doxyxml_dir = '@DOXYXML_BUILD_PATH@'
4141
print(doxyxml_dir)
4242
breathe_projects = {"libmypaint": doxyxml_dir}
4343
breathe_default_project = "libmypaint"
@@ -63,9 +63,9 @@
6363
# built documents.
6464
#
6565
# The short X.Y version.
66-
version = '0.1'
66+
version = '@LIBMYPAINT_VERSION@'
6767
# The full version, including alpha/beta/rc tags.
68-
release = '0.1'
68+
release = '@LIBMYPAINT_VERSION_FULL@'
6969

7070
# The language for content autogenerated by Sphinx. Refer to documentation
7171
# for a list of supported languages.

0 commit comments

Comments
 (0)