default.do-s must not depend on themselves

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index a64da9e41cb56980fe9219e61fd5d9fbfcd0555a..e1c2aae383944f90741350deee21dae2a8c9b53c 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -32,7 +32,10 @@ import (
        "lukechampine.com/blake3"
 )
 
-var DirPrefix string
+var (
+       DirPrefix string
+       DepCwd    string
+)
 
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
        w := recfile.NewWriter(fdDep)
@@ -122,7 +125,11 @@ func writeDeps(fdDep *os.File, tgts []string) (err error) {
                if err != nil {
                        panic(err)
                }
-               tgtDir := path.Join(Cwd, DirPrefix)
+               cwd := Cwd
+               if DepCwd != "" && Cwd != DepCwd {
+                       cwd = DepCwd
+               }
+               tgtDir := path.Join(cwd, DirPrefix)
                tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
                if err != nil {
                        panic(err)
@@ -130,7 +137,7 @@ func writeDeps(fdDep *os.File, tgts []string) (err error) {
                if _, errStat := os.Stat(tgt); errStat == nil {
                        err = writeDep(fdDep, tgtDir, tgtRel)
                } else {
-                       trace(CDebug, "ifchange: %s <- %s (unexisting)", fdDep.Name(), tgtRel)
+                       trace(CDebug, "ifchange: %s <- %s (non-existing)", fdDep.Name(), tgtRel)
                        fields := []recfile.Field{
                                {Name: "Type", Value: DepTypeIfchange},
                                {Name: "Target", Value: tgtRel},
@@ -159,7 +166,7 @@ func depRead(fdDep *os.File) (*DepInfo, error) {
        }
        depInfo := DepInfo{}
        if b := m["Build"]; b == "" {
-               return nil, errors.New(".dep missing Build:")
+               return nil, errors.New(".rec missing Build:")
        } else {
                depInfo.build = b
        }
@@ -177,7 +184,7 @@ func depRead(fdDep *os.File) (*DepInfo, error) {
                case DepTypeIfcreate:
                        dep := m["Target"]
                        if dep == "" {
-                               return nil, errors.New("invalid format of .dep")
+                               return nil, errors.New("invalid format of .rec")
                        }
                        depInfo.ifcreates = append(depInfo.ifcreates, dep)
                case DepTypeIfchange:
@@ -186,11 +193,11 @@ func depRead(fdDep *os.File) (*DepInfo, error) {
                case DepTypeStamp:
                        hsh := m["Hash"]
                        if hsh == "" {
-                               return nil, errors.New("invalid format of .dep")
+                               return nil, errors.New("invalid format of .rec")
                        }
                        depInfo.stamp = hsh
                default:
-                       return nil, errors.New("invalid format of .dep")
+                       return nil, errors.New("invalid format of .rec")
                }
        }
        return &depInfo, nil