shyouhei	2008-06-08 01:27:11 +0900 (Sun, 08 Jun 2008)

  New Revision: 16889

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/bcc32/mkexports.rb
    branches/ruby_1_8_6/version.h
    branches/ruby_1_8_6/win32/mkexports.rb

  Log:
    merge revision(s) 13688:
    * {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=16889&r2=16888&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=16889&r2=16888&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/win32/mkexports.rb?r1=16889&r2=16888&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/bcc32/mkexports.rb?r1=16889&r2=16888&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 16888)
+++ ruby_1_8_6/ChangeLog	(revision 16889)
@@ -1,3 +1,7 @@
+Sun Jun  8 01:27:06 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]
+
 Sun Jun  8 01:15:50 2008  GOTOU Yuuzou  <gotoyuzo@n...>
 
 	* lib/net/http.rb, lib/open-uri.rb: remove
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16888)
+++ ruby_1_8_6/version.h	(revision 16889)
@@ -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
Index: ruby_1_8_6/bcc32/mkexports.rb
===================================================================
--- ruby_1_8_6/bcc32/mkexports.rb	(revision 16888)
+++ ruby_1_8_6/bcc32/mkexports.rb	(revision 16889)
@@ -7,7 +7,7 @@
 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 @@
   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")}
Index: ruby_1_8_6/win32/mkexports.rb
===================================================================
--- ruby_1_8_6/win32/mkexports.rb	(revision 16888)
+++ ruby_1_8_6/win32/mkexports.rb	(revision 16889)
@@ -7,13 +7,14 @@
 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 @@
   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")}

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/