From 1c2cc09063937a77b0e46d23bb92a01e893b7960 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 11 Mar 2009 16:08:24 +0000 Subject: [PATCH] * tool/ytab.sed: replaces backslashes with slash for nmake. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ common.mk | 2 +- tool/ytab.sed | 1 + version.h | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e869d1c26..8223b7f517 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Mar 12 01:08:27 2009 Nobuyoshi Nakada + + * tool/ytab.sed: replaces backslashes with slash for nmake. + Wed Mar 11 21:23:06 2009 Tanaka Akira * time.c (time_mload): don't clear tm_mday. diff --git a/common.mk b/common.mk index bf24441f3a..5d3aee52d5 100644 --- a/common.mk +++ b/common.mk @@ -435,7 +435,7 @@ PHONY: parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c {$(srcdir)}.y.c: - $(YACC) -d $(YFLAGS) -o y.tab.c $(<:\=/) + $(YACC) -d $(YFLAGS) -o y.tab.c $< sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new @$(MV) $@.new $@ sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse\.y/d" y.tab.h > $(@:.c=.h).new diff --git a/tool/ytab.sed b/tool/ytab.sed index 17a57fe494..f956c065e2 100755 --- a/tool/ytab.sed +++ b/tool/ytab.sed @@ -28,3 +28,4 @@ a\ s/^\([ ]*\)\(yyerror[ ]*([ ]*parser,\)/\1parser_\2/ s!^ *extern char \*getenv();!/* & */! s/^\(#.*\)".*\.tab\.c"/\1"parse.c"/ +/^\(#.*\)".*\.y"/s:\\\\:/:g diff --git a/version.h b/version.h index e1da5e85e8..55846f0214 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-03-11" +#define RUBY_RELEASE_DATE "2009-03-12" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 12 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];