diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | bcc32/mkexports.rb | 7 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/mkexports.rb | 5 |
4 files changed, 11 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Sun Jun 8 01:28:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/mkexports.rb: deal with __fastcall name decorations. + [ruby-list:44111] + Sun Jun 8 01:23:29 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb index d24efe4da4..e34b441e2f 100644 --- a/bcc32/mkexports.rb +++ b/bcc32/mkexports.rb @@ -5,7 +5,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 @@ -16,10 +16,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 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 133 +#define RUBY_PATCHLEVEL 134 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 72b3b95d1c..6f0a6a6ae2 100644 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -7,8 +7,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 |