naruse	2014-01-09 14:06:21 +0900 (Thu, 09 Jan 2014)

  New Revision: 44532

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44532

  Log:
    merge revision(s) 44440,44444: [Backport #9306]
    
    * win32/Makefile.sub (fake.rb): should depend on version.h because
      if RUBY_VERSION is updated, fake.rb need to say the new version
      to avoid install error in rbconfig.rb.
    
    * win32/{setup.mak,Makefile.sub}: update fake.rb like
      template/fake.rb.in.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/version.h
    branches/ruby_2_1/win32/Makefile.sub
    branches/ruby_2_1/win32/setup.mak
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44531)
+++ ruby_2_1/ChangeLog	(revision 44532)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Jan  9 14:05:24 2014  NAKAMURA Usaku  <usa@r...>
+
+	* win32/{setup.mak,Makefile.sub}: update fake.rb like
+	  template/fake.rb.in.
+
+Thu Jan  9 14:05:24 2014  NAKAMURA Usaku  <usa@r...>
+
+	* win32/Makefile.sub (fake.rb): should depend on version.h because
+	  if RUBY_VERSION is updated, fake.rb need to say the new version
+	  to avoid install error in rbconfig.rb.
+
 Thu Jan  9 08:21:00 2014  Aman Gupta <ruby@t...>
 
 	* test/net/imap/cacert.pem: generate new CA cert, since the last one
Index: ruby_2_1/win32/Makefile.sub
===================================================================
--- ruby_2_1/win32/Makefile.sub	(revision 44531)
+++ ruby_2_1/win32/Makefile.sub	(revision 44532)
@@ -1034,14 +1034,17 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revisi https://github.com/ruby/ruby/blob/trunk/ruby_2_1/win32/Makefile.sub#L1034
 			-so_name=$(RUBY_SO_NAME) \
 			. $(icondirs) $(win_srcdir)
 
-$(arch)-fake.rb: $(MKFILES)
+$(arch)-fake.rb: $(MKFILES) $(srcdir)/version.h
 	@echo Creating <<$@
 class Object
+  remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)
   CROSS_COMPILING = RUBY_PLATFORM
   remove_const :RUBY_PLATFORM
   remove_const :RUBY_VERSION
+  remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
   RUBY_PLATFORM = "$(arch)"
-  RUBY_VERSION = "$(MAJOR).$(MINOR).$(TEENY)"
+  RUBY_VERSION = $(RUBY_PROGRAM_VERSION)
+  RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (" + $(RUBY_PROGRAM_RELEASE_DATE) + ") [#{RUBY_PLATFORM}]"
 end
 class File
   remove_const :ALT_SEPARATOR
Index: ruby_2_1/win32/setup.mak
===================================================================
--- ruby_2_1/win32/setup.mak	(revision 44531)
+++ ruby_2_1/win32/setup.mak	(revision 44532)
@@ -117,6 +117,8 @@ int main(void) {return (EnumProcesses(NU https://github.com/ruby/ruby/blob/trunk/ruby_2_1/win32/setup.mak#L117
 MAJOR = RUBY_API_VERSION_MAJOR
 MINOR = RUBY_API_VERSION_MINOR
 TEENY = RUBY_API_VERSION_TEENY
+RUBY_PROGRAM_VERSION = RUBY_VERSION
+RUBY_PROGRAM_RELEASE_DATE = RUBY_RELEASE_DATE
 MSC_VER = _MSC_VER
 <<
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44531)
+++ ruby_2_1/version.h	(revision 44532)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-01-09"
-#define RUBY_PATCHLEVEL 3
+#define RUBY_PATCHLEVEL 4
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44440,44444


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/