From f96cb456c69dc5d13a2fb09b97ed1457a21f99fd Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Mon, 29 Aug 2016 14:31:34 -0700
Subject: [PATCH] remove R_INSTALL_TAR override (use internal tar), copy all
GNU R 'bin' files to FastR
---
com.oracle.truffle.r.native/run/Makefile | 10 ++++++----
com.oracle.truffle.r.native/run/edRenviron | 6 ------
2 files changed, 6 insertions(+), 10 deletions(-)
delete mode 100644 com.oracle.truffle.r.native/run/edRenviron
diff --git a/com.oracle.truffle.r.native/run/Makefile b/com.oracle.truffle.r.native/run/Makefile
index b445653a8b..8d0b368712 100644
--- a/com.oracle.truffle.r.native/run/Makefile
+++ b/com.oracle.truffle.r.native/run/Makefile
@@ -44,7 +44,7 @@ FASTR_SHARE_DIR := $(FASTR_R_HOME)/share
FASTR_INCLUDE_DIR := $(FASTR_R_HOME)/include
R_SCRIPT := $(addprefix $(GNUR_HOME)/bin/,R)
-SUPPORT_SCRIPTS := $(addprefix $(GNUR_HOME)/bin/,BATCH COMPILE INSTALL SHLIB Rcmd config javareconf)
+BIN_FILES := $(wildcard $(GNUR_HOME)/bin/*)
DOC_FILES := $(wildcard $(GNUR_HOME)/doc/*)
@@ -66,18 +66,20 @@ rundirs:
rcmds: $(FASTR_BIN_DIR)/R
$(FASTR_BIN_DIR)/R: Makefile R.sh Rscript.sh Rscript_exec.sh Rclasspath.sh
+ cp -r $(BIN_FILES) $(FASTR_BIN_DIR)
+ # overide bin/R
cp R.sh $(FASTR_BIN_DIR)/exec/R
+ # override bin/Rscript
cp Rscript_exec.sh $(FASTR_BIN_DIR)/execRextras/Rscript
cp Rscript.sh $(FASTR_BIN_DIR)/Rscript
+ # for embedded support
cp Rclasspath.sh $(FASTR_BIN_DIR)/execRextras/Rclasspath
chmod +x $(FASTR_BIN_DIR)/exec/R $(FASTR_BIN_DIR)/execRextras/Rscript $(FASTR_BIN_DIR)/Rscript $(FASTR_BIN_DIR)/execRextras/Rclasspath
- cp $(SUPPORT_SCRIPTS) $(FASTR_BIN_DIR)
+ # update R_HOME_DIR to FastR
sed -e 's!^\(R_HOME_DIR=\)\(.*\)!\1"$(FASTR_R_HOME)"!' < $(R_SCRIPT) > $(FASTR_BIN_DIR)/R
chmod +x $(FASTR_BIN_DIR)/R
touch $(FASTR_ETC_DIR)/ldpaths
sed -e "s|\(R_LIBS_USER=.*-'\)\(.*\)'}|\1$(FASTR_R_HOME)/library'}|" < $(GNUR_HOME)/etc/Renviron > $(FASTR_ETC_DIR)/Renviron
- # set R_INSTALL_TAR
- ed $(FASTR_ETC_DIR)/Renviron < edRenviron
cp $(GNUR_HOME)/etc/Makeconf Makeconf.etc
cp $(GNUR_HOME)/etc/javaconf $(FASTR_ETC_DIR)/javaconf
cp $(GNUR_HOME)/etc/repositories $(FASTR_ETC_DIR)/repositories
diff --git a/com.oracle.truffle.r.native/run/edRenviron b/com.oracle.truffle.r.native/run/edRenviron
deleted file mode 100644
index ea79216135..0000000000
--- a/com.oracle.truffle.r.native/run/edRenviron
+++ /dev/null
@@ -1,6 +0,0 @@
-/### Local/
-i
-R_INSTALL_TAR=${TAR}
-.
-w
-q
--
GitLab