diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-23 15:26:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-23 15:26:08 +0000 |
| commit | 12a2e17a34e48ceacc6a9bea69c4a85ffcae6019 (patch) | |
| tree | a736f567cdb1c62d725c5128a92e663cf5c81bc5 /ext/io | |
| parent | f9adadc5e610360850b3a4bd9a43e928d1c78bb1 (diff) | |
| download | ruby-12a2e17a34e48ceacc6a9bea69c4a85ffcae6019.tar.gz | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/io')
| -rwxr-xr-x | ext/io/console/buildgem.sh | 5 | ||||
| -rw-r--r-- | ext/io/console/extconf.rb | 3 | ||||
| -rw-r--r-- | ext/io/console/io-console.gemspec | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ext/io/console/buildgem.sh b/ext/io/console/buildgem.sh new file mode 100755 index 0000000000..65fe545e1e --- /dev/null +++ b/ext/io/console/buildgem.sh @@ -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 diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb index a4dbd0ff04..381520a92c 100644 --- a/ext/io/console/extconf.rb +++ b/ext/io/console/extconf.rb @@ -6,7 +6,8 @@ hdr = nil 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") diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec index f77de85e2f..2c5ce6b578 100644 --- a/ext/io/console/io-console.gemspec +++ b/ext/io/console/io-console.gemspec @@ -1,5 +1,5 @@ # -*- 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| 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] |