Download link for 2.4.0 release

[goredo.git] / ifchange.go

diff --git a/ifchange.go b/ifchange.go
index 0cb50c51d0785bef62596e28669936be3f28fff6..374adcf4e811ed044d6eef5c39ef815c9233de95 100644 (file)
--- a/ifchange.go
+++ b/ifchange.go
@@ -26,25 +26,21 @@ func collectDeps(
        level int,
        deps map[string]map[string]*Tgt,
        includeSrc bool,
-       seen map[string]struct{},
 ) []*Tgt {
-       if _, ok := seen[tgt.a]; ok {
+       if _, ok := DepCache[tgt.rel]; ok {
                return nil
        }
        dep, err := depRead(tgt)
        if err != nil {
                return nil
        }
-       DepInfoCache[tgt.Dep()] = depInfo
-       seen[tgt.a] = struct{}{}
+       DepCache[tgt.rel] = dep
        var alwayses []*Tgt
        returnReady := false
        if dep.always {
                if dep.build == BuildUUID {
-                       tracef(
-                               CDebug, "ood: %s%s always, but already build",
-                               strings.Repeat(". ", level), tgt,
-                       )
+                       tracef(CDebug, "ood: %s%s always, but already build",
+                               strings.Repeat(". ", level), tgt)
                        returnReady = true
                } else {
                        tracef(CDebug, "ood: %s%s always", strings.Repeat(". ", level), tgt)
@@ -66,7 +62,7 @@ func collectDeps(
                                deps[ifchange.tgt.rel] = map[string]*Tgt{tgt.rel: tgt}
                        }
                        alwayses = append(alwayses,
-                               collectDeps(dep.tgt, level+1, deps, includeSrc, seen)...)
+                               collectDeps(ifchange.tgt, level+1, deps, includeSrc)...)
                }
        }
        return alwayses
@@ -77,20 +73,15 @@ func buildDependants(tgts []*Tgt) map[string]*Tgt {
        tracef(CDebug, "collecting deps")
        seen := make(map[string]*Tgt)
        deps := make(map[string]map[string]*Tgt)
-       {
-               collectDepsSeen := make(map[string]struct{})
-               for _, tgtInitial := range tgts {
-                       for _, tgt := range collectDeps(tgtInitial, 0, deps, false, collectDepsSeen) {
-                               if tgt.a != tgtInitial.a {
-                                       seen[tgt.a] = tgt
-                               }
+       for _, tgtInitial := range tgts {
+               for _, tgt := range collectDeps(tgtInitial, 0, deps, false) {
+                       if tgt.rel != tgtInitial.rel {
+                               seen[tgt.rel] = tgt
                        }
                }
-               InodeCache = make(map[string][]*Inode)
        }
-       TgtCache = nil
-       HashCache = nil
-       InodeCache = nil
+       TgtCache = make(map[string]*Tgt)
+       IfchangeCache = nil
        if len(seen) == 0 {
                return seen
        }