Skip to content

Commit 6d6a74e

Browse files
PR feedback
1 parent 84eef1b commit 6d6a74e

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

appveyor.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ environment:
105105
PATH: '%GOPATH%\bin;%GOROOT%\bin;%PATH%'
106106
- JOB: "R without libarrow"
107107
USE_CLCACHE: false
108-
108+
109109
MSVC_DEFAULT_OPTIONS: ON
110110
APPVEYOR_SAVE_CACHE_ON_ERROR: true
111111

@@ -155,22 +155,22 @@ for:
155155
NOT_CRAN: true
156156

157157
artifacts:
158-
- path: '*.Rcheck\**\*.log'
158+
- path: 'r\*.Rcheck\**\*.log'
159159
name: Logs
160160

161-
- path: '*.Rcheck\**\*.out'
161+
- path: 'r\*.Rcheck\**\*.out'
162162
name: Logs
163163

164-
- path: '*.Rcheck\**\*.fail'
164+
- path: 'r\*.Rcheck\**\*.fail'
165165
name: Logs
166166

167-
- path: '*.Rcheck\**\*.Rout'
167+
- path: 'r\*.Rcheck\**\*.Rout'
168168
name: Logs
169169

170-
- path: '\*_*.tar.gz'
170+
- path: 'r\*_*.tar.gz'
171171
name: Bits
172172

173-
- path: '\*_*.zip'
173+
- path: 'r\*_*.zip'
174174
name: Bits
175175

176176
# Disable test discovery

r/configure.win

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,22 @@ if [ "$ARROW_R_DEV" == "TRUE" ]; then
2525
fi
2626

2727
VERSION=$(grep ^Version DESCRIPTION | sed s/Version:\ //)
28+
# Try to find/download a C++ Arrow binary
2829
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "tools/winlibs.R" $VERSION
29-
30+
# If binary not found, script exits nonzero
3031
if [ $? -ne 0 ]; then
32+
# We'll have to install without libarrow. Note to the user how to rectify.
3133
echo "------------------------- NOTE ---------------------------"
3234
echo "After installation, please run arrow::install_arrow() to install"
3335
echo "required runtime libraries"
3436
echo "---------------------------------------------------------"
3537
else
38+
# Set the right flags to point to and enable arrow/parquet
3639
RWINLIB="../windows/arrow-${VERSION}"
3740
PKG_CFLAGS="-I${RWINLIB}/include -DARROW_STATIC -DPARQUET_STATIC -DARROW_R_WITH_PARQUET -DARROW_R_WITH_ARROW"
3841
PKG_LIBS="-L${RWINLIB}/lib"'$(subst gcc,,$(COMPILED_BY))$(R_ARCH) '"-L${RWINLIB}/lib"'$(R_ARCH) '"-lparquet -larrow -lthrift -lboost_regex-mt-s -ldouble-conversion -lz -lws2_32"
3942
fi
4043

41-
# Write to Makevars
4244
echo "*** Writing Makevars.win"
4345
sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS|" src/Makevars.in > src/Makevars.win
4446
# Success

0 commit comments

Comments
 (0)