diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-12 05:29:52 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-12 05:29:52 +0000 |
| commit | 198b740019081ee64c6b15fe54062d4c7d279803 (patch) | |
| tree | a03a0fa8c6603485ecc63fdfff76512152936183 | |
| parent | cb9beafd115d0d71033d70fe2b847668a40f175b (diff) | |
* win32/mkexports.rb (each_export): skip garbages generated by VS2012's
nmake.
reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Nov 12 14:28:01 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/mkexports.rb (each_export): skip garbages generated by VS2012's + nmake. + reported and patched by Yoshida Masato at [Bug #7333] [ruby-dev:46484] + Sun Nov 11 18:58:55 2012 Tadayoshi Funaba <tadf@dotrb.org> * test/date/test_date_{parse,strptime}.rb: changed the format of diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 62d48cfce1..ab29fc1cfa 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -115,7 +115,7 @@ class Exports::Mswin < Exports next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l - next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || + next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,32}$/ =~ l || /^_?(?:Init_|.*_threadptr_|DllMain\b)/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') |