-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into truffle-head
Conflicts: core/src/main/java/org/jruby/util/cli/Options.java truffle/src/main/java/org/jruby/truffle/runtime/RubyContext.java
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
- 9.0.5.0
Showing
38 changed files
with
630 additions
and
308 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
#!/usr/bin/env ruby | ||
|
||
require_relative '../lib/jruby+truffle_runner.rb' | ||
JRubyTruffleRunner.new |
29 changes: 29 additions & 0 deletions
29
tool/truffle/jruby_truffle_runner/gem_configurations/activesupport.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- | ||
:global: | ||
# default ../jruby/bin/ruby won't work since activesupport is one more dir deeper | ||
:jruby_truffle_path: '../../jruby/bin/jruby' | ||
:graal_path: '../../graalvm-jdk1.8.0/bin/java' | ||
:setup: | ||
:file: | ||
shims.rb: | | ||
require 'minitest' | ||
# mock diff, it calls not fully supported Kernel#system | ||
module Minitest | ||
module Assertions | ||
def self.diff | ||
nil | ||
end | ||
end | ||
end | ||
# mock load_plugins as it loads rubygems | ||
def Minitest.load_plugins | ||
end | ||
bundler.rb: "module Bundler; def self.setup; end; end" | ||
# mock method_source gem | ||
method_source.rb: nil | ||
# do not let bundler to install db gem group | ||
:without: | ||
- db | ||
:run: | ||
:require: | ||
- shims |
4 changes: 4 additions & 0 deletions
4
tool/truffle/jruby_truffle_runner/gem_configurations/psd.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
--- | ||
:setup: | ||
:file: | ||
nokogiri.rb: nil |
17 changes: 17 additions & 0 deletions
17
tool/truffle/jruby_truffle_runner/jruby+truffle_runner.gemspec
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
Gem::Specification.new do |s| | ||
s.name = 'jruby+truffle_runner' | ||
s.version = '0.0.1' | ||
s.platform = Gem::Platform::RUBY | ||
s.authors = ['Petr Chalupa'] | ||
s.email = ['git@pitr.ch'] | ||
s.homepage = 'https://github.com/jruby/jruby' | ||
s.summary = 'Temporary JRuby+Truffle runner' | ||
s.description = 'Until JRuby+Truffle is more complete, allows to run apps/gems simply on JRuby+Truffle.' | ||
|
||
s.required_rubygems_version = '>= 1.3.6' | ||
|
||
s.files = Dir['{lib}/**/*.rb', 'bin/*', 'gem_configurations/*.yaml', 'LICENSE', '*.md'] | ||
s.require_path = 'lib' | ||
|
||
s.executables = ['jruby+truffle'] | ||
end |
Oops, something went wrong.