Skip to content

Commit

Permalink
io/console: fix gem build failure on Windows
Browse files Browse the repository at this point in the history
* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Dec 23, 2015
1 parent c0de905 commit 00ce563
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ext/io/console/buildgem.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/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
3 changes: 2 additions & 1 deletion ext/io/console/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
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")
Expand Down
4 changes: 2 additions & 2 deletions ext/io/console/io-console.gemspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- ruby -*-
_VERSION = "0.4.4"
_VERSION = "0.4.5"
date = %w$Date:: $[1]

Gem::Specification.new do |s|
Expand All @@ -13,7 +13,7 @@ Gem::Specification.new do |s|
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]
Expand Down

0 comments on commit 00ce563

Please sign in to comment.