diff options
| author | jim <jim@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-18 01:17:04 +0000 |
|---|---|---|
| committer | jim <jim@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-18 01:17:04 +0000 |
| commit | 379cca5aa37fff030ec9e23cc13ffafa2a25850a (patch) | |
| tree | 96a19fcbeba8608d3028eac3e5f28f43bd7b99dd /lib/rake/loaders | |
| parent | 949e7921e50df9cb30d48e54a333419c0a351a41 (diff) | |
| download | ruby-379cca5aa37fff030ec9e23cc13ffafa2a25850a.tar.gz ruby-379cca5aa37fff030ec9e23cc13ffafa2a25850a.tar.xz ruby-379cca5aa37fff030ec9e23cc13ffafa2a25850a.zip | |
Updated Rake files to version 0.8.2
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rake/loaders')
| -rw-r--r-- | lib/rake/loaders/makefile.rb | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/lib/rake/loaders/makefile.rb b/lib/rake/loaders/makefile.rb index f66eb3b35..9ade098a1 100644 --- a/lib/rake/loaders/makefile.rb +++ b/lib/rake/loaders/makefile.rb @@ -7,31 +7,26 @@ module Rake # Load the makefile dependencies in +fn+. def load(fn) - buffer = '' open(fn) do |mf| - mf.each do |line| - next if line =~ /^\s*#/ - buffer << line - if buffer =~ /\\$/ - buffer.sub!(/\\\n/, ' ') - state = :append - else - process_line(buffer) - buffer = '' - end + lines = mf.read + lines.gsub!(/#[^\n]*\n/m, "") + lines.gsub!(/\\\n/, ' ') + lines.split("\n").each do |line| + process_line(line) end end - process_line(buffer) if buffer != '' end private # Process one logical line of makefile data. def process_line(line) - file_task, args = line.split(':') + file_tasks, args = line.split(':') return if args.nil? dependents = args.split - file file_task => dependents + file_tasks.strip.split.each do |file_task| + file file_task => dependents + end end end |
