yugui	2008-12-25 18:51:30 +0900 (Thu, 25 Dec 2008)

  New Revision: 21000

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21000

  Log:
    merges r20912 from trunk into ruby_1_9_1.
    * cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
      (Exports#exports): added VERSION.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/cygwin/GNUmakefile.in
    branches/ruby_1_9_1/win32/mkexports.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20999)
+++ ruby_1_9_1/ChangeLog	(revision 21000)
@@ -1,3 +1,8 @@
+Mon Dec 22 12:26:18 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
+	  (Exports#exports): added VERSION.
+
 Tue Dec 23 00:16:48 2008  Yusuke Endoh  <mame@t...>
 
 	* sprintf.c (rb_str_format): fix buffer overflow.
Index: ruby_1_9_1/cygwin/GNUmakefile.in
===================================================================
--- ruby_1_9_1/cygwin/GNUmakefile.in	(revision 20999)
+++ ruby_1_9_1/cygwin/GNUmakefile.in	(revision 21000)
@@ -76,7 +76,7 @@
 ifeq (@target_os@,cygwin)
 cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A)
 	@NM@ --extern --defined $(LIBRUBY_A) | \
-	  $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=$(@F)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
+	  $(MINIRUBY) -ne 'BEGIN{puts "VERSION $(MAJOR).$(MINOR)","EXPORTS"}; puts $$1+"=$(@F)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
 	@DLLWRAP@ -s --def=rubydll.def -o $@
 	@rm -f rubydll.def
 endif
Index: ruby_1_9_1/win32/mkexports.rb
===================================================================
--- ruby_1_9_1/win32/mkexports.rb	(revision 20999)
+++ ruby_1_9_1/win32/mkexports.rb	(revision 21000)
@@ -64,6 +64,7 @@
       exports << "Library " + library
     end
     exports << "Description " + description.dump if description
+    exports << "VERSION #{RbConfig::CONFIG['MAJOR']}.#{RbConfig::CONFIG['MINOR']}"
     exports << "EXPORTS" << symbols()
     exports
   end
@@ -132,6 +133,10 @@
     @@nm ||= RbConfig::CONFIG["NM"]
   end
 
+  def exports(*)
+    super()
+  end
+
   def each_line(objs, &block)
     IO.foreach("|#{self.class.nm} --extern --defined #{objs.join(' ')}", &block)
   end

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