New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rsc-compile] Bump rsc and scala meta versions in rsc compile #6683

Merged
merged 6 commits into from Oct 30, 2018

Conversation

Projects
None yet
3 participants
@baroquebobcat
Contributor

baroquebobcat commented Oct 25, 2018

fixes #6519

This adjusts how rsc is called to account for the fact that rsc now generates mjars containing both semantic dbs and scalac compatible annotations.

# Step 2: Outline Scala sources into SemanticDB
# ---------------------------------------------
rsc_outline_dir = fast_relpath(ctx.rsc_outline_dir, get_buildroot())

This comment has been minimized.

@xeno-by

xeno-by Oct 25, 2018

Contributor

Do we still need rsc_outline_dir?

This comment has been minimized.

@baroquebobcat

baroquebobcat Oct 25, 2018

Contributor

no, I could xx it too now that you mention it.

@xeno-by

This comment has been minimized.

Contributor

xeno-by commented Oct 25, 2018

@baroquebobcat Also, could you tell more about the problem with removing the workaround?

@stuhood

Great!

@@ -857,6 +809,7 @@ def _collect_metai_classpath(self, metacp_result, relative_input_paths):
# TODO remove this after https://github.com/scalameta/scalameta/issues/1791 is released

This comment has been minimized.

@stuhood

stuhood Oct 25, 2018

Member

Off topic, but: this is going to be problematic for #6679 I think.

This comment has been minimized.

@baroquebobcat

baroquebobcat Oct 25, 2018

Contributor

Yeah. Looks like I need to implement something for scalameta/scalameta#1791 sooner rather than later--or fall back to a sort and search based approach.

Hm. Maybe a sort based approach would be more resilient. It bothers me that I've spent this much time on this particular awkward file munging problem.

@baroquebobcat

This comment has been minimized.

Contributor

baroquebobcat commented Oct 25, 2018

@xeno-by I ran into a similar error to what I'd seen before. My guess is that it's related to how compiler plugins are handled, but I haven't dug into it yet.

@xeno-by

This comment has been minimized.

Contributor

xeno-by commented Oct 26, 2018

@baroquebobcat Do you have a stack trace or an stdout/stderr? If the error is exactly the same, then it's a bug in Metacp, and I'd like to know about this.

@baroquebobcat

This comment has been minimized.

Contributor

baroquebobcat commented Oct 29, 2018

I'll let you know when I run into it next

@@ -863,6 +811,7 @@ def _collect_metai_classpath(self, metacp_result, relative_input_paths):
os.path.join(relative_workdir, 'resolve', 'ivy', '[^/]*', 'ivy', 'jars', '.*'),

This comment has been minimized.

@stuhood

stuhood Oct 29, 2018

Member

This fix no longer includes adding coursier, which I think it did originally? It will need to use the new location of the coursier cache.

This comment has been minimized.

@baroquebobcat

baroquebobcat Oct 29, 2018

Contributor

Oh, right

def desandboxify(path):
if not path:
return path
for r in regexes:
match = r.search(path)
print('>>> matched {} with {} against {}'.format(match, r.pattern, path))

This comment has been minimized.

@stuhood

stuhood Oct 30, 2018

Member

Doh. Sorry.

@baroquebobcat baroquebobcat merged commit a23f248 into pantsbuild:master Oct 30, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment