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.

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

truffle modular #2476

Closed
wants to merge 6 commits into from
Closed

truffle modular #2476

wants to merge 6 commits into from

Conversation

@mkristian
Copy link
Member

@mkristian mkristian commented Jan 17, 2015

this is a follow up of #2466 to propose a slightly different setup. it basically introduce a jruby-trufle artifact which can be easily exceluded using the jruby amven artifact. jruby-jars gem takes advantage of it as well, i.e. jruby-core jar there is already truffle free.

@mkristian mkristian force-pushed the test-truffle-modular branch from 087d35a to 75a4913 Jan 17, 2015
@headius
Copy link
Member

@headius headius commented Jan 19, 2015

+1 looks good to me. I'd say we also remove it from jruby-complete, since anyone using jruby-complete can just add jruby-truffle to deps and it will be there.

@headius headius added this to the JRuby 9.0.0.0 milestone Jan 19, 2015
@headius
Copy link
Member

@headius headius commented Jan 21, 2015

This can merge now.

@mkristian
Copy link
Member Author

@mkristian mkristian commented Jan 21, 2015

yes. beside this some cleanup is needed - readline, ripper, back to
SNAPSHOT version, etc

but this can go in as is.

On Wed, Jan 21, 2015 at 8:41 PM, Charles Oliver Nutter <
notifications@github.com> wrote:

This can merge now.


Reply to this email directly or view it on GitHub
#2476 (comment).

mkristian and others added 2 commits Jan 17, 2015
the source is split into core/src and truffle/src. some little
code changes were needed to get it compliled.

the lib/jruby.jar remains as is, dito jruby-complete.jar - just
the way it gets build is slightly different.

jruby-jars.gem has now three jars one is jruby-truffle.jar, so
people want to use truffle need to require this jar as well.

the jruby artifacts (org.jruby:jruby, org.jruby:jruby-noasm) can
easily exclude truffle via :exclusions => ['org.jruby:jruby-truffle']
declaration.
* Removed truffle references from core/pom.
* Moved over some files added after modularization PR.
@headius headius force-pushed the test-truffle-modular branch from 72c824d to 0dc42dc Jan 21, 2015
@headius
Copy link
Member

@headius headius commented Jan 21, 2015

I updated the patch and cleaned up some dependencies and force pushed to the PR branch.

We need to fix -X+T at command line before we merge this, so truffle remains functional at command line. We can do that either in the launcher (requires jruby-launcher work in C/++) or shade it into lib/jruby.jar.

@mkristian
Copy link
Member Author

@mkristian mkristian commented Jan 22, 2015

shade it the truffle into lib/jruby.jar

@mkristian
Copy link
Member Author

@mkristian mkristian commented Jan 22, 2015

merged manually

@mkristian mkristian closed this Jan 22, 2015
@mkristian mkristian deleted the test-truffle-modular branch Jan 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.