win32-api 1.7.0-universal-mingw32 → 1.7.1-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 41a72c313fa86b07d5fe937675d37d563c41efb9
-  data.tar.gz: f12df49826c30fd8903b958e0e26f2082d0696bc
+SHA256:
+  metadata.gz: 899305029a34692ac9e4b83188289c9b3a9df8c0eb54ffef342542e1166af56f
+  data.tar.gz: a9169febd00afba822e694e06efb21bb341a82d7b89a943d4e7dad6b7722f5d9
 SHA512:
-  metadata.gz: def9577d7bb25e8fbe94c6f07d34176369475a21a45e4328dace67bacaa5674ba596631396afea239454c45402f769ae4e576c321ea7be5634ee996453c9a978
-  data.tar.gz: cfa0ade06bbc3ecd88bd72fb3cd1c00b5af3bd389e6841d9387d97e0b1bb90a0758efba061e94d7df5effcaa89e2b435c29475bec8568d4e103dc35f5bd468b0
+  metadata.gz: 945c06c178dc2924016acfe65dae51fceccf09a87a70a136dc676df184f7c3d39916dc7413fde9682250e0e2d0c325885ff459a3da4e7522553d8eb687177708
+  data.tar.gz: f19cbbcfcaa13d33df2e8ea153d2ecd91caf217c7aaf49a4b0c3c6a8fe3677d3b3557408d4c1f5b848705f446b5002759029f22846b13e5ba6e3ef4f386daf14

data/CHANGES

@@ -1,3 +1,8 @@
+== 1.7.1 - 4-Jan-2018
+* Add Ruby 2.6 snapshot support.
+* Now includes binaries for Ruby 2.6 both 32 and 64 bit versions.
+* Use RubyInstaller 2.5.0-1 for Ruby 2.5 binaries.
+
 == 1.7.0 - 28-Nov-2017
 * Add gcc option to fix crash on RubyInstaller2 x86
 

data/Rakefile

@@ -59,63 +59,69 @@ namespace 'gem' do
   end
 
   desc 'Build a binary gem'
-  task :binary, :ruby2_32, :ruby2_64, :ruby21, :ruby21_64, :ruby22, :ruby22_64, :ruby23_32, :ruby23_64, :ruby24_32, :ruby24_64 do |task, args|
+  task :binary, :ruby2_32, :ruby2_64, :ruby21, :ruby21_64, :ruby22, :ruby22_64, :ruby23_32, :ruby23_64, :ruby24_32, :ruby24_64, :ruby25_32, :ruby25_64 do |task, args|
     # These are just what's on my system at the moment. Adjust as needed.
