diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:26:48 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 16:26:48 +0000 |
commit | efa1e84e252842ac0b1dc4c78f4f6c6177e63604 (patch) | |
tree | 304bbc176eb064f324da79b8bb204008cba0cb2f /win32/mkexports.rb | |
parent | ae2dd3bd11b1c3252fdccf30617b19b59029ede9 (diff) |
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_5@16887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/mkexports.rb')
-rw-r--r-- | win32/mkexports.rb | 10 |
1 files changed, 7 insertions, 3 deletions
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")} |