kosaki	2012-01-03 08:55:25 +0900 (Tue, 03 Jan 2012)

  New Revision: 34177

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

  Log:
    merge revision(s) 33630:
    
    * win32/configure.bat: disable delayed expansion of enironment variable.
      [Bug #5517] [ruby-core:40531]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/configure.bat

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34176)
+++ ruby_1_9_3/ChangeLog	(revision 34177)
@@ -1,3 +1,8 @@
+Mon Jan  2 18:54:52 2012  NAKAMURA Usaku  <usa@r...>
+
+	* win32/configure.bat: disable delayed expansion of enironment variable.
+	  [Bug #5517] [ruby-core:40531]
+
 Wed Dec 28 11:22:45 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
Index: ruby_1_9_3/win32/configure.bat
===================================================================
--- ruby_1_9_3/win32/configure.bat	(revision 34176)
+++ ruby_1_9_3/win32/configure.bat	(revision 34177)
@@ -1,4 +1,5 @@
 @echo off
+@setlocal disabledelayedexpansion
 
 echo> ~tmp~.mak ####
 echo>> ~tmp~.mak conf = %0
@@ -206,3 +207,4 @@
 echo>>~setup~.mak 	@ren Makefile.new Makefile
 nmake -alf ~setup~.mak MAKEFILE=Makefile.new
 :exit
+@endlocal
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34176)
+++ ruby_1_9_3/version.h	(revision 34177)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 6
+#define RUBY_PATCHLEVEL 7
 
-#define RUBY_RELEASE_DATE "2011-12-30"
-#define RUBY_RELEASE_YEAR 2011
-#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_DATE "2012-01-02"
+#define RUBY_RELEASE_YEAR 2012
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 2
 
 #include "ruby/version.h"
 

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