kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

io/console: fix gem build failure on Windows

Browse source 
* 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
This commit is contained in:
nobu 2015-12-23 15:26:08 +00:00
parent f9adadc5e6
commit 12a2e17a34
5 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Thu Dec 24 00:26:05 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org> Wed Dec 23 23:58:44 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_readwrite_syserr_fail): works with the given errno than * io.c (rb_readwrite_syserr_fail): works with the given errno than

2
NEWS
View file

@ -269,7 +269,7 @@ with all sufficient information, see the ChangeLog file or Redmine
* Fiddle::Function#call releases the GVL. [Feature #11607] * Fiddle::Function#call releases the GVL. [Feature #11607]
* io-console * 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. "Simplified" License.
* lib/base64.rb * lib/base64.rb

5
ext/io/console/buildgem.sh Executable file
View file

@ -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
ext/io/console/extconf.rb
View file

@ -6,7 +6,8 @@ hdr = nil
case case
when macro_defined?("_WIN32", "") when macro_defined?("_WIN32", "")
# rb_w32_map_errno: 1.8.7 # 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)} when hdr = %w"termios.h termio.h".find {|h| have_header(h)}
have_func("cfmakeraw", hdr) have_func("cfmakeraw", hdr)
when have_header(hdr = "sgtty.h") when have_header(hdr = "sgtty.h")

4
ext/io/console/io-console.gemspec
View file

@ -1,5 +1,5 @@
# -*- ruby -*- # -*- ruby -*-
_VERSION = "0.4.4" _VERSION = "0.4.5"
date = %w$Date:: $[1] date = %w$Date:: $[1]
Gem::Specification.new do |s| Gem::Specification.new do |s|
@ -13,7 +13,7 @@ Gem::Specification.new do |s|
s.homepage = "http://www.ruby-lang.org" s.homepage = "http://www.ruby-lang.org"
s.authors = ["Nobu Nakada"] s.authors = ["Nobu Nakada"]
s.require_path = %[lib] 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.extensions = %w[extconf.rb]
s.license = "BSD-2-Clause" s.license = "BSD-2-Clause"
s.cert_chain = %w[certs/nobu.pem] s.cert_chain = %w[certs/nobu.pem]