@@ -19,10 +19,10 @@ module Ono target = @repository.target(name) return nil unless target && target.valid? if target.type == :executable - return build_executable(target.abs_path) + return build_executable(target) else source = target.src - deps = find_deps target.src.abs_path + deps = find_deps target deps.each {|dep| build_target dep} compiler = @compiler_factory.get_compiler_for source args = [] @@ -34,27 +34,24 @@ module Ono private def build_executable(target) - objname = target + ".o" - return false unless build_target(objname) + return false unless build_target(target.name + ".o") deps = find_deps target deps.each {|dep| build_target dep} deps.map! {|dep| @repository.abs_path dep} - compiler = @compiler_factory.get_compiler_for objname - deps << objname - compiler.link deps, target + compiler = @compiler_factory.get_compiler_for(target.name + ".o") + deps << target.abs_path + ".o" + compiler.link deps, target.abs_path end def find_deps(target) - abs_target = @repository.abs_path target - src = find_source_for target + abs_target = target.abs_path candidate_deps = [] include_re = Regexp.new '^#include "(.*)"' - File.open(src).each_line do |line| + File.open(target.src.abs_path).each_line do |line| if include_re =~ line header = @repository.abs_path Regexp.last_match(1) - # TODO: Should compare absolute path here. basename = header.chomp(File.extname header) - unless basename == abs_target.chomp(File.extname target) + unless basename == abs_target.chomp(File.extname target.abs_path) obj = basename + ".o" candidate_deps << obj if find_source_for(@repository.abs_path(obj)) end lib/ono/builder.rb c01c9b2234b9c79a87f623e706d0a7ba01fe449d Hong Jiang hong@hjiang.net http://github.com/hjiang/ono/commit/35fa77ec7b3a1474476a53598fcb399b9817f74d 35fa77ec7b3a1474476a53598fcb399b9817f74d 2009-10-18T00:45:49-07:00 2009-10-18T00:45:49-07:00 more refactoring 95676433ee3ad238fa5e34aadae0dd470173e8f6 Hong Jiang hong@hjiang.net