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
ea636938
Commit
ea636938
authored
7 years ago
by
Florian Angerer
Browse files
Options
Downloads
Patches
Plain Diff
Minor fixes.
parent
0a6b7c68
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.engine/src/com/oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java
+1
-1
1 addition, 1 deletion
...oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java
mx.fastr/mx_fastr_pkgs.py
+1
-3
1 addition, 3 deletions
mx.fastr/mx_fastr_pkgs.py
with
2 additions
and
4 deletions
com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/shell/EmbeddedConsoleHandler.java
+
1
−
1
View file @
ea636938
...
@@ -59,7 +59,7 @@ public class EmbeddedConsoleHandler extends ConsoleHandler {
...
@@ -59,7 +59,7 @@ public class EmbeddedConsoleHandler extends ConsoleHandler {
rEmbedRFFI
=
RFFIFactory
.
getREmbedRFFI
();
rEmbedRFFI
=
RFFIFactory
.
getREmbedRFFI
();
if
(!(
RInterfaceCallbacks
.
R_WriteConsole
.
isOverridden
()
||
RInterfaceCallbacks
.
R_ReadConsole
.
isOverridden
()))
{
if
(!(
RInterfaceCallbacks
.
R_WriteConsole
.
isOverridden
()
||
RInterfaceCallbacks
.
R_ReadConsole
.
isOverridden
()))
{
if
(
startParams
.
noReadline
())
{
if
(
startParams
.
noReadline
())
{
delegate
=
new
DefaultConsoleHandler
(
System
.
in
,
System
.
out
);
delegate
=
new
DefaultConsoleHandler
(
System
.
in
,
System
.
out
,
false
);
}
else
{
}
else
{
delegate
=
new
JLineConsoleHandler
(
System
.
in
,
System
.
out
,
startParams
.
isSlave
());
delegate
=
new
JLineConsoleHandler
(
System
.
in
,
System
.
out
,
startParams
.
isSlave
());
}
}
...
...
This diff is collapsed.
Click to expand it.
mx.fastr/mx_fastr_pkgs.py
+
1
−
3
View file @
ea636938
...
@@ -33,7 +33,6 @@ In either case all the output is placed in the fastr suite dir. Separate directo
...
@@ -33,7 +33,6 @@ In either case all the output is placed in the fastr suite dir. Separate directo
and tests, namely
'
lib.install.packages.{fastr,gnur}
'
and
'
test.{fastr,gnur}
'
(sh syntax).
and tests, namely
'
lib.install.packages.{fastr,gnur}
'
and
'
test.{fastr,gnur}
'
(sh syntax).
'''
'''
from
os.path
import
join
,
relpath
from
os.path
import
join
,
relpath
from
os
import
walk
from
datetime
import
datetime
from
datetime
import
datetime
import
shutil
,
os
,
re
import
shutil
,
os
,
re
import
subprocess
import
subprocess
...
@@ -61,7 +60,6 @@ def _gnur_include_path():
...
@@ -61,7 +60,6 @@ def _gnur_include_path():
return
_mx_gnur
().
extensions
.
_gnur_include_path
()
return
_mx_gnur
().
extensions
.
_gnur_include_path
()
else
:
else
:
gnur_include_p
=
join
(
mx_fastr
.
_gnur_path
(),
"
include
"
)
gnur_include_p
=
join
(
mx_fastr
.
_gnur_path
(),
"
include
"
)
print
(
"
Using GNUR include path: {0}
"
.
format
(
gnur_include_p
))
return
gnur_include_p
return
gnur_include_p
def
_fastr_include_path
():
def
_fastr_include_path
():
...
@@ -654,7 +652,7 @@ def computeApiChecksum(includeDir):
...
@@ -654,7 +652,7 @@ def computeApiChecksum(includeDir):
'''
'''
m
=
hashlib
.
sha256
()
m
=
hashlib
.
sha256
()
rootDir
=
includeDir
rootDir
=
includeDir
for
root
,
dirs
,
files
in
os
.
walk
(
rootDir
):
for
root
,
_
,
files
in
os
.
walk
(
rootDir
):
mx
.
logvv
(
"
Visiting directory {0}
"
.
format
(
root
))
mx
.
logvv
(
"
Visiting directory {0}
"
.
format
(
root
))
for
f
in
files
:
for
f
in
files
:
fileName
=
join
(
root
,
f
)
fileName
=
join
(
root
,
f
)
...
...
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