libusb 0.3.1-x86-mingw32 → 0.3.2-x86-mingw32

data/History.md

@@ -1,3 +1,9 @@
+0.3.2 / 2013-02-16
+------------------
+* Don't enforces DevKit installation on Windows.
+* Fix error check on libusb_get_device_list(). Thanks to Paul Kunysch for the bug report.
+* Add support for Cygwin. Requires ffi-1.4.0.
+
 0.3.1 / 2013-01-22
 ------------------
 * Fix loading of compiled libusb library on OSX

data/Rakefile

@@ -132,7 +132,8 @@ task :cross => [ :mingw32, :libusb_dll ] do |t|
   spec.instance_variable_set(:"@cache_file", nil) if spec.respond_to?(:cache_file)
   spec.platform = Gem::Platform.new('i386-mingw32')
   spec.files << "lib/#{File.basename(LIBUSB_DLL)}"
-  spec.files -= `git ls-files ext/libusbx-*`.split("\n")
+  spec.files -= `git ls-files ext`.split("\n")
+  spec.extensions = []
 
   # Generate a package for this gem
   Gem::PackageTask.new(spec) do |pkg|

data/lib/libusb/call.rb

@@ -23,9 +23,12 @@ module LIBUSB
   module Call
     extend FFI::Library
 
+    root_path = File.expand_path("../../..", __FILE__)
     ext = FFI::Platform::LIBSUFFIX
-    bundled_dll = File.expand_path("../../libusb-1.0.#{ext}", __FILE__)
-    ffi_lib(['libusb-1.0', bundled_dll])
+    prefix = FFI::Platform::LIBPREFIX.empty? ? 'lib' : FFI::Platform::LIBPREFIX
+    bundled_dll = File.join(root_path, "lib/#{prefix}usb-1.0.#{ext}")
+    bundled_dll_cygwin = File.join(root_path, "bin/#{prefix}usb-1.0.#{ext}")
+    ffi_lib(["#{prefix}usb-1.0", bundled_dll, bundled_dll_cygwin])
 
     ClassCodes = enum :libusb_class_code, [
       :CLASS_PER_INTERFACE, 0,
@@ -165,7 +168,7 @@ module LIBUSB
     attach_function 'libusb_set_debug', [:pointer, :int], :void
     try_attach_function 'libusb_has_capability', [:libusb_capability], :int
 
-    attach_function 'libusb_get_device_list', [:pointer, :pointer], :size_t
+    attach_function 'libusb_get_device_list', [:pointer, :pointer], :ssize_t
     attach_function 'libusb_free_device_list', [:pointer, :int], :void
     attach_function 'libusb_ref_device', [:pointer], :pointer
     attach_function 'libusb_unref_device', [:pointer], :void

data/lib/libusb/version_gem.rb

@@ -15,5 +15,5 @@
 
 module LIBUSB
   # Library version of libusb for Ruby
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -64,8 +64,7 @@ description: LIBUSB is a Ruby binding that gives Ruby programmers access to arbi
 email:
 - lars@greiz-reinsdorf.de
 executables: []
-extensions:
-- ext/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -76,7 +75,6 @@ files:
 - History.md
 - README.md
 - Rakefile
-- ext/extconf.rb
 - lib/libusb.rb
 - lib/libusb/call.rb
 - lib/libusb/compat.rb

data/ext/extconf.rb

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'ffi'
-
-begin
-  module LibTest
-    extend FFI::Library
-    ext = FFI::Platform::LIBSUFFIX
-    bundled_dll = File.expand_path("../../lib/libusb-1.0.#{ext}", __FILE__)
-    ffi_lib(['libusb-1.0', bundled_dll])
-  end
-rescue LoadError
-  # Unable to load libusb library on this system,
-  # so we build our bundled version:
-
-  libusb_dir = Dir[File.expand_path('../../ext/libusbx-*', __FILE__)].first
-  root_dir = File.expand_path('../..', __FILE__)
-  raise "could not find embedded libusb sources" unless libusb_dir
-
-  old_dir = Dir.pwd
-  Dir.chdir libusb_dir
-  cmd = "./configure --prefix=#{root_dir} && make && make install"
-  puts cmd
-  system cmd
-  raise "libusb build exited with #{$?.exitstatus}" if $?.exitstatus!=0
-  Dir.chdir old_dir
-end
-
-File.open("Makefile", "w") do |mf|
-  mf.puts "# Dummy makefile since libusb-1.0 is usable on this system"
-  mf.puts "all install::\n"
-end