Permalink
Browse files

merge revision(s) 29898:

?\012
merge from trunk (r29767)
	* win32/setup.mak: use findstr.exe instead of find.exe, because all
	  target build platforms should have findstr.exe, and, find.exe often
	  means another command such as cygwin's.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>



git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@29905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent e0992d8 commit cf231fd4f801d90fb1a9811a6c1bad7138bc5fb8 @shyouhei shyouhei committed Nov 24, 2010
Showing with 8 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1 version.h
  3. +1 −1 win32/setup.mak
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 24 13:55:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/setup.mak: use findstr.exe instead of find.exe, because all
+ target build platforms should have findstr.exe, and, find.exe often
+ means another command such as cygwin's.
+
Wed Nov 24 13:27:34 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* ext/stringio/stringio.c (strio_getline): fix for "" as separator.
View
2 version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-11-24"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20101124
-#define RUBY_PATCHLEVEL 321
+#define RUBY_PATCHLEVEL 322
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
View
2 win32/setup.mak
@@ -116,7 +116,7 @@ int main(int argc, char **argv)
-version-: nul
@$(APPEND)
- @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | find "=" >>$(MAKEFILE)
+ @$(CPP) -I$(srcdir) <<"Creating $(MAKEFILE)" | findstr "=" >>$(MAKEFILE)
#include "version.h"
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR

0 comments on commit cf231fd

Please sign in to comment.