1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rake/loaders/makefile.rb (Rake::MakefileLoader#load): deals with

Browse Source 
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:
nobu 2009-03-06 04:47:12 +00:00
parent c520d1fc84
commit cf4f718bc8
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 * lib/rake/testtask.rb (Rake::TestTask#define): passes each libs
as each arguments with expanded. incorporated from rake 0.8.4. as each arguments with expanded. incorporated from rake 0.8.4.

17
lib/rake/loaders/makefile.rb
View File

@ -2,30 +2,35 @@ module Rake
# Makefile loader to be used with the import file loader. # Makefile loader to be used with the import file loader.
class MakefileLoader class MakefileLoader
SPACE_MARK = "\0"
# Load the makefile dependencies in +fn+. # Load the makefile dependencies in +fn+.
def load(fn) def load(fn)
open(fn) do |mf| lines = open(fn) {|mf| mf.read}
lines = mf.read lines.gsub!(/\\ /, SPACE_MARK)
lines.gsub!(/#[^\n]*\n/m, "") lines.gsub!(/#[^\n]*\n/m, "")
lines.gsub!(/\\\n/, ' ') lines.gsub!(/\\\n/, ' ')
lines.split("\n").each do |line| lines.each_line do |line|
process_line(line) process_line(line)
end end
end end
end
private private
# Process one logical line of makefile data. # Process one logical line of makefile data.
def process_line(line) def process_line(line)
file_tasks, args = line.split(':') file_tasks, args = line.split(':', 2)
return if args.nil? return if args.nil?
dependents = args.split 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 file file_task => dependents
end end
end end
def respace(str)
str.tr(SPACE_MARK, ' ')
end
end end
# Install the handler # Install the handler