Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add --post-compile-merge-dir option in zinc #7917

Merged
merged 4 commits into from Jun 23, 2019
Merged

Add --post-compile-merge-dir option in zinc #7917

merged 4 commits into from Jun 23, 2019

Conversation

wisechengyi
Copy link
Contributor

@wisechengyi wisechengyi commented Jun 20, 2019 •
edited

Prerequisite for #7869, so resources like

META-INF/services/
META-INF/services/javax.annotation.processing.Processor

in the z.jar can be added by zinc wrapper instead of post processing by Pants.

stuhood
stuhood approved these changes Jun 21, 2019
View reviewed changes
Copy link
Sponsor Member

@stuhood stuhood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to clean up the naming before landing, but looks good. Thanks.

src/scala/org/pantsbuild/zinc/compiler/BUILD Outdated Show resolved Hide resolved
@wisechengyi wisechengyi changed the title [wip] Add post-compile merge directory step in zinc Add --post-compile-merge-dir step in zinc Jun 22, 2019
@wisechengyi wisechengyi changed the title Add --post-compile-merge-dir step in zinc Add --post-compile-merge-dir option in zinc Jun 22, 2019
@wisechengyi wisechengyi mentioned this pull request Jun 22, 2019
Merged
@wisechengyi
Copy link
Contributor Author

@stuhood any further comment on the naming part, I think --post-compile-merge-dir would do?

@wisechengyi wisechengyi mentioned this pull request Jun 22, 2019
Closed
@stuhood
Copy link
Sponsor Member

stuhood commented Jun 22, 2019

Looks good, thanks!

@wisechengyi wisechengyi merged commit 4aad44d into pantsbuild:master Jun 23, 2019
@wisechengyi wisechengyi deleted the zinc_wrapper_merge_dir branch June 23, 2019 02:59
@wisechengyi
Copy link
Contributor Author

Merged. Please kindly publish zinc wrapper when you get a chance, @stuhood. Thanks!

@stuhood stuhood mentioned this pull request Sep 21, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stuhood stuhood stuhood approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@wisechengyi @stuhood