You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/09/10 17:58:12 UTC
arrow git commit: ARROW-1515: [GLib] Detect version directly
Repository: arrow
Updated Branches:
refs/heads/master c1492bf4a -> 0ac81b5c0
ARROW-1515: [GLib] Detect version directly
Running ./autogen.sh isn't required for version update in java/pom.xml.
Author: Kouhei Sutou <ko...@clear-code.com>
Closes #1080 from kou/glib-detect-version-directly and squashes the following commits:
34015083 [Kouhei Sutou] [GLib] Detect version directly
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/0ac81b5c
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/0ac81b5c
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/0ac81b5c
Branch: refs/heads/master
Commit: 0ac81b5c05aeb7c1c01a30d38313f78408fcf925
Parents: c1492bf
Author: Kouhei Sutou <ko...@clear-code.com>
Authored: Sun Sep 10 13:58:05 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sun Sep 10 13:58:05 2017 -0400
----------------------------------------------------------------------
c_glib/.gitignore | 1 -
c_glib/Makefile.am | 3 +--
c_glib/autogen.sh | 5 -----
c_glib/configure.ac | 5 ++++-
4 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/0ac81b5c/c_glib/.gitignore
----------------------------------------------------------------------
diff --git a/c_glib/.gitignore b/c_glib/.gitignore
index 796b842..ff3615a 100644
--- a/c_glib/.gitignore
+++ b/c_glib/.gitignore
@@ -33,7 +33,6 @@ Makefile.in
/libtool
/m4/
/stamp-h1
-/version
/arrow-glib/enums.c
/arrow-glib/enums.h
/arrow-glib/stamp-*
http://git-wip-us.apache.org/repos/asf/arrow/blob/0ac81b5c/c_glib/Makefile.am
----------------------------------------------------------------------
diff --git a/c_glib/Makefile.am b/c_glib/Makefile.am
index 2e23f12..d059d12 100644
--- a/c_glib/Makefile.am
+++ b/c_glib/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = \
EXTRA_DIST = \
README.md \
- test \
- version
+ test
arrow_glib_docdir = ${datarootdir}/doc/arrow-glib
arrow_glib_doc_DATA = \
http://git-wip-us.apache.org/repos/asf/arrow/blob/0ac81b5c/c_glib/autogen.sh
----------------------------------------------------------------------
diff --git a/c_glib/autogen.sh b/c_glib/autogen.sh
index 08e33e6..31c2285 100755
--- a/c_glib/autogen.sh
+++ b/c_glib/autogen.sh
@@ -20,11 +20,6 @@
set -u
set -e
-ruby \
- -e 'print ARGF.read.scan(/^ <version>(.+?)<\/version>/)[0][0]' \
- ../java/pom.xml > \
- version
-
mkdir -p m4
gtkdocize --copy --docdir doc/reference
http://git-wip-us.apache.org/repos/asf/arrow/blob/0ac81b5c/c_glib/configure.ac
----------------------------------------------------------------------
diff --git a/c_glib/configure.ac b/c_glib/configure.ac
index b4e3016..938064c 100644
--- a/c_glib/configure.ac
+++ b/c_glib/configure.ac
@@ -17,7 +17,10 @@
AC_PREREQ(2.65)
-m4_define([arrow_glib_version], m4_include(version))
+m4_define([arrow_glib_version],
+ m4_esyscmd(grep "^ <version>" "$(dirname $0)/../java/pom.xml" | \
+ sed -e 's/\(^ <version>\|<\/version>$\)//g' | \
+ tr -d '\n'))
AC_INIT([arrow-glib],
arrow_glib_version,
[https://issues.apache.org/jira/browse/ARROW],