diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-16 18:16:21 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-02-16 18:16:21 +0000 |
| commit | 5b461c699623240b9b1305d567945ce7ffa297f4 (patch) | |
| tree | 5a0a158d4f58c7e76949af6cd655d6c7658273bd /win32 | |
| parent | 66583d96634796a16e22ded9ba688026da54fb5b (diff) | |
* win32/resource.rb: made version infos confirm to OS spec.
* {bcc32,win32}/Makefile.sub (*.rc): add dependency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rwxr-xr-x | win32/resource.rb | 23 |
2 files changed, 12 insertions, 13 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e2a38146d6..a2578d0274 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -666,7 +666,7 @@ distclean-local:: @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc @-$(RM) ext\ripper\y.output -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) +$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ diff --git a/win32/resource.rb b/win32/resource.rb index e49160443c..40886cb5e5 100755 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -4,9 +4,9 @@ require 'rbconfig' CONFIG = RbConfig::MAKEFILE_CONFIG -version = %w'MAJOR MINOR TEENY PATCHLEVEL'.map {|v| CONFIG[v] || '0'} -fversion = version.join(',') -rversion = version.join('.') +version = %w'MAJOR MINOR TEENY PATCHLEVEL'.map{|v| CONFIG[v] || '0'} +nversion = version.join(',') +sversion = version.join('.') $ruby_name ||= CONFIG["RUBY_INSTALL_NAME"] $rubyw_name ||= CONFIG["RUBYW_INSTALL_NAME"] || $ruby_name.sub(/ruby/, '\&w') @@ -62,8 +62,8 @@ end #{icon || ''} VS_VERSION_INFO VERSIONINFO - FILEVERSION #{fversion} - PRODUCTVERSION #{fversion} + FILEVERSION #{nversion} + PRODUCTVERSION #{nversion} FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS VOS__WINDOWS32 @@ -74,16 +74,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" |