Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3426C200D00 for ; Sun, 10 Sep 2017 19:58:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 32D4C1609BD; Sun, 10 Sep 2017 17:58:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 775031609B9 for ; Sun, 10 Sep 2017 19:58:14 +0200 (CEST) Received: (qmail 76680 invoked by uid 500); 10 Sep 2017 17:58:13 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 76671 invoked by uid 99); 10 Sep 2017 17:58:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Sep 2017 17:58:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 92B1FF5705; Sun, 10 Sep 2017 17:58:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wesm@apache.org To: commits@arrow.apache.org Message-Id: <08841daa0e2d45e7a0914de9ce4378d9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: arrow git commit: ARROW-1515: [GLib] Detect version directly Date: Sun, 10 Sep 2017 17:58:12 +0000 (UTC) archived-at: Sun, 10 Sep 2017 17:58:15 -0000 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 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 Authored: Sun Sep 10 13:58:05 2017 -0400 Committer: Wes McKinney 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>/)[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 "^ " "$(dirname $0)/../java/pom.xml" | \ + sed -e 's/\(^ \|<\/version>$\)//g' | \ + tr -d '\n')) AC_INIT([arrow-glib], arrow_glib_version, [https://issues.apache.org/jira/browse/ARROW],