Commit 6ad8dcea authored by Luke Redpath's avatar Luke Redpath

A few more little bugs.

parent 9e839063
...@@ -27,9 +27,7 @@ module Pod ...@@ -27,9 +27,7 @@ module Pod
end end
def copy_resources_script_for(pods) def copy_resources_script_for(pods)
@copy_resources_script ||= Generator::CopyResourcesScript.new(pods.map do |pod| @copy_resources_script ||= Generator::CopyResourcesScript.new(pods.map { |p| p.resources }.flatten)
pod.expanded_resources
end.flatten)
end end
def copy_resources_filename def copy_resources_filename
...@@ -70,7 +68,7 @@ module Pod ...@@ -70,7 +68,7 @@ module Pod
xcconfig.merge!(pod.specification.xcconfig) xcconfig.merge!(pod.specification.xcconfig)
pod.implementation_files.each do |file| pod.implementation_files.each do |file|
@target.add_source_file(file, nil, spec.compiler_flags) @target.add_source_file(file, nil, pod.specification.compiler_flags)
end end
pod.link_headers pod.link_headers
...@@ -110,7 +108,7 @@ module Pod ...@@ -110,7 +108,7 @@ module Pod
puts "* Generating prefix header at `#{sandbox.root + prefix_header_filename}'" if config.verbose? puts "* Generating prefix header at `#{sandbox.root + prefix_header_filename}'" if config.verbose?
save_prefix_header_as(sandbox.root + prefix_header_filename) save_prefix_header_as(sandbox.root + prefix_header_filename)
puts "* Generating copy resources script at `#{sandbox.root + copy_resources_filename}'" if config.verbose? puts "* Generating copy resources script at `#{sandbox.root + copy_resources_filename}'" if config.verbose?
copy_resources_script.save_as(sandbox.root + copy_resources_filename) copy_resources_script_for(pods).save_as(sandbox.root + copy_resources_filename)
end end
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment