From d22ac50ad493256c707b7b39eadf3ac46d989224 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 29 Nov 2012 08:12:29 +0000 Subject: tool/vpath.rb * tool/generic_erb.rb, tool/id2token.rb: add --path-separator option for mingw where make and built ruby live in different world. * tool/vpath.rb: extract from tool/instruction.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/generic_erb.rb | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'tool/generic_erb.rb') diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb index b2b988fb3a..344fad46f7 100644 --- a/tool/generic_erb.rb +++ b/tool/generic_erb.rb @@ -1,19 +1,11 @@ +# -*- coding: us-ascii -*- require 'erb' require 'optparse' require 'fileutils' +$:.unshift(File.dirname(__FILE__)) +require 'vpath' -vpath = ["."] -def vpath.open(file, *rest) - find do |dir| - begin - path = File.join(dir, file) - return File.open(path, *rest) {|f| yield(f)} - rescue Errno::ENOENT - nil - end - end or raise(Errno::ENOENT, file) -end - +vpath = VPath.new timestamp = nil output = nil ifchange = nil @@ -22,7 +14,7 @@ opt = OptionParser.new do |o| o.on('-t', '--timestamp[=PATH]') {|v| timestamp = v || true} o.on('-o', '--output=PATH') {|v| output = v} o.on('-c', '--[no-]if-change') {|v| ifchange = v} - o.on('-v', '--vpath=DIR') {|dirs| vpath.concat dirs.split(File::PATH_SEPARATOR)} + vpath.def_options(o) o.order!(ARGV) end template = ARGV.shift or abort opt.to_s -- cgit v1.2.1