ruby-changes:4022
From: ko1@a...
Date: Sun, 17 Feb 2008 03:16:38 +0900 (JST)
Subject: [ruby-changes:4022] usa - Ruby:r15512 (trunk): * win32/resource.rb: made version infos confirm to OS spec.
usa 2008-02-17 03:16:21 +0900 (Sun, 17 Feb 2008)
New Revision: 15512
Modified files:
trunk/ChangeLog
trunk/bcc32/Makefile.sub
trunk/version.h
trunk/win32/Makefile.sub
trunk/win32/resource.rb
Log:
* win32/resource.rb: made version infos confirm to OS spec.
* {bcc32,win32}/Makefile.sub (*.rc): add dependency.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/resource.rb?r1=15512&r2=15511&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15512&r2=15511&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15512&r2=15511&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=15512&r2=15511&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=15512&r2=15511&diff_format=u
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15511)
+++ ChangeLog (revision 15512)
@@ -1,3 +1,9 @@
+Sun Feb 17 03:13:40 2008 NAKAMURA Usaku <usa@r...>
+
+ * win32/resource.rb: made version infos confirm to OS spec.
+
+ * {bcc32,win32}/Makefile.sub (*.rc): add dependency.
+
Sat Feb 16 20:49:34 2008 NARUSE, Yui <naruse@r...>
* string.c (rb_str_substr): optimized for UTF-8.
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub (revision 15511)
+++ win32/Makefile.sub (revision 15512)
@@ -666,7 +666,7 @@
@$(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) \
Index: win32/resource.rb
===================================================================
--- win32/resource.rb (revision 15511)
+++ win32/resource.rb (revision 15512)
@@ -4,9 +4,9 @@
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 @@
#{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
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"
Index: version.h
===================================================================
--- version.h (revision 15511)
+++ version.h (revision 15512)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-02-16"
+#define RUBY_RELEASE_DATE "2008-02-17"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080216
+#define RUBY_RELEASE_CODE 20080217
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub (revision 15511)
+++ bcc32/Makefile.sub (revision 15512)
@@ -491,7 +491,7 @@
$(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) \
-rubyw_name=$(RUBYW_INSTALL_NAME) \
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/