nobu	2015-12-24 00:26:08 +0900 (Thu, 24 Dec 2015)

  New Revision: 53266

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53266

  Log:
    io/console: fix gem build failure on Windows
    
    * ext/io/console/extconf.rb: fix gem build failure on Windows.
      only win32_vk.inc is included in the gem and no dependencies for
      the header, so that gperf will not be mandatory.
      [ruby-core:72453] [Bug #11866]
    * ext/io/console/io-console.gemspec: include depend file and
      win32_vk header.

  Added files:
    trunk/ext/io/console/buildgem.sh
  Modified files:
    trunk/ChangeLog
    trunk/NEWS
    trunk/ext/io/console/extconf.rb
    trunk/ext/io/console/io-console.gemspec
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 53265)
+++ ChangeLog	(revision 53266)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Dec 24 00:26:05 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/io/console/extconf.rb: fix gem build failure on Windows.
+	  only win32_vk.inc is included in the gem and no dependencies for
+	  the header, so that gperf will not be mandatory.
+	  [ruby-core:72453] [Bug #11866]
+
+	* ext/io/console/io-console.gemspec: include depend file and
+	  win32_vk header.
+
 Wed Dec 23 23:58:44 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_readwrite_syserr_fail): works with the given errno than
Index: ext/io/console/buildgem.sh
===================================================================
--- ext/io/console/buildgem.sh	(revision 0)
+++ ext/io/console/buildgem.sh	(revision 53266)
@@ -0,0 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/io/console/buildgem.sh#L1
+#!/bin/sh -e
+cd ${0%/*}
+trap "mv depend.$$ depend" 0 2
+${RUBY-ruby} -i.$$ -pe 'exit if /^win32_vk/' depend
+${GEM-gem} build io-console.gemspec

Property changes on: ext/io/console/buildgem.sh
___________________________________________________________________
Added: svn:eol-style
   + LF
Added: svn:executable
   + *

Index: ext/io/console/extconf.rb
===================================================================
--- ext/io/console/extconf.rb	(revision 53265)
+++ ext/io/console/extconf.rb	(revision 53266)
@@ -6,7 +6,8 @@ hdr = nil https://github.com/ruby/ruby/blob/trunk/ext/io/console/extconf.rb#L6
 case
 when macro_defined?("_WIN32", "")
   # rb_w32_map_errno: 1.8.7
-  vk_header = ($nmake == ?m ? "{$(srcdir)}" : "") << "win32_vk.chksum"
+  vk_header = File.exist?("#$srcdir/win32_vk.list") ? "chksum" : "inc"
+  vk_header = "#{'{$(srcdir)}' if $nmake == ?m}win32_vk.#{vk_header}"
 when hdr = %w"termios.h termio.h".find {|h| have_header(h)}
   have_func("cfmakeraw", hdr)
 when have_header(hdr = "sgtty.h")
Index: ext/io/console/io-console.gemspec
===================================================================
--- ext/io/console/io-console.gemspec	(revision 53265)
+++ ext/io/console/io-console.gemspec	(revision 53266)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/io/console/io-console.gemspec#L1
 # -*- ruby -*-
-_VERSION = "0.4.4"
+_VERSION = "0.4.5"
 date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
@@ -13,7 +13,7 @@ Gem::Specification.new do |s| https://github.com/ruby/ruby/blob/trunk/ext/io/console/io-console.gemspec#L13
   s.homepage = "http://www.ruby-lang.org"
   s.authors = ["Nobu Nakada"]
   s.require_path = %[lib]
-  s.files = %w[console.c extconf.rb lib/console/size.rb]
+  s.files = %w[console.c depend extconf.rb lib/console/size.rb win32_vk.inc]
   s.extensions = %w[extconf.rb]
   s.license = "BSD-2-Clause"
   s.cert_chain  = %w[certs/nobu.pem]
Index: NEWS
===================================================================
--- NEWS	(revision 53265)
+++ NEWS	(revision 53266)
@@ -269,7 +269,7 @@ with all sufficient information, see the https://github.com/ruby/ruby/blob/trunk/NEWS#L269
   * Fiddle::Function#call releases the GVL.  [Feature #11607]
 
 * io-console
-  * Update to io-console 0.4.4, and change the license to BSD 2-clause
+  * Update to io-console 0.4.5, and change the license to BSD 2-clause
     "Simplified" License.
 
 * lib/base64.rb

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/