Skip to content

Commit 7264b0c

Browse files
committed
install tarball now includes patched RInside for install via Dockerfile
1 parent c0bdad1 commit 7264b0c

File tree

4 files changed

+18
-96
lines changed

4 files changed

+18
-96
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ target_link_libraries(rserver src common ${Compute_Libs} ${Boost_LIBRARIES})
113113
target_link_libraries(rsession src common pthread ${Compute_Libs} ${Boost_LIBRARIES} R RInside libg3logger.a -lm)
114114
#target_compile_options(rsession PRIVATE RInside.so)
115115

116+
install(CODE "execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/prepareRInside.sh\" \"${CMAKE_BINARY_DIR}\")")
117+
116118
install(TARGETS rserver rsession RUNTIME DESTINATION .)
117-
#install(DIRECTORY ${CMAKE_SOURCE_DIR}/vendor/RInside DESTINATION . ${INSTALL_PATH})
119+
install(DIRECTORY ${CMAKE_BINARY_DIR}/RInside DESTINATION . ${INSTALL_PATH})
118120
install(DIRECTORY ${CMAKE_SOURCE_DIR}/R/rc2 DESTINATION . ${INSTALL_PATH})

prepareRInside.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
SCRIPT=$(readlink -f "$0")
4+
SCRIPTDIR=$(dirname "$SCRIPT")
5+
DESTDIR=`pwd`
6+
7+
echo "patching RInside" 1>&2
8+
9+
tar zxf $SCRIPTDIR/rc2root/containers/compute/RInside_0.2.*.tar.gz -C "$DESTDIR"
10+
cd $DESTDIR/RInside
11+
patch -p1 < $SCRIPTDIR/rc2root/containers/dev/rinside.patch
12+
13+
14+

vendor/rinside.patch

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)