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

Ripper source on mswin

* Get rid of command substitution for cmd.exe.
* Separate RM1 command to remove single file sans directory.
This commit is contained in:
Nobuyoshi Nakada 2021-09-20 22:17:46 +09:00
parent 046f1bf492
commit 98c5907c65
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
3 changed files with 4 additions and 2 deletions

View file

@ -1189,10 +1189,10 @@ $(REVISION_H): revision.tmp
$(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h $(srcdir)/ext/ripper/depend $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y id.h $(srcdir)/ext/ripper/depend
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \ $(Q) $(CHDIR) $(@D) && \
sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \ sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \
$(exec) $(MAKE) -f - $(mflags) \ $(exec) $(MAKE) -f - $(mflags) \
Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \ Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH=../.. \
RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C
$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk

View file

@ -208,6 +208,7 @@ MAKEDIRS = @MKDIR_P@
CP = cp CP = cp
MV = mv MV = mv
RM = rm -f RM = rm -f
RM1 = $(RM)
RMDIR = @RMDIR@ RMDIR = @RMDIR@
RMDIRS = @RMDIRS@ RMDIRS = @RMDIRS@
RMALL = @RMALL@ RMALL = @RMALL@

View file

@ -89,6 +89,7 @@ RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -f -r
MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat
CP = copy > nul CP = copy > nul
MV = move > nul MV = move > nul
RM1 = del /f /q
!if !defined(BASERUBY) !if !defined(BASERUBY)
BASERUBY = ruby BASERUBY = ruby
!endif !endif