From 6d9f1d476266cc12d53ca92cc3da1128acdb722b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 21 Jul 2007 06:32:40 +0000
Subject: * win32/resource.rb: include patchlevel number.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         |  4 +++
 win32/resource.rb |  8 +++--
 wince/resource.rb | 96 -------------------------------------------------------
 3 files changed, 9 insertions(+), 99 deletions(-)
 delete mode 100644 wince/resource.rb

diff --git a/ChangeLog b/ChangeLog
index 900a9a1ed5..1518c2c911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 21 15:32:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/resource.rb: include patchlevel number.
+
 Sat Jul 21 12:06:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
diff --git a/win32/resource.rb b/win32/resource.rb
index 1c12075183..14c4334fa1 100755
--- a/win32/resource.rb
+++ b/win32/resource.rb
@@ -4,7 +4,9 @@ require 'rbconfig'
 
 CONFIG = Config::MAKEFILE_CONFIG
 
-fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0"
+version = %w'MAJOR MINOR TEENY PATCHLEVEL'.map {|v| CONFIG[v] || '0'}
+fversion = version.join(',')
+rversion = version.join('.')
 
 $ruby_name ||= CONFIG["RUBY_INSTALL_NAME"]
 $rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w')
@@ -72,7 +74,7 @@ BEGIN
  BEGIN
   BLOCK "000004b0"
   BEGIN
-   VALUE "FileDescription",  "Ruby interpreter (#{desc}) #{RUBY_VERSION} [#{RUBY_PLATFORM}]\\0"
+   VALUE "FileDescription",  "Ruby interpreter (#{desc}) #{rversion} [#{RUBY_PLATFORM}]\\0"
    VALUE "FileVersion",      "#{fversion}\\0"
    VALUE "Home Page",        "http://www.ruby-lang.org/\\0"
    VALUE "InternalName",     "#{base + ext}\\0"
@@ -81,7 +83,7 @@ BEGIN
    VALUE "Platform",         "#{RUBY_PLATFORM}\\0"
    VALUE "ProductVersion",   "#{fversion}\\0"
    VALUE "Release Date",     "#{RUBY_RELEASE_DATE}\\0"
-   VALUE "Version",          "#{RUBY_VERSION}\\0"
+   VALUE "Version",          "#{rversion}\\0"
   END
  END
  BLOCK "VarFileInfo"
diff --git a/wince/resource.rb b/wince/resource.rb
deleted file mode 100644
index 6da6cd017f..0000000000
--- a/wince/resource.rb
+++ /dev/null
@@ -1,96 +0,0 @@
-#!./miniruby -sI.
-
-require 'rbconfig'
-
-CONFIG = Config::MAKEFILE_CONFIG
-
-fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0"
-
-$ruby_name ||= CONFIG["RUBY_INSTALL_NAME"]
-$rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w')
-$so_name ||= CONFIG["RUBY_SO_NAME"]
-
-icons = {}
-def icons.find(path)
-  if File.directory?(path)
-    Dir.open(File.expand_path(path)) do |d|
-      d.grep(/\.ico$/i) {|i| self[$`] = i}
-    end
-  else
-    self[File.basename(path, '.ico')] = path
-  end
-  self
-end
-
-if ARGV.empty?
-  icons.find('.')
-else
-  ARGV.each {|i| icons.find(i)}
-end
-
-ruby_icon = rubyw_icon = nil
-[$ruby_name, 'ruby'].each do |i|
-  if i = icons.delete(i)
-    ruby_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
-    break
-  end
-end
-[$rubyw_name, 'rubyw'].each do |i|
-  if i = icons.delete(i)
-    rubyw_icon = "1 ICON DISCARDABLE "+i.dump+"\n"
-    break
-  end
-end
-dll_icons = []
-icons.keys.sort.each do |i|
-  dll_icons << "#{dll_icons.size + 1} ICON DISCARDABLE "+icons[i].dump+"\n"
-end
-
-[ # base name    extension         file type  icons
-  [$ruby_name,   CONFIG["EXEEXT"], 'VFT_APP', ruby_icon],
-  [$rubyw_name,  CONFIG["EXEEXT"], 'VFT_APP', rubyw_icon],
-  [$so_name,     '.dll',           'VFT_DLL', dll_icons],
-].each do |base, ext, type, icons|
-  open(base + '.rc', "w") { |f|
-    f.binmode if /mingw/ =~ RUBY_PLATFORM
-
-    f.print("#include <windows.h>\n")
-    f.print("#include <winver.h>\n") if $wce_ver=="2.11" or $wce_ver=="3.00"
-
-    f.print <<EOF
-
-#{icons}
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION    #{fversion}
- PRODUCTVERSION #{fversion}
- FILEFLAGSMASK  0x3fL
- FILEFLAGS      0x0L
- FILEOS         VOS__WINDOWS32
- FILETYPE       #{type}
- FILESUBTYPE    VFT2_UNKNOWN
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
-  BLOCK "000004b0"
-  BEGIN
-   VALUE "FileDescription",  "Ruby interpreter\\0"
-   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 "OriginalFilename", "#{base + ext}\\0"
-   VALUE "Platform",         "#{RUBY_PLATFORM}\\0"
-   VALUE "ProductVersion",   "#{fversion}\\0"
-   VALUE "Release Date",     "#{RUBY_RELEASE_DATE}\\0"
-   VALUE "Version",          "#{RUBY_VERSION}\\0"
-  END
- END
- BLOCK "VarFileInfo"
- BEGIN
-  VALUE "Translation", 0x0, 0x4b0
- END
-END
-EOF
-  }
-end
-
-- 
cgit v1.2.3