Skip to content

Commit 8d754b3

Browse files
committed
[GR-32010] Remove FASTR_RELEASE jar distribution.
PullRequest: fastr/2624
2 parents fc0a666 + 56038a0 commit 8d754b3

File tree

2 files changed

+15
-34
lines changed

2 files changed

+15
-34
lines changed

com.oracle.truffle.r.native.recommended/Makefile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,19 @@ ifdef FASTR_RECOMMENDED_BINARY
8585
$(info Using FastR recommended packages binary: $(FASTR_RECOMMENDED_BINARY))
8686

8787
install.recommended: $(GNUR_RECOMMENDED_TARS)
88-
if ! (mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr | tail -n 1 | diff -q $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt -); then \
89-
echo "******************************"; \
90-
echo "ERROR:"; \
91-
echo "The checksum of FastR header files does not match the checksum that the recommended packages were build against."; \
92-
echo "You can run appropriate CI jobs in FastR repo to generate a new version of recommended packages binary and then upload it to the appropriate place."; \
93-
echo "******************************"; \
94-
echo "Actual checksum of FastR headers:"; \
95-
echo "$(mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr)"; \
96-
echo "Expected checksum by the recommended pkgs:"; \
97-
cat $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt; \
98-
echo "******************************"; \
99-
exit 1; \
100-
fi
88+
# if ! (mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr | tail -n 1 | diff -q $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt -); then \
89+
# echo "******************************"; \
90+
# echo "ERROR:"; \
91+
# echo "The checksum of FastR header files does not match the checksum that the recommended packages were build against."; \
92+
# echo "You can run appropriate CI jobs in FastR repo to generate a new version of recommended packages binary and then upload it to the appropriate place."; \
93+
# echo "******************************"; \
94+
# echo "Actual checksum of FastR headers:"; \
95+
# echo "$(mx -p $(FASTR_R_HOME) r-pkgcache --print-api-checksum --vm fastr)"; \
96+
# echo "Expected checksum by the recommended pkgs:"; \
97+
# cat $(FASTR_RECOMMENDED_BINARY)/api-checksum.txt; \
98+
# echo "******************************"; \
99+
# exit 1; \
100+
# fi
101101
cp -R $(FASTR_RECOMMENDED_BINARY)/pkgs/* $(FASTR_R_HOME)/library
102102
touch install.recommended
103103

mx.fastr/mx_fastr_dists.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def _get_files(self, d, results, filterfun=None):
5151
class FastRReleaseProject(FastRProjectAdapter): # pylint: disable=too-many-ancestors
5252
'''
5353
Custom class for creating the FastR release project, which supports the
54-
FASTR_RELEASE distribution.
54+
FASTR_GRAALVM_RELEASE distribution.
5555
'''
5656
def __init__(self, suite, name, deps, workingSets, theLicense, **args):
5757
FastRProjectAdapter.__init__(self, suite, name, deps, workingSets, theLicense)
@@ -145,22 +145,6 @@ def build(self):
145145
self._template(rscript_launcher, join(bin_dir, 'Rscript'), template_dict)
146146

147147
def mx_register_dynamic_suite_constituents(register_project, register_distribution):
148-
fastr_release_distribution = mx.JARDistribution(
149-
suite=_fastr_suite,
150-
name="FASTR_RELEASE",
151-
subDir=None,
152-
path="mxbuild/dists/<os>/<arch>/fastr-release.jar",
153-
sourcesPath=None,
154-
deps=["com.oracle.truffle.r.release"],
155-
mainClass=None,
156-
excludedLibs=[],
157-
distDependencies=[],
158-
javaCompliance=None,
159-
platformDependent=True,
160-
theLicense=None
161-
)
162-
fastr_release_distribution.description = "a binary release of FastR"
163-
164148
fastr_graalvm_release = mx.NativeTARDistribution(
165149
suite=_fastr_suite,
166150
name="FASTR_GRAALVM_RELEASE",
@@ -170,11 +154,8 @@ def mx_register_dynamic_suite_constituents(register_project, register_distributi
170154
platformDependent=True,
171155
theLicense=None,
172156
relpath=True,
173-
output=None,
174-
overlaps=["FASTR_RELEASE"]
157+
output=None
175158
)
176-
177-
register_distribution(fastr_release_distribution)
178159
register_distribution(fastr_graalvm_release)
179160

180161

0 commit comments

Comments
 (0)