Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 06ab258ed5ab^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cfffca21fc99
Choose a head ref
  • 5 commits
  • 6 files changed
  • 1 contributor

Commits on Apr 19, 2017

  1. Copy the full SHA
    06ab258 View commit details
  2. Copy the full SHA
    9ff986e View commit details
  3. Copy the full SHA
    b256a9d View commit details
  4. Copy the full SHA
    b528627 View commit details

Commits on Apr 21, 2017

  1. Copy the full SHA
    cfffca2 View commit details
5 changes: 3 additions & 2 deletions core/src/main/java/org/jruby/RubyClass.java
Original file line number Diff line number Diff line change
@@ -197,8 +197,9 @@ public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
* constructor (Ruby, RubyClass) on the given class via a static
* __allocate__ method intermediate.
*
* @param clazz The class from which to grab a standard Ruby __allocate__
* method.
* @param clazz The class from which to grab a standard Ruby __allocate__ method.
*
* @note Used with `jrubyc --java` generated (interoperability) class files.
*/
public void setRubyStaticAllocator(final Class<?> clazz) {
try {
6 changes: 1 addition & 5 deletions lib/ruby/stdlib/jruby/compiler.rb
Original file line number Diff line number Diff line change
@@ -56,10 +56,6 @@ def compile_argv(argv)
options[:javac_options] << o
end

#opts.on("-5"," --jdk5", "Generate JDK 5 classes (version 49)") do |x|
# options[:jdk5] = true
#end

opts.on("--java", "Generate Java classes (.java) for a script containing Ruby class definitions") do
options[:java] = true
end
@@ -146,7 +142,7 @@ def compile_files_with_options(filenames, options = default_options)

FileUtils.mkdir_p java_dir

java_src = File.join(java_dir, cls.name + ".java")
java_src = File.join(java_dir, "#{cls.name}.java")
puts "Generating Java class #{cls.name} to #{java_src}" if options[:verbose]

files << java_src
Loading