You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by uw...@apache.org on 2018/07/12 06:43:35 UTC
[arrow] branch master updated: ARROW-2834: [GLib] Remove "enable_"
prefix from Meson options
This is an automated email from the ASF dual-hosted git repository.
uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new e147057 ARROW-2834: [GLib] Remove "enable_" prefix from Meson options
e147057 is described below
commit e14705745bb8d625b3c7dda2857e93cdfe848178
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Thu Jul 12 08:43:25 2018 +0200
ARROW-2834: [GLib] Remove "enable_" prefix from Meson options
Because GNOME uses this policy.
https://wiki.gnome.org/Initiatives/GnomeGoals/MesonPorting
> Drop the enable from --enable-foo boolean options; Meson has boolean
> values, so -Denable-foo=true would read as redundant, and
> -Denable-foo=false would read as contradictory. Use -Dfoo=true or
> -Dfoo=false instead
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #2255 from kou/glib-meson-option-remove-enable and squashes the following commits:
c33d69e4 <Kouhei Sutou> Remove "enable_" prefix from Meson options
---
c_glib/meson.build | 2 +-
c_glib/meson_options.txt | 2 +-
ci/travis_before_script_c_glib.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/c_glib/meson.build b/c_glib/meson.build
index 9fe1b8c..330f2bb 100644
--- a/c_glib/meson.build
+++ b/c_glib/meson.build
@@ -55,7 +55,7 @@ if arrow_gpu_dependency.found()
endif
subdir('example')
-if get_option('enable_gtk_doc')
+if get_option('gtk_doc')
subdir('doc/reference')
endif
diff --git a/c_glib/meson_options.txt b/c_glib/meson_options.txt
index 859a4e6..f8612bb 100644
--- a/c_glib/meson_options.txt
+++ b/c_glib/meson_options.txt
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-option('enable_gtk_doc',
+option('gtk_doc',
type: 'boolean',
value: false,
description: 'Build document by GTK-Doc')
diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh
index 710c57f..3a61aac 100755
--- a/ci/travis_before_script_c_glib.sh
+++ b/ci/travis_before_script_c_glib.sh
@@ -79,7 +79,7 @@ rm -rf build
# Build with Meson
MESON_OPTIONS="--prefix=$ARROW_C_GLIB_INSTALL_MESON"
-MESON_OPTIONS="$MESON_OPTIONS -Denable_gtk_doc=true"
+MESON_OPTIONS="$MESON_OPTIONS -Dgtk_doc=true"
mkdir -p build
env \
CFLAGS="-DARROW_NO_DEPRECATED_API" \