diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 06:08:41 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-01 06:08:41 +0000 |
commit | 0a807fcc6b2d5650a04716ba635c60bfed6090eb (patch) | |
tree | ae90f1dc6bb7168c5dc80c8f8b1a7f217b852bf0 | |
parent | d5d5820008b28575caba5ff28a7af7a72547dd51 (diff) | |
download | ruby-0a807fcc6b2d5650a04716ba635c60bfed6090eb.tar.gz ruby-0a807fcc6b2d5650a04716ba635c60bfed6090eb.tar.xz ruby-0a807fcc6b2d5650a04716ba635c60bfed6090eb.zip |
* ext/socket/mkconstants.rb: add -o option.
* ext/socket/depend: use mkconstants.rb with -o option.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/socket/depend | 2 | ||||
-rw-r--r-- | ext/socket/mkconstants.rb | 30 |
3 files changed, 36 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Jan 1 15:07:56 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/mkconstants.rb: add -o option. + + * ext/socket/depend: use mkconstants.rb with -o option. + Thu Jan 1 07:42:36 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/singleton.rb: fix indentation of RDoc text. [ruby-core:21029] diff --git a/ext/socket/depend b/ext/socket/depend index 29bc2f3be..0a9b8cace 100644 --- a/ext/socket/depend +++ b/ext/socket/depend @@ -6,4 +6,4 @@ getaddrinfo.o: getaddrinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h constants.h: $(srcdir)/mkconstants.rb @echo "generating constants.h" - @$(RUBY) $(srcdir)/mkconstants.rb > $@ + @$(RUBY) $(srcdir)/mkconstants.rb -o $@ diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb index 589e3b2bb..948eda8be 100644 --- a/ext/socket/mkconstants.rb +++ b/ext/socket/mkconstants.rb @@ -1,4 +1,24 @@ -$out ||= $stdout +require 'optparse' + +opt = OptionParser.new + +opt.def_option('-h', 'help') { + puts opt + exit 0 +} + +opt_o = nil +opt.def_option('-o FILE', 'specify output file') {|filename| + opt_o = filename +} + +$out = '' +def $out.puts(str="") + str += "\n" if /\n\z/ !~ str + self << str +end + +opt.parse! # workaround for NetBSD, OpenBSD and etc. $out.puts("#define pseudo_AF_FTIP pseudo_AF_RTIP") @@ -23,6 +43,14 @@ DATA.each_line do |s| end end +if opt_o + File.open(opt_o, 'w') {|f| + f << $out + } +else + $stdout << $out +end + __END__ SOCK_STREAM |