[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: build-sys: Configure doxygen.conf.in a bit differently
Arun Raghavan
gitlab at gitlab.freedesktop.org
Mon Aug 10 17:07:31 UTC 2020
Arun Raghavan pushed to branch master at PulseAudio / pulseaudio
Commits:
6fce5b2e by Tanu Kaskinen at 2020-08-10T19:38:07+03:00
build-sys: Configure doxygen.conf.in a bit differently
This change prepares for adding a doxygen target to the Meson build
system. The DOXYGEN_OUTPUT_DIRECTORY substitution variable is needed so
that the output will go to the build directory. I also replaced @srcdir@
with @top_srcdir at . I think it looks cleaner, since the ".." parent
directory traversal is avoided. It also happened to make writing the
Meson rules easier.
- - - - -
2c790e19 by Tanu Kaskinen at 2020-08-10T19:50:57+03:00
meson: Add doxygen target
The documentation can be generated with "ninja -C build doxygen". The
output will go to "doxygen/html" under the build directory.
- - - - -
4 changed files:
- configure.ac
- doxygen/doxygen.conf.in
- + doxygen/meson.build
- meson.build
Changes:
=====================================
configure.ac
=====================================
@@ -1552,6 +1552,13 @@ fi
AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "xyes"])
+# Substitute the variable with an empty string. This makes the output go to the
+# directory where doxygen is run (which is the doxygen directory under the
+# build directory). Substituting a variable with a constant value wouldn't
+# otherwise make sense, but the substitution variable needs to exist, because
+# we substitute a different value when using Meson.
+AC_SUBST([DOXYGEN_OUTPUT_DIRECTORY], [])
+
AC_CONFIG_FILES([
Makefile
src/Makefile
=====================================
doxygen/doxygen.conf.in
=====================================
@@ -52,7 +52,7 @@ PROJECT_LOGO =
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY =
+OUTPUT_DIRECTORY = @DOXYGEN_OUTPUT_DIRECTORY@
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -668,37 +668,37 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = @srcdir@/../src/pulse/channelmap.h \
- @srcdir@/../src/pulse/context.h \
- @srcdir@/../src/pulse/def.h \
- @srcdir@/../src/pulse/direction.h \
- @srcdir@/../src/pulse/error.h \
- @srcdir@/../src/pulse/ext-stream-restore.h \
- @srcdir@/../src/pulse/ext-device-manager.h \
- @srcdir@/../src/pulse/ext-device-restore.h \
- @srcdir@/../src/pulse/format.h \
- @srcdir@/../src/pulse/gccmacro.h \
- @srcdir@/../src/pulse/glib-mainloop.h \
- @srcdir@/../src/pulse/introspect.h \
- @srcdir@/../src/pulse/mainloop-api.h \
- @srcdir@/../src/pulse/mainloop-signal.h \
- @srcdir@/../src/pulse/mainloop.h \
- @srcdir@/../src/pulse/operation.h \
- @srcdir@/../src/pulse/proplist.h \
- @srcdir@/../src/pulse/pulseaudio.h \
- @srcdir@/../src/pulse/rtclock.h \
- @srcdir@/../src/pulse/sample.h \
- @srcdir@/../src/pulse/scache.h \
- @srcdir@/../src/pulse/simple.h \
- @srcdir@/../src/pulse/stream.h \
- @srcdir@/../src/pulse/subscribe.h \
- @srcdir@/../src/pulse/thread-mainloop.h \
- @srcdir@/../src/pulse/timeval.h \
- @srcdir@/../src/pulse/utf8.h \
- @srcdir@/../src/pulse/util.h \
- @srcdir@/../src/pulse/version.h \
- @srcdir@/../src/pulse/volume.h \
- @srcdir@/../src/pulse/xmalloc.h
+INPUT = @top_srcdir@/src/pulse/channelmap.h \
+ @top_srcdir@/src/pulse/context.h \
+ @top_srcdir@/src/pulse/def.h \
+ @top_srcdir@/src/pulse/direction.h \
+ @top_srcdir@/src/pulse/error.h \
+ @top_srcdir@/src/pulse/ext-stream-restore.h \
+ @top_srcdir@/src/pulse/ext-device-manager.h \
+ @top_srcdir@/src/pulse/ext-device-restore.h \
+ @top_srcdir@/src/pulse/format.h \
+ @top_srcdir@/src/pulse/gccmacro.h \
+ @top_srcdir@/src/pulse/glib-mainloop.h \
+ @top_srcdir@/src/pulse/introspect.h \
+ @top_srcdir@/src/pulse/mainloop-api.h \
+ @top_srcdir@/src/pulse/mainloop-signal.h \
+ @top_srcdir@/src/pulse/mainloop.h \
+ @top_srcdir@/src/pulse/operation.h \
+ @top_srcdir@/src/pulse/proplist.h \
+ @top_srcdir@/src/pulse/pulseaudio.h \
+ @top_srcdir@/src/pulse/rtclock.h \
+ @top_srcdir@/src/pulse/sample.h \
+ @top_srcdir@/src/pulse/scache.h \
+ @top_srcdir@/src/pulse/simple.h \
+ @top_srcdir@/src/pulse/stream.h \
+ @top_srcdir@/src/pulse/subscribe.h \
+ @top_srcdir@/src/pulse/thread-mainloop.h \
+ @top_srcdir@/src/pulse/timeval.h \
+ @top_srcdir@/src/pulse/utf8.h \
+ @top_srcdir@/src/pulse/util.h \
+ @top_srcdir@/src/pulse/version.h \
+ @top_srcdir@/src/pulse/volume.h \
+ @top_srcdir@/src/pulse/xmalloc.h
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
=====================================
doxygen/meson.build
=====================================
@@ -0,0 +1,10 @@
+cdata.set('DOXYGEN_OUTPUT_DIRECTORY', meson.current_build_dir())
+
+doxygen_conf = configure_file(
+ input : 'doxygen.conf.in',
+ output : 'doxygen.conf',
+ configuration : cdata,
+)
+
+run_target('doxygen',
+ command : ['doxygen', doxygen_conf])
=====================================
meson.build
=====================================
@@ -151,6 +151,7 @@ cdata.set_quoted('DESKTOPFILEDIR', join_paths(datadir, 'applications'))
cdata.set_quoted('PULSE_LOCALEDIR', localedir)
cdata.set_quoted('GETTEXT_PACKAGE', 'pulseaudio')
cdata.set('ENABLE_NLS', 1)
+cdata.set('top_srcdir', meson.source_root())
# Platform specifics
# First some defaults to keep config file generation happy
@@ -699,6 +700,7 @@ check_dep = dependency('check', version : '>= 0.9.10', required : get_option('te
# Subdirs
+subdir('doxygen')
subdir('po')
if get_option('man')
subdir('man')
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/1781031c8b9cf986fd343e9e18c8415a059df168...2c790e193730f17b70734a26a417f46189fbc6c0
--
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/1781031c8b9cf986fd343e9e18c8415a059df168...2c790e193730f17b70734a26a417f46189fbc6c0
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20200810/7ebfd657/attachment-0001.htm>
More information about the pulseaudio-commits
mailing list