diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-20 13:24:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-20 13:24:31 +0000 |
| commit | c6699319417c244ad6dce99b608ddd4635f5bdbc (patch) | |
| tree | 588e06f22254b2eaf5cb13fd195c93bbbef4ba7d | |
| parent | 8d83736f0c7ae9fed8ae4e19768fa035bb734cac (diff) | |
| download | ruby-c6699319417c244ad6dce99b608ddd4635f5bdbc.tar.gz | |
vpath.rb: hack for msys make
* tool/vpath.rb (VPath#def_options): hack for msys make, which
converts a command line argument to non-msys command seems like a
path list automagically. [Bug #7710] [ruby-core:51489]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | ext/ripper/depend | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 1 | ||||
| -rw-r--r-- | tool/vpath.rb | 5 |
5 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sun Jan 20 22:24:28 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/vpath.rb (VPath#def_options): hack for msys make, which + converts a command line argument to non-msys command seems like a + path list automagically. [Bug #7710] [ruby-core:51489] + Sat Jan 19 11:35:00 2013 Zachary Scott <zachary@zacharyscott.net> * struct.c (Struct.new): Document Struct.new with block @@ -575,7 +575,7 @@ PHONY: {$(srcdir)}.y.c: $(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/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y $(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]!parse.y!" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new diff --git a/ext/ripper/depend b/ext/ripper/depend index 0beb489326..776977847d 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -25,7 +25,7 @@ static: check ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y $(ECHO) extracting $@ from $(top_srcdir)/parse.y - $(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --vpath=$(VPATH) id.h $(top_srcdir)/parse.y > ripper.tmp.y + $(Q) $(RUBY) $(top_srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(top_srcdir)/parse.y > ripper.tmp.y $(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@ $(Q) $(RM) ripper.tmp.y diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 55e4b4a71c..e54f6113c5 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1759,6 +1759,7 @@ srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2 topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).unspace} hdrdir = #{mkintpath(CONFIG["hdrdir"]).unspace} arch_hdrdir = #{$arch_hdrdir.quote} +PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} } if $extmk diff --git a/tool/vpath.rb b/tool/vpath.rb index 5aa2f9f3fe..cfa48313de 100644 --- a/tool/vpath.rb +++ b/tool/vpath.rb @@ -59,8 +59,9 @@ class VPath opt.on("-L", "--vpath=PATH LIST", "add directories to search path") {|dirs| @additional << [dirs] } - opt.on("--path-separator=SEP", /\A\W\z/, "separator for vpath") {|sep| - @separator = sep + opt.on("--path-separator=SEP", /\A(?:\W\z|\.(\W).+)/, "separator for vpath") {|sep, vsep| + # hack for msys make. + @separator = vsep || sep } end |