Something that doesn't merge cleanly

appveyor.yml

@@ -62,34 +62,34 @@ 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_S3: "ON"
- 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
+ # CONFIGURATION: "Release"
+ # APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ # - JOB: "Toolchain"
+ # GENERATOR: Ninja
+ # CONFIGURATION: "Release"
+ # ARROW_S3: "ON"
+ # 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: "R with libarrow"
  USE_CLCACHE: false
  TEST_R_WITH_ARROW: "TRUE"

ci/PKGBUILD

@@ -85,12 +85,21 @@ build() {
  -DARROW_JEMALLOC=OFF \
  -DARROW_WITH_ZLIB=ON \
  -DARROW_WITH_SNAPPY=ON \
+ -DARROW_WITH_URIPARSER=ON \
  -DARROW_USE_GLOG=OFF \
  -DARROW_BUILD_UTILITIES=OFF \
  -Ddouble-conversion_ROOT="${MINGW_PREFIX}" \
  -DThrift_ROOT="${MINGW_PREFIX}"
 
  make
+ echo "MINGW_PREFIX"
+ echo ${MINGW_PREFIX}
+ ls ${MINGW_PREFIX}
+ ls ${MINGW_PREFIX}/lib
+ echo "cwd"
+ ls
+ ls uriparser_ep-install
+ ls uriparser_ep-install/lib
  popd
 }
 

ci/appveyor-build-r.sh

@@ -40,7 +40,7 @@ export PKG_CONFIG="/${MINGW_INSTALLS}/bin/pkg-config --static"
 
 cd $APPVEYOR_BUILD_FOLDER
 cp ci/PKGBUILD .
-makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild
+makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --cleanbuild
 
 # Collect the build artifacts and make the shape of zip file that rwinlib expects
 mkdir build