[arrow] branch master updated: ARROW-5963: [R] R Appveyor job does not test changes in the C++ library

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm 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 1abf18f  ARROW-5963: [R] R Appveyor job does not test changes in the C++ library
1abf18f is described below

commit 1abf18ff902e82fee0f23646f12011cbdc9b64d8
Author: Neal Richardson <ne...@gmail.com>
AuthorDate: Wed Jul 17 17:00:21 2019 -0500

    ARROW-5963: [R] R Appveyor job does not test changes in the C++ library
    
    This changes the PKGBUILD script to use the local checkout to build the C++ library.
    
    Author: Neal Richardson <ne...@gmail.com>
    
    Closes #4900 from nealrichardson/r-appveyor-local and squashes the following commits:
    
    a87a8cf01 <Neal Richardson> Revert "Test only mine"
    16b7e56c7 <Neal Richardson> More playing with working directory
    ed14a3705 <Neal Richardson> Expand path
    f0bf36403 <Neal Richardson> Try this
    eef10c67d <Neal Richardson> Oops
    ec8aebf84 <Neal Richardson> Try without checksum
    4fa5f709b <Neal Richardson> Test only mine
    214a4fefa <Neal Richardson> Try building C++ lib from local git checkout
---
 ci/PKGBUILD | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/ci/PKGBUILD b/ci/PKGBUILD
index be44773..5970e4a 100644
--- a/ci/PKGBUILD
+++ b/ci/PKGBUILD
@@ -32,15 +32,21 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-gcc")
 options=("staticlibs" "strip" "!buildflags")
-source_dir=apache-${_realname}-${pkgver}
+
+# For installing from a local checkout, set source_dir to . and don't include
+# a "source" param below
+source_dir="$APPVEYOR_BUILD_FOLDER"
+# else
+# source_dir=apache-${_realname}-${pkgver}
 
 # For released version:
 #source=("https://archive.apache.org/dist/arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz")
 #sha256sums=("ac2a77dd9168e9892e432c474611e86ded0be6dfe15f689c948751d37f81391a")
 # For github dev version:
 # Append `#commit=54b1b2f688e5e84b4c664b1e12a95f93b94ab2f3` to the URL to select a revision
-source=("${source_dir}"::"git+https://github.com/apache/arrow")
-sha256sums=("SKIP")
+# source=("${source_dir}"::"git+https://github.com/apache/arrow")
+# sha256sums=("SKIP")
+# source_dir="${APPVEYOR_BUILD_FOLDER}/${source_dir}"
 
 cmake_build_type=release
 cpp_build_dir=build-${CARCH}-cpp
@@ -48,18 +54,11 @@ cpp_build_dir=build-${CARCH}-cpp
 pkgver() {
   # The only purpose of this here is to cause the job to error if the
   # version in pkgver is different from what is in r/DESCRIPTION
-  cd "$source_dir"
-  grep Version r/DESCRIPTION | cut -d " " -f 2
-}
-
-prepare() {
-  pushd ${source_dir}
-  #patch -p1 -N -i ${srcdir}/3923.patch
-  popd
+  grep Version "${source_dir}/r/DESCRIPTION" | cut -d " " -f 2
 }
 
 build() {
-  ARROW_CPP_DIR="$(pwd)/${source_dir}/cpp"
+  ARROW_CPP_DIR="${source_dir}/cpp"
   [[ -d ${cpp_build_dir} ]] && rm -rf ${cpp_build_dir}
   mkdir -p ${cpp_build_dir}
   pushd ${cpp_build_dir}
@@ -104,12 +103,6 @@ build() {
   popd
 }
 
-check() {
-  # TODO
-  # make -C ${cpp_build_dir} test
-  :
-}
-
 package() {
   make -C ${cpp_build_dir} DESTDIR="${pkgdir}" install