+    # ri refers to RubyInstaller, ruby 2.3 and prev were built with RubyInstaller (:ri),
+    # 2.4 and later with RubyInstaller2 (:ri2)
+    # pre variable allows local builds with ruby & DevKit not at drive root
+
+    dk_path = {}
+    if ENV['APPVEYOR'] =~ /true/i
+      pre = "C:"
+      dk_path[:ri]    = "C:/ruby23/DevKit/bin;C:/ruby23/DevKit/mingw/bin"
+      dk_path[:ri_64] = "C:/ruby23-x64/DevKit/bin;C:/ruby23-x64/DevKit/mingw/bin"
+    else
+      ENV['BASEPATH'] = ENV['PATH'].gsub(/\\/, '/')
+      pre = "C:"
+      dk_path[:ri]    = "#{pre}/Devkit/bin;#{pre}/Devkit/mingw/bin"
+      dk_path[:ri_64] = "#{pre}/Devkit64/bin;#{pre}/Devkit64/mingw/bin"
+    end
+    # at present, Appveyor & local DevKit paths match for ri2
+    dk_path[:ri2]    = "C:/msys64/usr/bin;C:/msys64/mingw32/bin"
+    dk_path[:ri2_64] = "C:/msys64/usr/bin;C:/msys64/mingw64/bin"
+
     args.with_defaults(
       {
-        :ruby2_32  => {:path => "c:/ruby200/bin/ruby",     :msys => :msys1},
-        :ruby2_64  => {:path => "c:/ruby200-x64/bin/ruby", :msys => :msys1},
-        :ruby21_32 => {:path => "c:/ruby21/bin/ruby",      :msys => :msys1},
-        :ruby21_64 => {:path => "c:/ruby21-x64/bin/ruby",  :msys => :msys1},
-        :ruby22_32 => {:path => "c:/ruby22/bin/ruby",      :msys => :msys1},
-        :ruby22_64 => {:path => "c:/ruby22-x64/bin/ruby",  :msys => :msys1},
-        :ruby23_32 => {:path => "c:/ruby23/bin/ruby",      :msys => :msys1},
-        :ruby23_64 => {:path => "c:/ruby23-x64/bin/ruby",  :msys => :msys1},
-        :ruby24_32 => {:path => "c:/ruby24/bin/ruby",      :msys => :msys2},
-        :ruby24_64 => {:path => "c:/ruby24-x64/bin/ruby",  :msys => :msys2},
-        :ruby25_32 => {:path => "c:/ruby25/bin/ruby",      :msys => :msys2},
-        :ruby25_64 => {:path => "c:/ruby25-x64/bin/ruby",  :msys => :msys2}
+        :ruby2_32  => {:path => "#{pre}/ruby200/bin",     :ri => :ri,     :omit => false},
+        :ruby2_64  => {:path => "#{pre}/ruby200-x64/bin", :ri => :ri_64,  :omit => false},
+        :ruby21_32 => {:path => "#{pre}/ruby21/bin",      :ri => :ri,     :omit => false},
+        :ruby21_64 => {:path => "#{pre}/ruby21-x64/bin",  :ri => :ri_64,  :omit => false},
+        :ruby22_32 => {:path => "#{pre}/ruby22/bin",      :ri => :ri,     :omit => false},
+        :ruby22_64 => {:path => "#{pre}/ruby22-x64/bin",  :ri => :ri_64,  :omit => false},
+        :ruby23_32 => {:path => "#{pre}/ruby23/bin",      :ri => :ri,     :omit => false},
+        :ruby23_64 => {:path => "#{pre}/ruby23-x64/bin",  :ri => :ri_64,  :omit => false},
+        :ruby24_32 => {:path => "#{pre}/ruby24/bin",      :ri => :ri2,    :omit => false},
+        :ruby24_64 => {:path => "#{pre}/ruby24-x64/bin",  :ri => :ri2_64, :omit => false},
+        :ruby25_32 => {:path => "#{pre}/ruby25/bin",      :ri => :ri2,    :omit => true},
+        :ruby25_64 => {:path => "#{pre}/ruby25-x64/bin",  :ri => :ri2_64, :omit => true},
+        :ruby26_32 => {:path => "#{pre}/ruby26/bin",      :ri => :ri2,    :omit => true},
+        :ruby26_64 => {:path => "#{pre}/ruby26-x64/bin",  :ri => :ri2_64, :omit => true},
       }
     )
 
     Rake::Task[:clobber].invoke
 
