summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-24 07:09:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-24 07:09:40 +0000
commit62c885753c9ebb5f8eaeccf1eca1d7d5726f5188 (patch)
treea26b4d9b71eb09d7ef9f99516bb8d3ca607c7c2e
parenta560aa5620fabdfcedbabc52c2aa7c001a48e647 (diff)
* win32/resource.rb: CONFIG["TEENY"] is not ruby's version but API's
one. So need to use RUBY_VERSION instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xwin32/resource.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6988c5ec7e4..c6ec1131126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 24 16:08:03 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/resource.rb: CONFIG["TEENY"] is not ruby's version but API's
+ one. So need to use RUBY_VERSION instead.
+
Wed Jun 24 16:07:04 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/mkexports.rb: rbconfig.rb exists on ".".
diff --git a/win32/resource.rb b/win32/resource.rb
index 06b0aca7af4..eda450952bf 100755
--- a/win32/resource.rb
+++ b/win32/resource.rb
@@ -4,7 +4,7 @@ require 'rbconfig'
CONFIG = RbConfig::MAKEFILE_CONFIG
-version = %w'MAJOR MINOR TEENY'.map{|v| CONFIG[v] || '0'}
+version = RUBY_VERSION.split(/\./)
patch = CONFIG['PATCHLEVEL']
nversion = (version + [patch.to_i < 0 ? '0' : patch]).join(',')
sversion = version.join('.') + (patch.to_i < 0 ? 'dev' : "p#{patch}")