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: d2aa16917136
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 00138bfc9fb2
Choose a head ref
  • 5 commits
  • 5 files changed
  • 2 contributors

Commits on Aug 10, 2016

  1. Copy the full SHA
    6179070 View commit details
  2. Remove ant mentions

    Also fix 'rake spec:clean_specs' task
    etehtsea committed Aug 10, 2016
    Copy the full SHA
    62b87b5 View commit details
  3. Remove broken 'rake clean' task

    Was superseded by mvn -Pclean
    etehtsea committed Aug 10, 2016
    Copy the full SHA
    d519c72 View commit details
  4. Remove broken 'rake gen' task

    apt tool was removed in Java 8
    http://openjdk.java.net/jeps/117
    etehtsea committed Aug 10, 2016
    Copy the full SHA
    c3b01f7 View commit details
  5. Merge pull request #4059 from etehtsea/rm-dead-code

    Remove dead rake tasks
    enebo authored Aug 10, 2016
    Copy the full SHA
    00138bf View commit details
Showing with 11 additions and 45 deletions.
  1. +1 −1 COPYING
  2. +0 −30 Rakefile
  3. +0 −3 rakelib/helpers.rb
  4. +7 −8 rakelib/rubyspec.rake
  5. +3 −3 spec/READ_ME_FIRST.txt
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ below. Also see LICENSE.RUBY for most files found in lib/ruby/stdlib.
joni (http://github.com/jruby/joni) are distributed
under the MIT license.

ant (http://ant.apache.org/),
maven (http://maven.apache.org/),
jnr-constants (http://github.com/jnr/jnr-constants),
joda-time (http://joda-time.sourceforge.net),
jffi (https://github.com/jnr/jffi),
30 changes: 0 additions & 30 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -15,33 +15,3 @@ begin
/(#{Rake::Backtrace::SUPPRESS_PATTERN})|(^org\/jruby)/
rescue
end

task :default => [:build]

desc "Build JRuby"
task :build do
ant "jar"
end

task :jar => :build

desc "Clean all built output"
task :clean do
delete_files = FileList.new do |fl|
fl.
include("#{BUILD_DIR}/**").
exclude("#{BUILD_DIR}/rubyspec").
include(DIST_DIR).
include(API_DOCS_DIR)
end

delete_files.each {|files| rm_rf files, :verbose => true}
end

desc "Generate sources, compile and add to jar file"
task :gen do
mkdir_p 'build/src_gen'
system 'apt -nocompile -cp lib/jruby.jar:build_lib/asm-4.0.jar:build_lib/asm-util-4.0.jar -factory org.jruby.anno.AnnotationBinder src/org/jruby/*.java'
system 'javac -cp lib/jruby.jar build/src_gen/*.java'
system 'jar -uf lib/jruby.jar -C build/src_gen .'
end
3 changes: 0 additions & 3 deletions rakelib/helpers.rb
Original file line number Diff line number Diff line change
@@ -24,9 +24,6 @@ def load_build_properties_into_constants
end
load_build_properties_into_constants

# def ant(*args)
# raise 'running ant failed!' unless system "ant -logger org.apache.tools.ant.NoBannerLogger #{args.join(' ')}"
# end
require 'digest'

class HashTask < Struct.new(:hash, :file)
15 changes: 7 additions & 8 deletions rakelib/rubyspec.rake
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ namespace :spec do
# The specs below this section will run specs, but they will not retrieve
# the specs they run against. This is so we can run the similiar mspec
# runs against a stable and head version of the rubyspecs.

desc "Run rubyspecs expected to pass in interpreted mode"
task :ruby => :ci_interpreted
desc "Run rubyspecs expected to pass in interpreted mode"
@@ -67,32 +67,32 @@ namespace :spec do
desc "Tagged specs in JIT mode only (threshold=0)"
task :compiled do
mspec :compile_mode => "JIT",
:jit_threshold => 0,
:jit_threshold => 0,
:format => 'd'
end

desc "Tagged specs in AOT mode only"
task :precompiled do
mspec :compile_mode => "FORCE",
:jit_threshold => 0,
:jit_threshold => 0,
:format => 'd'
end

desc "All specs in interpreted mode only"
task :all_interpreted do
mspec :compile_mode => "OFF",
mspec :compile_mode => "OFF",
:format => 'd'
end

desc "All specs in JIT mode only (threshold=0)"
task :all_compiled_18 do
mspec :compile_mode => "JIT", :jit_threshold => 0,
mspec :compile_mode => "JIT", :jit_threshold => 0,
:format => 'd'
end

desc "All specs in AOT mode only"
task :all_precompiled do
mspec :compile_mode => "FORCE", :jit_threshold => 0,
mspec :compile_mode => "FORCE", :jit_threshold => 0,
:format => 'd'
end

@@ -114,7 +114,7 @@ namespace :spec do
puts "Rolling mspec to stable version"
git_submodule_update('spec/mspec')
end

task :fast_forward_to_rubyspec_head => :fetch_latest_specs do
puts "Rolling to rubyspec to latest version"
git_checkout('rubyspec', 'origin/HEAD', RUBYSPEC_DIR)
@@ -148,7 +148,6 @@ namespace :spec do
def clean_spec_dirs(wipe_spec_dir = false)
rm_rf RUBYSPEC_DIR if wipe_spec_dir
rm_rf MSPEC_DIR
rm_f RUBYSPEC_TAR_FILE
rm_f MSPEC_TAR_FILE
rm_f File.join(SPEC_DIR, "rubyspecs.current.revision")
end
6 changes: 3 additions & 3 deletions spec/READ_ME_FIRST.txt
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
The RubySpec files in 'spec/ruby' dir are not intended
to be edited directly, since the location is not safe,
and will be deleted/recreated every time there is a
spec version update!!! Also, 'ant clean-all' will
spec version update!!! Also, 'rake spec:clean_specs' will
delete the whole directory.

If you have some modified files in spec/ruby directory,
@@ -14,7 +14,7 @@ using the standalone RubySpec repository outside of
JRuby tree.

More info about RubySpec can be found here:
http://rubyspec.org/projects/show/rubyspec
https://github.com/ruby/spec

JRuby-specific info can be found here:
http://kenai.com/projects/jruby/pages/JRubyAndRubySpecs
https://github.com/jruby/jruby/wiki/JRubyAndRubySpecs