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

merge revision(s) 13688:

* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2008-06-07 16:27:11 +00:00
parent 0cbba017ff
commit d3f86f8abb
4 changed files with 17 additions and 6 deletions

View file

@ -1,3 +1,7 @@
Sun Jun 8 01:27:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* {bcc,win}32/mkexports.rb: explicit data. [ruby-list:44108]
Sun Jun 8 01:15:50 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/net/http.rb, lib/open-uri.rb: remove

View file

@ -7,7 +7,7 @@ STDIN.reopen(open("nul"))
ARGV.each do |obj|
IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
next unless /(?:PUBDEF|PUBD32)/ =~ l
SYM[$1] = true if /'(.*?)'/ =~ l
SYM[$1] = !$2 if /'(.*?)'\s+Segment:\s+_(TEXT)?/ =~ l
end
end
@ -18,7 +18,10 @@ elsif $library
exports << "Library " + $library
end
exports << "Description " + $description.dump if $description
exports << "EXPORTS" << SYM.keys.sort
exports << "EXPORTS"
SYM.sort.each do |sym, is_data|
exports << (is_data ? "#{sym} DATA" : sym)
end
if $output
open($output, 'w') {|f| f.puts exports.join("\n")}

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-08"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080608
#define RUBY_PATCHLEVEL 130
#define RUBY_PATCHLEVEL 131
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8

View file

@ -7,13 +7,14 @@ SYM = {}
objs = ARGV.collect {|s| s.tr('/', '\\')}
IO.foreach("|dumpbin -symbols " + objs.join(' ')) do |l|
next if /^[0-9A-F]+ 0+ UNDEF / =~ l
next unless l.sub!(/.*\sExternal\s+\|\s+/, '')
next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, "")
is_data = !$1
if l.sub!(/^_/, '')
next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
next
end
SYM[l.strip] = true
SYM[l.strip] = is_data
end
exports = []
@ -23,7 +24,10 @@ elsif $library
exports << "Library " + $library
end
exports << "Description " + $description.dump if $description
exports << "EXPORTS" << SYM.keys.sort
exports << "EXPORTS"
SYM.sort.each do |sym, is_data|
exports << (is_data ? "#{sym} DATA" : sym)
end
if $output
open($output, 'w') {|f| f.puts exports.join("\n")}