From b204d48f76b92d62c3940cfc17bdb68156e5f5f2 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 2 Feb 2009 08:14:06 +0000 Subject: * mkconfig.rb: patchlevel is somtimes minus. * win32/resource.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/resource.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'win32') diff --git a/win32/resource.rb b/win32/resource.rb index 40886cb5e5..06b0aca7af 100755 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -4,9 +4,10 @@ require 'rbconfig' CONFIG = RbConfig::MAKEFILE_CONFIG -version = %w'MAJOR MINOR TEENY PATCHLEVEL'.map{|v| CONFIG[v] || '0'} -nversion = version.join(',') -sversion = version.join('.') +version = %w'MAJOR MINOR TEENY'.map{|v| CONFIG[v] || '0'} +patch = CONFIG['PATCHLEVEL'] +nversion = (version + [patch.to_i < 0 ? '0' : patch]).join(',') +sversion = version.join('.') + (patch.to_i < 0 ? 'dev' : "p#{patch}") $ruby_name ||= CONFIG["RUBY_INSTALL_NAME"] $rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w') -- cgit v1.2.3