diff options
-rw-r--r-- | bcc32/mkexports.rb | 7 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/mkexports.rb | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb index e34b441e2f..d24efe4da4 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] = true if /'(.*?)'/ =~ l + SYM[$1] = !$2 if /'(.*?)'\s+Segment:\s+_(TEXT)?/ =~ l end end @@ -16,7 +16,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")} @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 132 +#define RUBY_PATCHLEVEL 133 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 3859381935..72b3b95d1c 100644 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -5,13 +5,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 = [] @@ -21,7 +22,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")} |