-    args.each{ |key|
-      default_path = ENV['PATH']
+    default_path = ENV['PATH']
 
-      spec = eval(IO.read('win32-api.gemspec'))
-
-      if spec.version.prerelease? && !File.exist?("#{key.last[:path]}.exe")
-        puts "#{key.last[:path]} does not exist! Skip."
+    args.each { |key|
+      # These lines are used for trunk build.
+      if key.last[:omit] && !File.exist?("#{key.last[:path]}/ruby.exe")
+        puts "#{key.last[:path]}/ruby does not exist! Skip."
         next
       end
 
-      if key.last[:msys] == :msys1
-        # Adjust devkit paths as needed.
-        if `"#{key.last[:path]}" -v` =~ /x64/i
-          ENV['PATH'] = "C:/Devkit64/bin;C:/Devkit64/mingw/bin;" + ENV['PATH']
-        else
-          ENV['PATH'] = "C:/Devkit/bin;C:/Devkit/mingw/bin;" + ENV['PATH']
-        end
-      elsif key.last[:msys] == :msys2
-        ENV.delete('RI_DEVKIT')
-        # Adjust devkit paths as needed.
-        if `"#{key.last[:path]}" -v` =~ /x64/i
-          ENV['PATH'] = "C:/msys64/usr/bin;C:/msys64/mingw64/bin;" + ENV['PATH']
-        else
-          ENV['PATH'] = "C:/msys64/usr/bin;C:/msys64/mingw32/bin;" + ENV['PATH']
-        end
-      end
+      bld_path = "#{key.last[:path]};#{dk_path[key.last[:ri]]};#{ENV['BASEPATH']}"
       mkdir_p "lib/win32/#{key.first}/win32"
 
       Dir.chdir('ext') do
+        ENV['PATH'] = bld_path
         sh "make distclean" rescue nil
-        sh "#{key.last[:path]} extconf.rb"
+        sh "ruby extconf.rb"
         sh "make"
+        sh "strip --strip-unneeded -p api.so"
+        ENV['PATH'] = default_path
         cp 'api.so', "../lib/win32/#{key.first}/win32/api.so"
       end
-
-      ENV['PATH'] = default_path
     }
 
 text = <<HERE
@@ -171,6 +177,14 @@ begin
       end
     end
 
+    if RbConfig::CONFIG['MINOR'] == '6'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby26_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby26_32/win32/api')
+      end
+    end
+
   end
 rescue LoadError
   require File.join(File.dirname(__FILE__), '../../ext/api')

data/appveyor.yml

@@ -1,61 +1,46 @@
 version: '{build}'
 
+init:
+  # use a minimal path
+  - set PATH=C:\ruby%ruby_version%\bin;C:\Program Files\7-Zip;C:\Program Files\AppVeyor\BuildAgent;C:\Program Files\Git\cmd;C:\Windows\system32
+  # Load ruby trunk build
+  - if %ruby_version%==_trunk (
+      appveyor DownloadFile https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z -FileName C:\ruby_trunk.7z &
+      7z x C:\ruby_trunk.7z -oC:\ruby_trunk
+    )
+
 platform: x64
 
 install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - "%devkit64%\\devkitvars.bat"
-  - "%devkit32%\\devkitvars.bat"
   - ruby --version
   - gem --version
-  - IF %msys2%==1 ridk.cmd enable
-  - IF %msys2%==1 gem install bundler --force
+  # Assume we can use the version of bundler that Appveyor has packaged with each ruby version
   - bundle install
+
 build: off
+
 test_script:
-  - bundle exec rake gem:binary
-  - IF %msys2%==0 bundle exec rake test:all
-  - IF %msys2%==1 ridk.cmd exec bundle exec rake test:all
+  - rake gem:binary
+  - rake -rdevkit test:all
 
 environment:
   matrix:
-    - ruby_version: "24-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 1
-    - ruby_version: "24"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 1
-    - ruby_version: "23-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "23"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "22-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "22"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "21-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "21"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "200-x64"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
-    - ruby_version: "200"
-      devkit64: C:\Ruby23-x64\DevKit
-      devkit32: C:\Ruby23\DevKit
-      msys2: 0
+    - ruby_version: _trunk
+    - ruby_version: 25-x64
+    - ruby_version: 25
+    - ruby_version: 24-x64
+    - ruby_version: 24
+    - ruby_version: 23-x64
+    - ruby_version: 23
+    - ruby_version: 22-x64
+    - ruby_version: 22
+    - ruby_version: 21-x64
+    - ruby_version: 21
+    - ruby_version: 200-x64
+    - ruby_version: 200
+
+matrix:
+  allow_failures:
+    - ruby_version: _trunk
+    - ruby_version: 25-x64
+    - ruby_version: 25

data/ext/win32/api.c

@@ -37,7 +37,7 @@
 
 
 #define MAX_BUF 1024
-#define WINDOWS_API_VERSION "1.7.0"
+#define WINDOWS_API_VERSION "1.7.1"
 
 #define _T_VOID     0
 #define _T_LONG     1

data/lib/win32/api.rb

@@ -50,6 +50,14 @@ begin
       end
     end
 
+    if RbConfig::CONFIG['MINOR'] == '6'
+      if RbConfig::CONFIG['arch'] =~ /x64/i
+        require File.join(File.dirname(__FILE__), 'ruby26_64/win32/api')
+      else
+        require File.join(File.dirname(__FILE__), 'ruby26_32/win32/api')
+      end
+    end
+
   end
 rescue LoadError
   require File.join(File.dirname(__FILE__), '../../ext/api')

data/test/test_win32_api.rb

@@ -18,7 +18,7 @@ class TC_Win32_API < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('1.6.1.2', API::VERSION)
+      assert_equal('1.7.1', API::VERSION)
    end
 
    def test_constructor_basic

data/win32-api.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-api'
-  spec.version    = '1.7.0'
+  spec.version    = '1.7.1'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob', 'Hiroshi Hatake']
   spec.license    = 'Artistic-2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-api
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -73,6 +73,8 @@ files:
 - lib/win32/ruby24_64/win32/api.so
 - lib/win32/ruby25_32/win32/api.so
 - lib/win32/ruby25_64/win32/api.so
+- lib/win32/ruby26_32/win32/api.so
+- lib/win32/ruby26_64/win32/api.so
 - lib/win32/ruby2_32/win32/api.so
 - lib/win32/ruby2_64/win32/api.so
 - test/test_win32_api.rb
@@ -99,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A superior replacement for Win32API