diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | bcc32/mkexports.rb | 7 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 5 |
4 files changed, 13 insertions, 10 deletions
@@ -1,3 +1,8 @@ +Sun Oct 14 03:55:52 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/mkexports.rb: deal with __fastcall name decorations. + [ruby-list:44111] + Sat Oct 13 09:02:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * {bcc,win}32/mkexports.rb: explicit data. [ruby-list:44108] diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb index 3cc8e535df..dc523e2541 100755 --- a/bcc32/mkexports.rb +++ b/bcc32/mkexports.rb @@ -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")} @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-10-13" +#define RUBY_RELEASE_DATE "2007-10-14" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20071013 +#define RUBY_RELEASE_CODE 20071014 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 519ed3680e..092b349a22 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -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!(/^_(?!\w+@\d+$)/, '') - 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 |