kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* mkconfig.rb: patchlevel is sometimes minus.

Browse source 
* win32/resource.rb: ditto.
	  thease changes are merged from trunk.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2009-03-12 04:03:41 +00:00
parent 979da2675a
commit 326df8f1e6
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Mar 12 13:02:12 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* mkconfig.rb: patchlevel is sometimes minus.
* win32/resource.rb: ditto.
thease changes are merged from trunk.
Wed Mar 11 12:12:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c (run_final): calls free function. [ruby-core:22578]

2
mkconfig.rb
View file

@ -114,7 +114,7 @@ unless has_version
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

28
win32/resource.rb
View file

@ -4,9 +4,10 @@ require 'rbconfig'
CONFIG = Config::MAKEFILE_CONFIG
version = %w'MAJOR MINOR TEENY PATCHLEVEL'.map {|v| CONFIG[v] || '0'}
fversion = version.join(',')
rversion = 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')
@ -50,7 +51,7 @@ end
[$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', 'CUI', ruby_icon],
[$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', 'GUI', rubyw_icon || ruby_icon],
[$so_name, '.dll', 'VFT_DLL', 'DLL', dll_icons.join],
].each do |base, ext, type, desc, icons|
].each do |base, ext, type, desc, icon|
open(base + '.rc', "w") { |f|
f.binmode if /mingw/ =~ RUBY_PLATFORM
@ -60,10 +61,10 @@ end
#include <winver.h>
#endif
#{icons || ''}
#{icon || ''}
VS_VERSION_INFO VERSIONINFO
FILEVERSION #{fversion}
PRODUCTVERSION #{fversion}
FILEVERSION #{nversion}
PRODUCTVERSION #{nversion}
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS VOS__WINDOWS32
@ -74,16 +75,15 @@ BEGIN
BEGIN
BLOCK "000004b0"
BEGIN
VALUE "FileDescription", "Ruby interpreter (#{desc}) #{rversion} [#{RUBY_PLATFORM}]\\0"
VALUE "FileVersion", "#{fversion}\\0"
VALUE "Home Page", "http://www.ruby-lang.org/\\0"
VALUE "Comments", "#{RUBY_RELEASE_DATE}\\0"
VALUE "CompanyName", "http://www.ruby-lang.org/\\0"
VALUE "FileDescription", "Ruby interpreter (#{desc}) #{sversion} [#{RUBY_PLATFORM}]\\0"
VALUE "FileVersion", "#{sversion}\\0"
VALUE "InternalName", "#{base + ext}\\0"
VALUE "LegalCopyright", "Copyright (C) 1993-#{RUBY_RELEASE_DATE[/\d+/]} Yukihiro Matsumoto\\0"
VALUE "OriginalFilename", "#{base + ext}\\0"
VALUE "Platform", "#{RUBY_PLATFORM}\\0"
VALUE "ProductVersion", "#{fversion}\\0"
VALUE "Release Date", "#{RUBY_RELEASE_DATE}\\0"
VALUE "Version", "#{rversion}\\0"
VALUE "ProductName", "Ruby interpreter #{sversion} [#{RUBY_PLATFORM}]\\0"
VALUE "ProductVersion", "#{sversion}\\0"
END
END
BLOCK "VarFileInfo"