diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-23 14:26:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-23 14:26:21 +0000 |
| commit | afe19a2c7cf850b20552fb0a7b060d92d8e30370 (patch) | |
| tree | e92db2dcba5aacbe6ef07584dae6df5d1f892f74 /win32 | |
| parent | f9fb27bb5e84805a8448eb2583bdcb8fc3065f12 (diff) | |
* version.c (ruby_show_copyright): obtain copyright year from
RUBY_RELEASE_YEAR.
* win32/resource.rb: ditto.
* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
include them.
* win32/resource.rb: include winver.h for older WindowsCE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/resource.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/win32/resource.rb b/win32/resource.rb index 9ad8772b64..0bfebf2d63 100644 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -30,13 +30,13 @@ end ruby_icon = rubyw_icon = nil [$ruby_name, 'ruby'].each do |i| - if i = icons.delete(i) + if i = icons[i] ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n" break end end [$rubyw_name, 'rubyw'].each do |i| - if i = icons.delete(i) + if i = icons[i] rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n" break end @@ -48,7 +48,7 @@ end [ # base name extension file type icons [$ruby_name, CONFIG["EXEEXT"], 'VFT_APP', ruby_icon], - [$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon], + [$rubyw_name, CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon || ruby_icon], [$so_name, '.dll', 'VFT_DLL', dll_icons], ].each do |base, ext, type, icons| open(base + '.rc', "w") { |f| @@ -57,6 +57,7 @@ end f.print <<EOF #ifndef __BORLANDC__ #include <windows.h> +#include <winver.h> #endif #{icons} @@ -77,7 +78,7 @@ BEGIN VALUE "FileVersion", "#{fversion}\\0" VALUE "Home Page", "http://www.ruby-lang.org/\\0" VALUE "InternalName", "#{base + ext}\\0" - VALUE "LegalCopyright", "Copyright (C) 1993-2003 Yukihiro Matsumoto\\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" |