ruby-changes:10416
From: usa <ko1@a...>
Date: Mon, 2 Feb 2009 17:24:23 +0900 (JST)
Subject: [ruby-changes:10416] Ruby:r21963 (trunk): * mkconfig.rb: patchlevel is somtimes minus.
usa 2009-02-02 17:14:06 +0900 (Mon, 02 Feb 2009) New Revision: 21963 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21963 Log: * mkconfig.rb: patchlevel is somtimes minus. * win32/resource.rb: ditto. Modified files: trunk/ChangeLog trunk/mkconfig.rb trunk/win32/resource.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 21962) +++ ChangeLog (revision 21963) @@ -1,3 +1,9 @@ +Mon Feb 2 17:13:46 2009 NAKAMURA Usaku <usa@r...> + + * mkconfig.rb: patchlevel is somtimes minus. + + * win32/resource.rb: ditto. + Mon Feb 2 17:11:23 2009 Tanaka Akira <akr@f...> * ext/socket/ancdata.c (cmsg_type_to_sym): add #ifdef for no IPv6 Index: mkconfig.rb =================================================================== --- mkconfig.rb (revision 21962) +++ mkconfig.rb (revision 21963) @@ -115,7 +115,7 @@ print " CONFIG[\"TEENY\"] = \"" + $3 + "\"\n" } patchlevel = IO.foreach(File.join(srcdir, "version.h")) {|l| - m = /^\s*#\s*define\s+RUBY_PATCHLEVEL\s+(\d+)/.match(l) and break m[1] + m = /^\s*#\s*define\s+RUBY_PATCHLEVEL\s+(-?\d+)/.match(l) and break m[1] } print " CONFIG[\"PATCHLEVEL\"] = \"#{patchlevel}\"\n" end Index: win32/resource.rb =================================================================== --- win32/resource.rb (revision 21962) +++ win32/resource.rb (revision 21963) @@ -4,9 +4,10 @@ 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') -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/