Skip to content
Snippets Groups Projects
Commit 24da2526 authored by Danilo Ansaloni's avatar Danilo Ansaloni Committed by Gilles Duboscq
Browse files

Add a FastR module.

parent 9ca04846
No related branches found
No related tags found
No related merge requests found
...@@ -201,6 +201,8 @@ def mx_post_parse_cmd_line(opts): ...@@ -201,6 +201,8 @@ def mx_post_parse_cmd_line(opts):
else: else:
val = "" val = ""
mx.instantiateDistribution('FASTR_RELEASE<rffi>', dict(rffi=val)) mx.instantiateDistribution('FASTR_RELEASE<rffi>', dict(rffi=val))
if os.environ.has_key('FASTR_RELEASE') and val == '':
mx.instantiateDistribution('FASTR_GRAALVM_SUPPORT<rffi>', dict(rffi=val))
for dist in mx_fastr._fastr_suite.dists: for dist in mx_fastr._fastr_suite.dists:
if isinstance(dist, mx.JARDistribution): if isinstance(dist, mx.JARDistribution):
......
...@@ -309,7 +309,7 @@ suite = { ...@@ -309,7 +309,7 @@ suite = {
"sourceDirs" : ["src"], "sourceDirs" : ["src"],
"buildDependencies" : ["com.oracle.truffle.r.native.recommended"], "buildDependencies" : ["com.oracle.truffle.r.native.recommended"],
"class" : "FastRReleaseProject", "class" : "FastRReleaseProject",
"output" : "com.oracle.truffle.r.release" "output" : "com.oracle.truffle.r.release",
}, },
"com.oracle.truffle.r.native.recommended" : { "com.oracle.truffle.r.native.recommended" : {
...@@ -417,8 +417,8 @@ suite = { ...@@ -417,8 +417,8 @@ suite = {
"FASTR_RELEASE<rffi>": { "FASTR_RELEASE<rffi>": {
"description" : "a binary release of FastR", "description" : "a binary release of FastR",
"dependencies" : ["com.oracle.truffle.r.release"], "dependencies" : ["com.oracle.truffle.r.release"],
"os_arch" : { "os_arch" : {
"linux" : { "linux" : {
"amd64" : { "amd64" : {
"path" : "mxbuild/dists/linux/amd64/<rffi>/fastr-release.jar", "path" : "mxbuild/dists/linux/amd64/<rffi>/fastr-release.jar",
}, },
...@@ -441,5 +441,39 @@ suite = { ...@@ -441,5 +441,39 @@ suite = {
}, },
}, },
}, },
"FASTR_GRAALVM_SUPPORT<rffi>" : {
"native" : True,
"platformDependent" : True,
"description" : "FastR support distribution for the GraalVM",
"layout" : {
"./" : [
{
"source_type": "extracted-dependency",
"dependency": "FASTR_RELEASE<rffi>",
"path": "*",
"exclude": [
"COPYRIGHT",
"LICENSE",
"README.md",
"bin/fastr_jars",
],
},
{
"source_type": "extracted-dependency",
"dependency": "FASTR_RELEASE<rffi>",
"path": "bin/fastr_jars/*",
"exclude" : [
"bin/fastr_jars/truffle*",
"bin/fastr_jars/graal-sdk*",
],
},
"dependency:fastr:GNUR",
],
"COPYRIGHT_FASTR" : "extracted-dependency:fastr:FASTR_RELEASE<rffi>/COPYRIGHT",
"LICENSE_FASTR" : "extracted-dependency:fastr:FASTR_RELEASE<rffi>/LICENSE",
"README_FASTR" : "extracted-dependency:fastr:FASTR_RELEASE<rffi>/README.md",
},
}
}, },
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment