libusb 0.3.2 → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c66fa9a97ecf163d05713d9e124447d8de0cef6e
+  data.tar.gz: 54c7ec8a19d226fbbd21fec0f2d0372252ba691c
+SHA512:
+  metadata.gz: 7da5f1b663be5de6dd92d4d5c1e8487cfb8238d83e6e94201e4771bf378c82ff998fbcf55b8d568ae329f9de0165fcbdc064953523212c45eed19059735adedb
+  data.tar.gz: eacb7067b56c6e454178679e880b986a0f393b1548f111e5ad9eba3cc5f256c222f70c616dc4bcb5fcee2d0c205286486ca23f9bafb62d3960536443359a5e81

data/History.md

@@ -1,3 +1,8 @@
+0.3.3 / 2013-04-05
+------------------
+* Build and package binary x64 version of libusb for Windows in addition to x86.
+* Fix build on Windows from source gem (although may take almost an hour).
+
 0.3.2 / 2013-02-16
 ------------------
 * Don't enforces DevKit installation on Windows.

data/Rakefile

@@ -2,10 +2,11 @@
 # -*- ruby -*-
 
 require 'bundler/gem_tasks'
+require 'rubygems/package_task'
 require 'pathname'
 require 'uri'
-require 'rake/extensiontask'
-require 'rake/extensioncompiler'
+require 'ostruct'
+require 'rake/clean'
 
 task :gem => :build
 task :compile do
@@ -20,17 +21,8 @@ task :travis=>:compile do
 end
 task :default => :test
 
-# Cross-compilation constants
 COMPILE_HOME               = Pathname( "./tmp" ).expand_path
 STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
-STATIC_BUILDDIR            = COMPILE_HOME + 'builds'
-RUBY_BUILD                 = RbConfig::CONFIG["host"]
-CROSS_PREFIX = begin
-  Rake::ExtensionCompiler.mingw_host
-rescue => err
-  $stderr.puts "Cross-compilation disabled -- %s" % [ err.message ]
-  'unknown'
-end
 
 # Fetch tarball from sourceforge
 # LIBUSB_VERSION            = ENV['LIBUSB_VERSION'] || '1.0.9'
@@ -52,26 +44,11 @@ LIBUSB_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBUSB_SOURCE_URI
 # LIBUSB_SOURCE_URI         = URI( "http://git.libusb.org/?p=libusb-pbatard.git;a=snapshot;h=#{LIBUSB_VERSION};sf=tbz2" )
 # LIBUSB_TARBALL            = STATIC_SOURCESDIR + "libusb-pbatard-#{LIBUSB_VERSION}.tar.bz2"
 
-# Static libusb build vars
-STATIC_LIBUSB_BUILDDIR    = STATIC_BUILDDIR + LIBUSB_TARBALL.basename(".tar.bz2")
-LIBUSB_CONFIGURE          = STATIC_LIBUSB_BUILDDIR + 'configure'
-LIBUSB_MAKEFILE           = STATIC_LIBUSB_BUILDDIR + 'Makefile'
-LIBUSB_DLL                = STATIC_LIBUSB_BUILDDIR + 'libusb/.libs/libusb-1.0.dll'
-
 EXT_BUILDDIR              = Pathname( "./ext" ).expand_path
 EXT_LIBUSB_BUILDDIR       = EXT_BUILDDIR + LIBUSB_TARBALL.basename(".tar.bz2")
 
-#####################################################################
-### C R O S S - C O M P I L A T I O N - T A S K S
-#####################################################################
-
 directory STATIC_SOURCESDIR.to_s
 
-#
-# Static libusb build tasks
-#
-directory STATIC_LIBUSB_BUILDDIR.to_s
-
 # libusb source file should be stored there
 file LIBUSB_TARBALL => STATIC_SOURCESDIR do |t|
   # download the source file using wget or curl
@@ -81,74 +58,118 @@ file LIBUSB_TARBALL => STATIC_SOURCESDIR do |t|
   end
 end
 
