mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rake/loaders/makefile.rb (Rake::MakefileLoader#load): deals with
escaped spaces. incorporated from rake 0.8.4. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c520d1fc84
commit
cf4f718bc8
2 changed files with 18 additions and 10 deletions
|
@ -1,4 +1,7 @@
|
|||
Fri Mar 6 13:45:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Fri Mar 6 13:47:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/rake/loaders/makefile.rb (Rake::MakefileLoader#load): deals with
|
||||
escaped spaces. incorporated from rake 0.8.4.
|
||||
|
||||
* lib/rake/testtask.rb (Rake::TestTask#define): passes each libs
|
||||
as each arguments with expanded. incorporated from rake 0.8.4.
|
||||
|
|
|
@ -2,16 +2,16 @@ module Rake
|
|||
|
||||
# Makefile loader to be used with the import file loader.
|
||||
class MakefileLoader
|
||||
SPACE_MARK = "\0"
|
||||
|
||||
# Load the makefile dependencies in +fn+.
|
||||
def load(fn)
|
||||
open(fn) do |mf|
|
||||
lines = mf.read
|
||||
lines.gsub!(/#[^\n]*\n/m, "")
|
||||
lines.gsub!(/\\\n/, ' ')
|
||||
lines.split("\n").each do |line|
|
||||
process_line(line)
|
||||
end
|
||||
lines = open(fn) {|mf| mf.read}
|
||||
lines.gsub!(/\\ /, SPACE_MARK)
|
||||
lines.gsub!(/#[^\n]*\n/m, "")
|
||||
lines.gsub!(/\\\n/, ' ')
|
||||
lines.each_line do |line|
|
||||
process_line(line)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -19,13 +19,18 @@ module Rake
|
|||
|
||||
# Process one logical line of makefile data.
|
||||
def process_line(line)
|
||||
file_tasks, args = line.split(':')
|
||||
file_tasks, args = line.split(':', 2)
|
||||
return if args.nil?
|
||||
dependents = args.split
|
||||
file_tasks.strip.split.each do |file_task|
|
||||
file_tasks.scan(/\S+/) do |file_task|
|
||||
file_task = respace(file_task)
|
||||
file file_task => dependents
|
||||
end
|
||||
end
|
||||
|
||||
def respace(str)
|
||||
str.tr(SPACE_MARK, ' ')
|
||||
end
|
||||
end
|
||||
|
||||
# Install the handler
|
||||
|
|
Loading…
Reference in a new issue