[前][次][番号順一覧][スレッド一覧]

ruby-changes:60080

From: Hiroshi <ko1@a...>
Date: Sat, 15 Feb 2020 21:20:44 +0900 (JST)
Subject: [ruby-changes:60080] 05485868cb (master): Workaround for bison provided by scoop on mswin environment

https://git.ruby-lang.org/ruby.git/commit/?id=05485868cb

From 05485868cbd1e7a59063d5b4be2ee2313ac9fa25 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Sat, 15 Feb 2020 20:28:29 +0900
Subject: Workaround for bison provided by scoop on mswin environment


diff --git a/common.mk b/common.mk
index a2cc189..f1bd19c 100644
--- a/common.mk
+++ b/common.mk
@@ -865,6 +865,7 @@ PHONY: https://github.com/ruby/ruby/blob/trunk/common.mk#L865
 	$(ECHO) generating $@
 	$(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
 	$(Q)$(BASERUBY) $(srcdir)/tool/pure_parser.rb parse.tmp.y $(YACC)
+	$(Q)$(RM) parse.tmp.y.bak
 	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
 	$(Q)$(RM) parse.tmp.y
 	$(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
diff --git a/ext/ripper/depend b/ext/ripper/depend
index f1fbeaf..f1ec0fa 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -22,6 +22,7 @@ ripper.y: $(srcdir)/tools/preproc.rb $(srcdir)/tools/dsl.rb $(top_srcdir)/parse. https://github.com/ruby/ruby/blob/trunk/ext/ripper/depend#L22
 	$(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ \
 		--vpath=$(VPATH)$(PATH_SEPARATOR)$(top_srcdir) id.h $(top_srcdir)/parse.y > ripper.tmp.y
 	$(Q) $(RUBY) $(top_srcdir)/tool/pure_parser.rb ripper.tmp.y $(BISON)
+	$(Q) $(RM) ripper.tmp.y.bak
 	$(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@
 	$(Q) $(RM) ripper.tmp.y
 
diff --git a/tool/pure_parser.rb b/tool/pure_parser.rb
index 9ab6638..e4aedfa 100755
--- a/tool/pure_parser.rb
+++ b/tool/pure_parser.rb
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/tool/pure_parser.rb#L1
-#!/usr/bin/ruby -pi
+#!/usr/bin/ruby -pi.bak
 BEGIN {
   require_relative 'lib/colorize'
 
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]