-# Extract the libusb builds
-file STATIC_LIBUSB_BUILDDIR => LIBUSB_TARBALL do |t|
-  sh 'tar', '-xjf', LIBUSB_TARBALL.to_s, '-C', STATIC_LIBUSB_BUILDDIR.parent.to_s
-  LIBUSB_MAKEFILE.unlink if LIBUSB_MAKEFILE.exist?
-end
 
-file LIBUSB_CONFIGURE => STATIC_LIBUSB_BUILDDIR do |t|
-  Dir.chdir( STATIC_LIBUSB_BUILDDIR ) do
-    sh "sh autogen.sh && make distclean"
-  end
-end
+class CrossLibrary < OpenStruct
+  include Rake::DSL
 
-LIBUSB_ENV = [
-  "CFLAGS='-fno-omit-frame-pointer'",
-]
-
-# generate the makefile in a clean build location
-file LIBUSB_MAKEFILE => LIBUSB_CONFIGURE do |t|
-  Dir.chdir( STATIC_LIBUSB_BUILDDIR ) do
-    options = [
-      "--target=#{CROSS_PREFIX}",
-      "--host=#{CROSS_PREFIX}",
-      "--build=#{RUBY_BUILD}",
-    ]
+  def initialize(ruby_platform, host_platform)
+    super()
 
-    configure_path = STATIC_LIBUSB_BUILDDIR + 'configure'
-    sh "env #{[LIBUSB_ENV, configure_path.to_s, *options].join(" ")}"
-  end
-end
+    self.ruby_platform              = ruby_platform
+    self.host_platform              = host_platform
 
-# make libusb-1.0.a
-task LIBUSB_DLL => [ LIBUSB_MAKEFILE ] do |t|
-  Dir.chdir( STATIC_LIBUSB_BUILDDIR ) do
-    sh 'make'
-  end
-end
+    self.static_builddir            = COMPILE_HOME + 'builds' + ruby_platform
+    self.ruby_build                 = RbConfig::CONFIG["host"]
 
-# copy binary from temporary location to final lib
-task "copy:libusb_dll" => ['lib', LIBUSB_DLL] do
-  install LIBUSB_DLL, "lib/#{File.basename(LIBUSB_DLL)}"
-end
+    # Static libusb build vars
+    self.static_libusb_builddir    = static_builddir + LIBUSB_TARBALL.basename(".tar.bz2")
+    self.libusb_configure          = static_libusb_builddir + 'configure'
+    self.libusb_makefile           = static_libusb_builddir + 'Makefile'
+    self.libusb_dll                = static_libusb_builddir + 'libusb/.libs/libusb-1.0.dll'
+
+    #
+    # Static libusb build tasks
+    #
+    CLEAN.include static_libusb_builddir.to_s
+
+    directory static_libusb_builddir.to_s
 
