Skip to content

Commit 5cbf492

Browse files
committed
Move JRuby implementation under jruby/lib
1 parent 3837d1a commit 5cbf492

12 files changed

Lines changed: 17 additions & 17 deletions

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ Gemfile.lock
1111
*.bundle
1212
*.dll
1313
*.so
14-
lib/ffi/io/console/version.rb
14+
jruby/lib/io/console/version.rb

‎Rakefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ if RUBY_ENGINE == "ruby" || RUBY_ENGINE == "truffleruby"
1212
task :test => :compile
1313
end
1414

15-
ffi_version_file = "lib/ffi/#{name}/version.rb"
16-
task ffi_version_file => "#{name.tr('/', '-')}.gemspec" do |t|
15+
jruby_version_file = "jruby/lib/#{name}/version.rb"
16+
task jruby_version_file => "#{name.tr('/', '-')}.gemspec" do |t|
1717
version = <<~RUBY
1818
class IO
1919
module Console
@@ -26,14 +26,14 @@ task ffi_version_file => "#{name.tr('/', '-')}.gemspec" do |t|
2626
end
2727
end
2828

29-
task :build => ffi_version_file
30-
task :test => ffi_version_file if RUBY_ENGINE == "jruby"
29+
task :build => jruby_version_file
30+
task :test => jruby_version_file if RUBY_ENGINE == "jruby"
3131

3232
Rake::TestTask.new(:test) do |t|
3333
if extask
3434
t.libs = [extask.lib_dir.chomp("/"+File.dirname(name))]
3535
end
36-
t.libs.unshift "lib/ffi" if RUBY_ENGINE == "jruby"
36+
t.libs.unshift "jruby/lib" if RUBY_ENGINE == "jruby"
3737
t.libs << "test/lib"
3838
t.ruby_opts << "-rhelper"
3939
t.options = "--ignore-name=TestIO_Console#test_bad_keyword" if RUBY_ENGINE == "jruby"

‎io-console.gemspec‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ Gem::Specification.new do |s|
3636
if Gem::Platform === s.platform and s.platform =~ 'java'
3737
s.files.delete_if {|f| f.start_with?("ext/")}
3838
s.extensions.clear
39-
s.require_paths.unshift('lib/ffi')
39+
s.require_paths.unshift('jruby/lib')
4040
s.files.concat(%w[
41-
lib/ffi/io/console.rb
42-
lib/ffi/io/console/bsd_console.rb
43-
lib/ffi/io/console/common.rb
44-
lib/ffi/io/console/linux_console.rb
45-
lib/ffi/io/console/native_console.rb
46-
lib/ffi/io/console/stty_console.rb
47-
lib/ffi/io/console/stub_console.rb
48-
lib/ffi/io/console/windows_constants.rb
49-
lib/ffi/io/console/windows_console.rb
50-
lib/ffi/io/console/version.rb
41+
jruby/lib/io/console.rb
42+
jruby/lib/io/console/bsd_console.rb
43+
jruby/lib/io/console/common.rb
44+
jruby/lib/io/console/linux_console.rb
45+
jruby/lib/io/console/native_console.rb
46+
jruby/lib/io/console/stty_console.rb
47+
jruby/lib/io/console/stub_console.rb
48+
jruby/lib/io/console/windows_constants.rb
49+
jruby/lib/io/console/windows_console.rb
50+
jruby/lib/io/console/version.rb
5151
])
5252
end
5353

0 commit comments

Comments
 (0)