From d3f86f8abb3101f5d1ec5cfec299f9c942820e8a Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 7 Jun 2008 16:27:11 +0000
Subject: 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_6@16889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  4 ++++
 bcc32/mkexports.rb |  7 +++++--
 version.h          |  2 +-
 win32/mkexports.rb | 10 +++++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ca2e6363c..2d2adc636f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun  8 01:27:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]
+
 Sun Jun  8 01:15:50 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/net/http.rb, lib/open-uri.rb: remove
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
index dc523e2541..3cc8e535df 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] = true if /'(.*?)'/ =~ l
+    SYM[$1] = !$2 if /'(.*?)'\s+Segment:\s+_(TEXT)?/ =~ l
   end
 end
 
@@ -18,7 +18,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")}
diff --git a/version.h b/version.h
index 6e0715fb81..439cd5c6d5 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 130
+#define RUBY_PATCHLEVEL 131
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 214e4c6772..6ebe443fb3 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -7,13 +7,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 = []
@@ -23,7 +24,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")}
-- 
cgit v1.2.3