-desc "compile static libusb libraries"
-task :libusb_dll => [ "copy:libusb_dll" ]
-
-desc 'Cross compile libusb for win32'
-task :cross => [ :mingw32, :libusb_dll ] do |t|
-  spec = Gem::Specification::load("libusb.gemspec")
-  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`.split("\n")
-  spec.extensions = []
-
-  # Generate a package for this gem
-  Gem::PackageTask.new(spec) do |pkg|
-    pkg.need_zip = false
-    pkg.need_tar = false
+    # Extract the libusb builds
+    file static_libusb_builddir => LIBUSB_TARBALL do |t|
+      sh 'tar', '-xjf', LIBUSB_TARBALL.to_s, '-C', static_libusb_builddir.parent.to_s
+      libusb_makefile.unlink if libusb_makefile.exist?
+    end
+
+    file libusb_configure => static_libusb_builddir do |t|
+      Dir.chdir( static_libusb_builddir ) do
+        sh "sh autogen.sh && make distclean"
+      end
+    end
+
+    libusb_env = [
+      "CFLAGS='-fno-omit-frame-pointer'",
+    ]
+
+    # generate the makefile in a clean build location
+    file libusb_makefile => libusb_configure do |t|
+      Dir.chdir( static_libusb_builddir ) do
+        options = [
+          "--target=#{host_platform}",
+          "--host=#{host_platform}",
+          "--build=#{ruby_build}",
+        ]
+
+        configure_path = static_libusb_builddir + 'configure'
+        sh "env #{[libusb_env, configure_path.to_s, *options].join(" ")}"
+      end
+    end
+
+    # make libusb-1.0.dll
+    task libusb_dll => [ libusb_makefile ] do |t|
+      Dir.chdir( static_libusb_builddir ) do
+        sh 'make'
+      end
+    end
+
+    task "libusb_dll:#{ruby_platform}" => libusb_dll
+
+    desc "compile static libusb libraries"
+    task :libusb_dll => "libusb_dll:#{ruby_platform}"
+
+    desc 'Cross compile libusb for win32'
+    task :cross => [ "libusb_dll:#{ruby_platform}" ] do |t|
+      spec = Gem::Specification::load("libusb.gemspec")
+      spec.instance_variable_set(:"@cache_file", nil) if spec.respond_to?(:cache_file)
+      spec.platform = Gem::Platform.new(ruby_platform)
+      spec.files << "lib/#{File.basename(libusb_dll)}"
+      spec.files -= `git ls-files ext`.split("\n")
+      spec.extensions = []
+
+      # Generate a package for this gem
+      pkg = Gem::PackageTask.new(spec) do |pkg|
+        pkg.need_zip = false
+        pkg.need_tar = false
+        # Do not copy any files per PackageTask, because
+        # we need the files from the platform specific directory
+        pkg.package_files.clear
+      end
+
+      # copy files of the gem to pkg directory
+      file pkg.package_dir_path => spec.files do
+        spec.files.each do |fn|
+          next if fn == "lib/#{File.basename(libusb_dll)}"
+          f = File.join(pkg.package_dir_path, fn)
+          fdir = File.dirname(f)
+          mkdir_p(fdir) if !File.exist?(fdir)
+          rm_f f
+          safe_ln(fn, f)
+        end
+      end
+      # copy libusb.dll to pkg directory
+      file pkg.package_dir_path => [libusb_dll] do
+        f = "#{pkg.package_dir_path}/lib/#{File.basename(libusb_dll)}"
+        rm_f f
+        safe_ln libusb_dll, f
+      end
+    end
   end
 end
 
-task :mingw32 do
-  # Use Rake::ExtensionCompiler helpers to find the proper host
-  unless Rake::ExtensionCompiler.mingw_host then
-    warn "You need to install mingw32 cross compile functionality to be able to continue."
-    warn "Please refer to your distribution/package manager documentation about installation."
-    fail
-  end
+CrossLibraries = [
+  ['i386-mingw32', 'i686-w64-mingw32'],
+  ['x64-mingw32', 'x86_64-w64-mingw32'],
+].map do |ruby_platform, host_platform|
+  CrossLibrary.new ruby_platform, host_platform
 end
 
 desc "Download and update bundled libusb(x)"

data/ext/extconf.rb

@@ -24,7 +24,7 @@ rescue LoadError
 
   old_dir = Dir.pwd
   Dir.chdir libusb_dir
-  cmd = "./configure --prefix=#{root_dir} && make && make install"
+  cmd = "sh configure --prefix=#{root_dir} && make && make install"
   puts cmd
   system cmd
   raise "libusb build exited with #{$?.exitstatus}" if $?.exitstatus!=0

data/lib/libusb/version_gem.rb

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

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: libusb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors:
 - Lars Kanis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: LIBUSB is a Ruby binding that gives Ruby programmers access to arbitrary
@@ -171,6 +164,7 @@ files:
 - test/test_libusb_version.rb
 homepage: http://github.com/larskanis/libusb
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -179,21 +173,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: libusb
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0.rc.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Access USB devices from Ruby via libusb-1.0
 test_files: []