1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 33630:

* win32/configure.bat: disable delayed expansion of enironment variable.
	  [Bug #5517] [ruby-core:40531]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-01-02 23:55:25 +00:00
parent cae12e5d25
commit 496e9a7bb0
3 changed files with 12 additions and 5 deletions

View file

@ -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

View file

@ -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"

View file

@ -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