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] make j+tr part of the distribution #3412

Merged
merged 1 commit into from Nov 17, 2015

Conversation

Projects
None yet
5 participants
@pitr-ch
Copy link
Member

pitr-ch commented Oct 22, 2015

No description provided.

@pitr-ch pitr-ch added the truffle label Oct 22, 2015

@pitr-ch pitr-ch self-assigned this Oct 22, 2015

@pitr-ch pitr-ch added this to the truffe milestone Oct 22, 2015

@pitr-ch pitr-ch force-pushed the pitr-ch:master branch 3 times, most recently from fca7c7f to be4a64e Oct 22, 2015

@@ -0,0 +1 @@
echo Windows are not yet supported by jruby+truffle.

This comment has been minimized.

Copy link
@nirvdrum

nirvdrum Oct 22, 2015

Contributor

English is weird. You really want to say "Windows is not" here because it's a singular item referring to the name of the operating system.

This comment has been minimized.

Copy link
@eregon

eregon Oct 22, 2015

Member

is, no?


require 'jruby+truffle/runner'

JRubyTruffleRunner.new

This comment has been minimized.

Copy link
@eregon

eregon Oct 22, 2015

Member

How is this going to work? you need a require_relative I think.

This comment has been minimized.

Copy link
@pitr-ch

pitr-ch Oct 22, 2015

Author Member

The runner file is on the same path as stdlib so it always available in jruby.

This comment has been minimized.

Copy link
@eregon

eregon Oct 23, 2015

Member

But what if I want to run it with MRI?

@nirvdrum

This comment has been minimized.

Copy link
Contributor

nirvdrum commented Oct 22, 2015

Looks good.

@mkristian

This comment has been minimized.

Copy link
Member

mkristian commented Oct 22, 2015

looks good for me as well. but I really would like to hear some comment from @headius and @enebo about adding this to ./lib/ruby/stdlib

@pitr-ch pitr-ch force-pushed the pitr-ch:master branch 2 times, most recently from 55681ec to dad7f08 Oct 22, 2015

@mkristian mkristian modified the milestones: JRuby 9.0.5.0, truffe Oct 23, 2015

@mkristian mkristian added the stdlib label Oct 23, 2015

@pitr-ch pitr-ch force-pushed the pitr-ch:master branch 2 times, most recently from be7eac4 to 90bf1a0 Oct 27, 2015

@pitr-ch

This comment has been minimized.

Copy link
Member Author

pitr-ch commented Oct 30, 2015

@enebo @headius: is this too invasive, or can it be merged?

@enebo

This comment has been minimized.

Copy link
Member

enebo commented Nov 5, 2015

@pitr-ch is there any reason this cannot be in lib/ruby/truffle? stdlib is mostly for files which are in MRI's stdlib. I think we have some variants like jossl (although I think this is a mistake) but mostly those variants are working around differences between MRI and JRuby.

@pitr-ch

This comment has been minimized.

Copy link
Member Author

pitr-ch commented Nov 8, 2015

@enebo This tool is suppose to be loaded in JRuby it can prepare environment to run files with gems in JRuby+Truffle and then run files in the prepared environment. The tool always runs in JRuby it computes required options and then it executes JRuby+Truffle with them. If it is in lib/ruby/truffle it won't be visible to JRuby.

@mkristian

This comment has been minimized.

Copy link
Member

mkristian commented Nov 9, 2015

@pitr-ch as I understand it, the tool is executes exclusively via the bin/jruby+truffle

so instead of https://github.com/jruby/jruby/pull/3412/files#diff-0e9caaa4ef2b36ca7f4ea6308854ebd7R3
you could use something like

require File.join(JRuby.runtime.instance_config.jruby_home, 'lib/ruby/truffle/jruby+truffle/runner')
@pitr-ch

This comment has been minimized.

Copy link
Member Author

pitr-ch commented Nov 9, 2015

@mkristian ah thanks for the suggestion. Sounds good, I'll update the PR.

@pitr-ch pitr-ch force-pushed the pitr-ch:master branch from 90bf1a0 to 7b6436b Nov 17, 2015

@pitr-ch

This comment has been minimized.

Copy link
Member Author

pitr-ch commented Nov 17, 2015

@mkristian @enebo updated and ready for merge.

@mkristian

This comment has been minimized.

Copy link
Member

mkristian commented Nov 17, 2015

I think travis does not really run into this change. merging.

mkristian added a commit that referenced this pull request Nov 17, 2015

Merge pull request #3412 from pitr-ch/master
[Truffle] make j+tr part of the distribution

@mkristian mkristian merged commit 42c4a2c into jruby:master Nov 17, 2015

1 check was pending

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
@mkristian

This comment has been minimized.

Copy link
Member

mkristian commented Nov 18, 2015

@pitr-ch thanx for all this shifting around a second time

@pitr-ch

This comment has been minimized.

Copy link
Member Author

pitr-ch commented Nov 18, 2015

No problem at all @mkristian. I was a better option.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.