Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
f96cb456
Commit
f96cb456
authored
8 years ago
by
Mick Jordan
Browse files
Options
Downloads
Patches
Plain Diff
remove R_INSTALL_TAR override (use internal tar), copy all GNU R 'bin' files to FastR
parent
a5bdc023
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
com.oracle.truffle.r.native/run/Makefile
+6
-4
6 additions, 4 deletions
com.oracle.truffle.r.native/run/Makefile
com.oracle.truffle.r.native/run/edRenviron
+0
-6
0 additions, 6 deletions
com.oracle.truffle.r.native/run/edRenviron
with
6 additions
and
10 deletions
com.oracle.truffle.r.native/run/Makefile
+
6
−
4
View file @
f96cb456
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
com.oracle.truffle.r.native/run/edRenviron
deleted
100644 → 0
+
0
−
6
View file @
a5bdc023
/### Local/
i
R_INSTALL_TAR=${TAR}
.
w
q
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment