@@ -23,27 +23,27 @@ if defined?(JRUBY_VERSION)
2323
2424 EXTENSION_NAME = 'concurrent_jruby'
2525
26- directory " pkg/classes"
26+ directory ' pkg/classes'
2727
28- desc " Clean up build artifacts"
28+ desc ' Clean up build artifacts'
2929 task :clean do
30- rm_rf " pkg/classes"
30+ rm_rf ' pkg/classes'
3131 rm_rf "lib/#{ EXTENSION_NAME } .jar"
3232 end
3333
34- desc " Compile the extension"
35- task :compile_java => " pkg/classes" do |t |
36- ant . javac :srcdir => " ext" , :destdir => t . prerequisites . first ,
37- :source => " 1.5" , :target => " 1.5" , :debug => true ,
38- :classpath => " ${java.class.path}:${sun.boot.class.path}"
34+ desc ' Compile the extension'
35+ task :compile => ' pkg/classes' do |t |
36+ ant . javac :srcdir => ' ext' , :destdir => t . prerequisites . first ,
37+ :source => ' 1.5' , :target => ' 1.5' , :debug => true ,
38+ :classpath => ' ${java.class.path}:${sun.boot.class.path}'
3939 end
4040
41- desc " Build the jar"
42- task :jar => :compile_java do
43- ant . jar :basedir => " pkg/classes" , :destfile => "lib/#{ EXTENSION_NAME } .jar" , :includes => " **/*.class"
41+ desc ' Build the jar'
42+ task :jar => :compile do
43+ ant . jar :basedir => ' pkg/classes' , :destfile => "lib/#{ EXTENSION_NAME } .jar" , :includes => ' **/*.class'
4444 end
4545
46- task :compile => :jar
46+ task :compile_java => :jar
4747
4848elsif use_c_extensions?
4949
@@ -72,7 +72,9 @@ RSpec::Core::RakeTask.new(:travis_spec) do |t|
7272 t . rspec_opts = '--tag ~@not_on_travis'
7373end
7474
75- if use_c_extensions?
75+ if defined? ( JRUBY_VERSION )
76+ task :default => [ :compile_java , :travis_spec ]
77+ elsif use_c_extensions?
7678 task :default => [ :compile_c , :travis_spec ]
7779else
7880 task :default => [ :travis_spec ]
0 commit comments