arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1666: [GLib] Enable gtk-doc on Travis CI Mac environment
Date Fri, 20 Oct 2017 13:42:12 GMT
Repository: arrow
Updated Branches:
  refs/heads/master d7bf5f280 -> a8f518588


ARROW-1666: [GLib] Enable gtk-doc on Travis CI Mac environment

The current build script for Travis CI (`ci/travis_before_script_c_glib.sh`) does not use
`--enable-gtk-doc` option on Mac. Now it can be used also on Mac, so it should be enabled
to check build status.

Author: Wataru Shimizu <waruzilla@gmail.com>

Closes #1195 from wagavulin/ci-mac-enable-gtk-doc and squashes the following commits:

1b93aa7f [Wataru Shimizu] Add environment variable for xsltproc on macOS
675c9101 [Wataru Shimizu] Enable gtk-doc on Travis CI Mac environment


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/a8f51858
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/a8f51858
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/a8f51858

Branch: refs/heads/master
Commit: a8f518588fda471b2e3cc8e0f0064e7c4bb99899
Parents: d7bf5f2
Author: Wataru Shimizu <waruzilla@gmail.com>
Authored: Fri Oct 20 09:42:08 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Fri Oct 20 09:42:08 2017 -0400

----------------------------------------------------------------------
 ci/travis_before_script_c_glib.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/a8f51858/ci/travis_before_script_c_glib.sh
----------------------------------------------------------------------
diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh
index d60f629..01ef9e8 100755
--- a/ci/travis_before_script_c_glib.sh
+++ b/ci/travis_before_script_c_glib.sh
@@ -25,6 +25,7 @@ if [ $TRAVIS_OS_NAME = "osx" ]; then
   brew update && brew bundle --file=c_glib/Brewfile
 
   export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig
+  export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
 fi
 
 if [ $BUILD_SYSTEM = "meson" ]; then
@@ -83,10 +84,7 @@ if [ $BUILD_SYSTEM = "autotools" ]; then
   ./autogen.sh
 
   CONFIGURE_OPTIONS="--prefix=$ARROW_C_GLIB_INSTALL"
-  if [ $TRAVIS_OS_NAME != "osx" ]; then
-    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-gtk-doc"
-  fi
-
+  CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-gtk-doc"
   CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CFLAGS=-DARROW_NO_DEPRECATED_API"
   CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS CXXFLAGS=-DARROW_NO_DEPRECATED_API"
 


Mime
View raw message