From 214a4fefad52f4642e398c3c0dc61babed377780 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 09:01:16 -0700 Subject: [PATCH 1/8] Try building C++ lib from local git checkout --- ci/PKGBUILD | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/ci/PKGBUILD b/ci/PKGBUILD index be447738d12..df54248fd33 100644 --- a/ci/PKGBUILD +++ b/ci/PKGBUILD @@ -32,6 +32,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost" makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") options=("staticlibs" "strip" "!buildflags") + +# For installing from a local checkout, set source_dir to . and don't include +# a "source" param below +source_dir=. +# else source_dir=apache-${_realname}-${pkgver} # For released version: @@ -39,7 +44,7 @@ source_dir=apache-${_realname}-${pkgver} #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") +# source=("${source_dir}"::"git+https://github.com/apache/arrow") sha256sums=("SKIP") cmake_build_type=release @@ -52,12 +57,6 @@ pkgver() { grep Version r/DESCRIPTION | cut -d " " -f 2 } -prepare() { - pushd ${source_dir} - #patch -p1 -N -i ${srcdir}/3923.patch - popd -} - build() { ARROW_CPP_DIR="$(pwd)/${source_dir}/cpp" [[ -d ${cpp_build_dir} ]] && rm -rf ${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 From 4fa5f709b4d9062922356f66f02c7eacc13d41ab Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 09:02:39 -0700 Subject: [PATCH 2/8] Test only mine --- appveyor.yml | 84 ++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e84d78c362e..2c89de27bdb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -60,49 +60,49 @@ environment: matrix: # NOTE: clcache seems to work best with Ninja and worst with msbuild # (as generated by cmake) - - JOB: "Build" - GENERATOR: Ninja - CONFIGURATION: "Release" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - JOB: "Toolchain" - GENERATOR: Ninja - CONFIGURATION: "Release" - ARROW_BUILD_FLIGHT: "ON" - ARROW_BUILD_GANDIVA: "ON" - # NOTE: Since ARROW-5403 we have disabled the static CRT build - # - JOB: "Static_Crt_Build" + # - JOB: "Build" # GENERATOR: Ninja - - JOB: "Build_Debug" - GENERATOR: Ninja - CONFIGURATION: "Debug" - - JOB: "MinGW32" - MINGW_ARCH: i686 - MINGW_PACKAGE_PREFIX: mingw-w64-i686 - MINGW_PREFIX: c:\msys64\mingw32 - MSYSTEM: MINGW32 - USE_CLCACHE: false - - JOB: "MinGW64" - MINGW_ARCH: x86_64 - MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 - MINGW_PREFIX: c:\msys64\mingw64 - MSYSTEM: MINGW64 - USE_CLCACHE: false - - JOB: "Rust" - TARGET: x86_64-pc-windows-msvc - USE_CLCACHE: false - - JOB: "C#" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - USE_CLCACHE: false - - JOB: "Go" - MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 - MINGW_PREFIX: c:\msys64\mingw64 - MSYSTEM: MINGW64 - USE_CLCACHE: false - GOROOT: 'c:\go112' - GOPATH: c:\gopath - GO111MODULE: on - GOTOOLDIR: '%GOROOT%\pkg\tool\windows_amd64' - PATH: '%GOPATH%\bin;%GOROOT%\bin;%PATH%' + # CONFIGURATION: "Release" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # - JOB: "Toolchain" + # GENERATOR: Ninja + # CONFIGURATION: "Release" + # ARROW_BUILD_FLIGHT: "ON" + # ARROW_BUILD_GANDIVA: "ON" + # # NOTE: Since ARROW-5403 we have disabled the static CRT build + # # - JOB: "Static_Crt_Build" + # # GENERATOR: Ninja + # - JOB: "Build_Debug" + # GENERATOR: Ninja + # CONFIGURATION: "Debug" + # - JOB: "MinGW32" + # MINGW_ARCH: i686 + # MINGW_PACKAGE_PREFIX: mingw-w64-i686 + # MINGW_PREFIX: c:\msys64\mingw32 + # MSYSTEM: MINGW32 + # USE_CLCACHE: false + # - JOB: "MinGW64" + # MINGW_ARCH: x86_64 + # MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 + # MINGW_PREFIX: c:\msys64\mingw64 + # MSYSTEM: MINGW64 + # USE_CLCACHE: false + # - JOB: "Rust" + # TARGET: x86_64-pc-windows-msvc + # USE_CLCACHE: false + # - JOB: "C#" + # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + # USE_CLCACHE: false + # - JOB: "Go" + # MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 + # MINGW_PREFIX: c:\msys64\mingw64 + # MSYSTEM: MINGW64 + # USE_CLCACHE: false + # GOROOT: 'c:\go112' + # GOPATH: c:\gopath + # GO111MODULE: on + # GOTOOLDIR: '%GOROOT%\pkg\tool\windows_amd64' + # PATH: '%GOPATH%\bin;%GOROOT%\bin;%PATH%' - JOB: "R with libarrow" USE_CLCACHE: false TEST_R_WITH_ARROW: "TRUE" From ec8aebf8460013cfb9d283464fbfad2296c76084 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 09:16:46 -0700 Subject: [PATCH 3/8] Try without checksum --- ci/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/PKGBUILD b/ci/PKGBUILD index df54248fd33..0b05d693688 100644 --- a/ci/PKGBUILD +++ b/ci/PKGBUILD @@ -45,7 +45,7 @@ source_dir=apache-${_realname}-${pkgver} # 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") +# sha256sums=("SKIP") cmake_build_type=release cpp_build_dir=build-${CARCH}-cpp From eef10c67d08106617082dd4586f18002723d8d32 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 09:29:51 -0700 Subject: [PATCH 4/8] Oops --- ci/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/PKGBUILD b/ci/PKGBUILD index 0b05d693688..c760c83e7a1 100644 --- a/ci/PKGBUILD +++ b/ci/PKGBUILD @@ -37,7 +37,7 @@ options=("staticlibs" "strip" "!buildflags") # a "source" param below source_dir=. # else -source_dir=apache-${_realname}-${pkgver} +# source_dir=apache-${_realname}-${pkgver} # For released version: #source=("https://archive.apache.org/dist/arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz") From f0bf36403ef541c1281dc4c3bcb14df11355dd35 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 09:42:58 -0700 Subject: [PATCH 5/8] Try this --- ci/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/PKGBUILD b/ci/PKGBUILD index c760c83e7a1..af450f2f072 100644 --- a/ci/PKGBUILD +++ b/ci/PKGBUILD @@ -35,7 +35,7 @@ options=("staticlibs" "strip" "!buildflags") # For installing from a local checkout, set source_dir to . and don't include # a "source" param below -source_dir=. +source_dir="." # else # source_dir=apache-${_realname}-${pkgver} From ed14a37059654ea818fc1bd2e0029bcef091b132 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 09:55:57 -0700 Subject: [PATCH 6/8] Expand path --- ci/PKGBUILD | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/PKGBUILD b/ci/PKGBUILD index af450f2f072..e1479806d81 100644 --- a/ci/PKGBUILD +++ b/ci/PKGBUILD @@ -53,8 +53,7 @@ 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 + grep Version "$(pwd)/${source_dir}/r/DESCRIPTION" | cut -d " " -f 2 } build() { From 16b7e56c708a2f77f74e54e55870bd34d66a9cee Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 10:57:39 -0700 Subject: [PATCH 7/8] More playing with working directory --- ci/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/PKGBUILD b/ci/PKGBUILD index e1479806d81..5970e4a6a80 100644 --- a/ci/PKGBUILD +++ b/ci/PKGBUILD @@ -35,7 +35,7 @@ options=("staticlibs" "strip" "!buildflags") # For installing from a local checkout, set source_dir to . and don't include # a "source" param below -source_dir="." +source_dir="$APPVEYOR_BUILD_FOLDER" # else # source_dir=apache-${_realname}-${pkgver} @@ -46,6 +46,7 @@ source_dir="." # Append `#commit=54b1b2f688e5e84b4c664b1e12a95f93b94ab2f3` to the URL to select a revision # 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 @@ -53,11 +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 - grep Version "$(pwd)/${source_dir}/r/DESCRIPTION" | cut -d " " -f 2 + 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} From a87a8cf017ecdc237b84041fb4d2b837dedd423e Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 17 Jul 2019 11:23:06 -0700 Subject: [PATCH 8/8] Revert "Test only mine" This reverts commit 4fa5f709b4d9062922356f66f02c7eacc13d41ab. --- appveyor.yml | 84 ++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2c89de27bdb..e84d78c362e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -60,49 +60,49 @@ environment: matrix: # NOTE: clcache seems to work best with Ninja and worst with msbuild # (as generated by cmake) - # - JOB: "Build" + - JOB: "Build" + GENERATOR: Ninja + CONFIGURATION: "Release" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + - JOB: "Toolchain" + GENERATOR: Ninja + CONFIGURATION: "Release" + ARROW_BUILD_FLIGHT: "ON" + ARROW_BUILD_GANDIVA: "ON" + # NOTE: Since ARROW-5403 we have disabled the static CRT build + # - JOB: "Static_Crt_Build" # GENERATOR: Ninja - # CONFIGURATION: "Release" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - # - JOB: "Toolchain" - # GENERATOR: Ninja - # CONFIGURATION: "Release" - # ARROW_BUILD_FLIGHT: "ON" - # ARROW_BUILD_GANDIVA: "ON" - # # NOTE: Since ARROW-5403 we have disabled the static CRT build - # # - JOB: "Static_Crt_Build" - # # GENERATOR: Ninja - # - JOB: "Build_Debug" - # GENERATOR: Ninja - # CONFIGURATION: "Debug" - # - JOB: "MinGW32" - # MINGW_ARCH: i686 - # MINGW_PACKAGE_PREFIX: mingw-w64-i686 - # MINGW_PREFIX: c:\msys64\mingw32 - # MSYSTEM: MINGW32 - # USE_CLCACHE: false - # - JOB: "MinGW64" - # MINGW_ARCH: x86_64 - # MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 - # MINGW_PREFIX: c:\msys64\mingw64 - # MSYSTEM: MINGW64 - # USE_CLCACHE: false - # - JOB: "Rust" - # TARGET: x86_64-pc-windows-msvc - # USE_CLCACHE: false - # - JOB: "C#" - # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - # USE_CLCACHE: false - # - JOB: "Go" - # MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 - # MINGW_PREFIX: c:\msys64\mingw64 - # MSYSTEM: MINGW64 - # USE_CLCACHE: false - # GOROOT: 'c:\go112' - # GOPATH: c:\gopath - # GO111MODULE: on - # GOTOOLDIR: '%GOROOT%\pkg\tool\windows_amd64' - # PATH: '%GOPATH%\bin;%GOROOT%\bin;%PATH%' + - JOB: "Build_Debug" + GENERATOR: Ninja + CONFIGURATION: "Debug" + - JOB: "MinGW32" + MINGW_ARCH: i686 + MINGW_PACKAGE_PREFIX: mingw-w64-i686 + MINGW_PREFIX: c:\msys64\mingw32 + MSYSTEM: MINGW32 + USE_CLCACHE: false + - JOB: "MinGW64" + MINGW_ARCH: x86_64 + MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 + MINGW_PREFIX: c:\msys64\mingw64 + MSYSTEM: MINGW64 + USE_CLCACHE: false + - JOB: "Rust" + TARGET: x86_64-pc-windows-msvc + USE_CLCACHE: false + - JOB: "C#" + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + USE_CLCACHE: false + - JOB: "Go" + MINGW_PACKAGE_PREFIX: mingw-w64-x86_64 + MINGW_PREFIX: c:\msys64\mingw64 + MSYSTEM: MINGW64 + USE_CLCACHE: false + GOROOT: 'c:\go112' + GOPATH: c:\gopath + GO111MODULE: on + GOTOOLDIR: '%GOROOT%\pkg\tool\windows_amd64' + PATH: '%GOPATH%\bin;%GOROOT%\bin;%PATH%' - JOB: "R with libarrow" USE_CLCACHE: false TEST_R_WITH_ARROW: "TRUE"