merge revision(s) 13694:
* win32/mkexports.rb: deal with __fastcall name decorations. [ruby-list:44111] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d3f86f8abb
commit
b3ee04c746
|
@ -1,3 +1,8 @@
|
|||
Sun Jun 8 01:31:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* win32/mkexports.rb: deal with __fastcall name decorations.
|
||||
[ruby-list:44111]
|
||||
|
||||
Sun Jun 8 01:27:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* {bcc,win}32/mkexports.rb: explicit data. [ruby-list:44108]
|
||||
|
|
|
@ -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] = !$2 if /'(.*?)'\s+Segment:\s+_(TEXT)?/ =~ l
|
||||
SYM[$1] = true if /'(.*?)'/ =~ l
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -18,10 +18,7 @@ elsif $library
|
|||
exports << "Library " + $library
|
||||
end
|
||||
exports << "Description " + $description.dump if $description
|
||||
exports << "EXPORTS"
|
||||
SYM.sort.each do |sym, is_data|
|
||||
exports << (is_data ? "#{sym} DATA" : sym)
|
||||
end
|
||||
exports << "EXPORTS" << SYM.keys.sort
|
||||
|
||||
if $output
|
||||
open($output, 'w') {|f| f.puts exports.join("\n")}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define RUBY_RELEASE_DATE "2008-06-08"
|
||||
#define RUBY_VERSION_CODE 186
|
||||
#define RUBY_RELEASE_CODE 20080608
|
||||
#define RUBY_PATCHLEVEL 131
|
||||
#define RUBY_PATCHLEVEL 132
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 8
|
||||
|
|
|
@ -9,8 +9,9 @@ IO.foreach("|dumpbin -symbols " + objs.join(' ')) do |l|
|
|||
next if /^[0-9A-F]+ 0+ UNDEF / =~ l
|
||||
next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, "")
|
||||
is_data = !$1
|
||||
if l.sub!(/^_/, '')
|
||||
next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
|
||||
if /^[@_](?!\w+@\d+$)/ =~ l
|
||||
next if /(?!^)@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
|
||||
l.sub!(/^[@_]/, '')
|
||||
elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
|
||||
next
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue