Skip to content

Commit ef701aa

Browse files
committed
[GR-30568] Remove FastRArchiveParticipant.
PullRequest: fastr/2623
2 parents 74705ed + 7fd64ce commit ef701aa

File tree

2 files changed

+0
-32
lines changed

2 files changed

+0
-32
lines changed

mx.fastr/mx_fastr.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,6 @@ def nativebuild(args):
767767

768768

769769
def mx_post_parse_cmd_line(opts):
770-
mx_fastr_dists.mx_post_parse_cmd_line(opts)
771770
mx_subst.results_substitutions.register_no_arg('graalvm_version', mx.suite('sdk').release_version())
772771
if mx.suite("sulong", fatalIfMissing=False) and not _fastr_suite.isBinarySuite():
773772
# native.recommended runs FastR, it already has a build dependency to the FASTR distribution

mx.fastr/mx_fastr_dists.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -144,37 +144,6 @@ def build(self):
144144
rscript_launcher = join(self.subject.dir, 'src', 'Rscript_launcher')
145145
self._template(rscript_launcher, join(bin_dir, 'Rscript'), template_dict)
146146

147-
148-
class FastRArchiveParticipant:
149-
def __init__(self, dist):
150-
self.dist = dist
151-
152-
def __opened__(self, arc, srcArc, services):
153-
pass
154-
155-
def __add__(self, arcname, contents): # pylint: disable=unexpected-special-method-signature
156-
return False
157-
158-
def __addsrc__(self, arcname, contents):
159-
return False
160-
161-
def __closing__(self):
162-
if "FASTR_RELEASE" in self.dist.name:
163-
assert isinstance(self.dist.deps[0], FastRReleaseProject)
164-
release_project = self.dist.deps[0]
165-
# the files copied in can be confused as source files by
166-
# e.g., mx copyright, so delete them, specifically the
167-
# include dir
168-
include_dir = join(release_project.dir, 'include')
169-
shutil.rmtree(include_dir)
170-
171-
172-
def mx_post_parse_cmd_line(opts):
173-
for dist in _fastr_suite.dists:
174-
if isinstance(dist, mx.JARDistribution):
175-
dist.set_archiveparticipant(FastRArchiveParticipant(dist))
176-
177-
178147
def mx_register_dynamic_suite_constituents(register_project, register_distribution):
179148
fastr_release_distribution = mx.JARDistribution(
180149
suite=_fastr_suite,

0 commit comments

Comments
 (0)