summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h10
-rwxr-xr-xwin32/configure.bat2
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index febbde7234..fd023994a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 2 18:54:52 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/configure.bat: disable delayed expansion of enironment variable.
+ [Bug #5517] [ruby-core:40531]
+
Wed Dec 28 11:22:45 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/fileutils.rb (FileUtils::Entry_#entries): use utility method
diff --git a/version.h b/version.h
index 4d006376cb..b5cd620d95 100644
--- a/version.h
+++ b/version.h
@@ -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"
diff --git a/win32/configure.bat b/win32/configure.bat
index 6eb0320a20..a91de0f33e 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -1,4 +1,5 @@
@echo off
+@setlocal disabledelayedexpansion
echo> ~tmp~.mak ####
echo>> ~tmp~.mak conf = %0
@@ -206,3 +207,4 @@ echo>>~setup~.mak @if exist Makefile ren Makefile Makefile.old
echo>>~setup~.mak @ren Makefile.new Makefile
nmake -alf ~setup~.mak MAKEFILE=Makefile.new
:exit
+@endlocal