X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ifchange.go;h=0f430fdebd76741065215382cb76ee406690e3fe;hb=ca5290c19761bc1806b98d54d966a9cbbfeabd15;hp=d1bad27ddab6c7d036844bc9118a323648f605f5;hpb=8d2ac7eab48109db94e73368f4e980066b291b55;p=goredo.git

diff --git a/ifchange.go b/ifchange.go
index d1bad27..0f430fd 100644
--- a/ifchange.go
+++ b/ifchange.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+goredo -- djb's redo implementation on pure Go
+Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@ func collectDeps(
 	cwd, tgtOrig string,
 	level int,
 	deps map[string]map[string]struct{},
+	includeSrc bool,
 ) []string {
 	cwd, tgt := cwdAndTgt(path.Join(cwd, tgtOrig))
 	depPath := path.Join(cwd, RedoDir, tgt+DepSuffix)
@@ -60,7 +61,10 @@ func collectDeps(
 		if dep == "" {
 			return alwayses
 		}
-		if dep == tgt || isSrc(cwd, dep) {
+		if dep == tgt {
+			continue
+		}
+		if !includeSrc && isSrc(cwd, dep) {
 			continue
 		}
 		if !returnReady {
@@ -68,11 +72,14 @@ func collectDeps(
 			if m, ok := deps[depRel]; ok {
 				m[tgtRel] = struct{}{}
 			} else {
-				m = make(map[string]struct{}, 0)
+				m = map[string]struct{}{}
 				m[tgtRel] = struct{}{}
 				deps[depRel] = m
 			}
-			alwayses = append(alwayses, collectDeps(cwd, dep, level+1, deps)...)
+			alwayses = append(
+				alwayses,
+				collectDeps(cwd, dep, level+1, deps, includeSrc)...,
+			)
 		}
 	}
 	return alwayses
@@ -84,7 +91,7 @@ func buildDependants(tgts []string) map[string]struct{} {
 	seen := map[string]struct{}{}
 	deps := map[string]map[string]struct{}{}
 	for _, tgtInitial := range tgts {
-		for _, tgt := range collectDeps(Cwd, tgtInitial, 0, deps) {
+		for _, tgt := range collectDeps(Cwd, tgtInitial, 0, deps, false) {
 			if tgt != tgtInitial {
 				seen[tgt] = struct{}{}
 			}
@@ -139,7 +146,7 @@ RebuildDeps:
 	jobs := 0
 	queueSrc = []string{}
 	for _, tgt := range queue {
-		ood, err := isOOD(Cwd, tgt, 0, seen)
+		ood, err := isOODWithTrace(Cwd, tgt, 0, seen)
 		if err != nil {
 			trace(CErr, "dependant error: %s, skipping dependants", err)
 			return nil
@@ -176,6 +183,7 @@ func ifchange(tgts []string, forced, traced bool) (bool, error) {
 	defer jsAcquire("ifchange exiting")
 	defer Jobs.Wait()
 	seen := buildDependants(tgts)
+	oodTgtsClear()
 	trace(CDebug, "building %d targets: %v", len(tgts), tgts)
 	jobs := 0
 	errs := make(chan error, len(tgts))
@@ -188,7 +196,7 @@ func ifchange(tgts []string, forced, traced bool) (bool, error) {
 		}
 		ood = true
 		if !forced {
-			ood, err = isOOD(Cwd, tgt, 0, seen)
+			ood, err = isOODWithTrace(Cwd, tgt, 0, seen)
 			if err != nil {
 				return false, err
 			}