From: Takashi Sakamoto Date: Wed, 16 Mar 2022 00:03:48 +0000 (+0900) Subject: meson: rename gtk_doc option X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f36f6e2291f271fadf8a4344de2ca0b075f57b33;p=alsa-gobject.git meson: rename gtk_doc option The new dependency of gi-docgen obsoletes usage of gtk-doc, therefore it is better to rename option for meson configuration. Signed-off-by: Takashi Sakamoto --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f955639..b7408c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: dnf -y install gtk-doc python3-gobject - name: Initialization for build. run: | - meson --prefix=/tmp. -Dgtk_doc=true -Dwarning_level=3 . build + meson --prefix=/tmp. -Ddoc=true -Dwarning_level=3 . build - name: Display configuration. run: | cd build @@ -63,7 +63,7 @@ jobs: sudo lxc exec builder -- su ubuntu -c 'cd; tar xf archive.tar.xz' - name: Initialization for build run: | - sudo lxc exec builder -- su ubuntu -c 'cd; cd dist; meson --prefix=/home/ubuntu/install -Dgtk_doc=true -Dwarning_level=3 . build' + sudo lxc exec builder -- su ubuntu -c 'cd; cd dist; meson --prefix=/home/ubuntu/install -Ddoc=true -Dwarning_level=3 . build' - name: Display configuration. run: | sudo lxc exec builder -- su ubuntu -c 'cd; cd dist/build; meson configure' diff --git a/README.rst b/README.rst index d93cd5f..e305642 100644 --- a/README.rst +++ b/README.rst @@ -95,7 +95,7 @@ arguments for them. For example :: Generate documentation :: - $ meson --prefix=xxx -D gtk_doc=true . build + $ meson --prefix=xxx -D doc=true . build $ cd build $ meson install $ xdg-open xxx/share/gtk-doc/html/alsactl/index.html diff --git a/doc/meson.build b/doc/meson.build index 2e2fe14..b7c4082 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,3 +1,3 @@ -if get_option('gtk_doc') +if get_option('doc') subdir('reference') endif diff --git a/meson_options.txt b/meson_options.txt index 9cbd3c2..8744030 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('gtk_doc', +option('doc', type: 'boolean', value: false, description: 'generate API reference',