From d0ac50680a23fe94e11ad359e073f4f6ee904925 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:51:30 +0000
Subject: merges r20912 from trunk into ruby_1_9_1. * cygwin/GNUmakefile.in
 (rubydll.def), win32/mkexports.rb   (Exports#exports): added VERSION.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog             | 5 +++++
 cygwin/GNUmakefile.in | 2 +-
 win32/mkexports.rb    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9bd88e233e..42aa1685c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 22 12:26:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
+	  (Exports#exports): added VERSION.
+
 Tue Dec 23 00:16:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* sprintf.c (rb_str_format): fix buffer overflow.
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 081c927575..91a5e73c88 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -76,7 +76,7 @@ endif
 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
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index adf0c5e336..cd88e968a5 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -64,6 +64,7 @@ class Exports
       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 @@ class Exports::Mingw < Exports
     @@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
-- 
cgit v1.2.3