summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--bcc32/Makefile.sub2
-rw-r--r--version.h6
-rw-r--r--win32/Makefile.sub2
-rwxr-xr-xwin32/resource.rb23
5 files changed, 22 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 3979cf1ce8b..7a2fe8e6526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 17 03:13:40 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* string.c (rb_str_substr): optimized for UTF-8.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 1510b9740da..c07420f0d49 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -491,7 +491,7 @@ $(LIBRUBY): $(LIBRUBY_SO)
$(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) \
diff --git a/version.h b/version.h
index f43d49047b1..8fde37c8f82 100644
--- a/version.h
+++ b/version.h
@@ -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[];
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e2a38146d62..a2578d02745 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 e49160443c5..40886cb5e5b 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"