From 77b126630b70804a9e2598e71816939c811d9019 Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Fri, 23 Jun 2017 10:23:28 -0700
Subject: [PATCH] [GR-4680] Back out templated distribution.
---
mx.fastr/mx_fastr_dists.py | 6 ------
mx.fastr/suite.py | 10 +++++-----
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/mx.fastr/mx_fastr_dists.py b/mx.fastr/mx_fastr_dists.py
index c90cf2fc38..b04c134286 100644
--- a/mx.fastr/mx_fastr_dists.py
+++ b/mx.fastr/mx_fastr_dists.py
@@ -213,12 +213,6 @@ class FastRArchiveParticipant:
shutil.rmtree(include_dir)
def mx_post_parse_cmd_line(opts):
- if os.environ.has_key('FASTR_RFFI'):
- val = os.environ['FASTR_RFFI']
- else:
- val = ""
-
- mx.instantiateDistribution('FASTR_RELEASE<rffi>', dict(rffi=val))
for dist in mx_fastr._fastr_suite.dists:
if isinstance(dist, mx.JARDistribution):
dist.set_archiveparticipant(FastRArchiveParticipant(dist))
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 03a6208f07..b827db1097 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -365,26 +365,26 @@ suite = {
],
},
- "FASTR_RELEASE<rffi>": {
+ "FASTR_RELEASE": {
"description" : "a binary release of FastR",
"dependencies" : ["com.oracle.truffle.r.release"],
"os_arch" : {
"linux" : {
"amd64" : {
- "path" : "mxbuild/dists/linux/amd64/<rffi>/fastr-release.jar",
+ "path" : "mxbuild/dists/linux/amd64/fastr-release.jar",
},
"sparcv9" : {
- "path" : "mxbuild/dists/linux/sparcv9/<rffi>/fastr-release.jar",
+ "path" : "mxbuild/dists/linux/sparcv9/fastr-release.jar",
},
},
"darwin" : {
"amd64" : {
- "path" : "mxbuild/dists/darwin/amd64/<rffi>/fastr-release.jar",
+ "path" : "mxbuild/dists/darwin/amd64/fastr-release.jar",
},
},
"solaris" : {
"sparcv9" : {
- "path" : "mxbuild/dists/solaris/sparcv9/<rffi>/fastr-release.jar",
+ "path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar",
},
},
},
--
GitLab