Output-less target as a dependency

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 38d8bb79c200ede2acedeb9ce357fe313211d7c2..d7c874a95ea4d845592611a8e85377e0722b6af3 100644 (file)
--- a/dep.go
+++ b/dep.go
@@ -27,13 +27,15 @@ import (
        "io"
        "os"
        "path"
-       "strings"
+       "path/filepath"
 
        "go.cypherpunks.ru/recfile"
-       "golang.org/x/crypto/blake2b"
        "golang.org/x/sys/unix"
+       "lukechampine.com/blake3"
 )
 
+var DirPrefix string
+
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
        w := recfile.NewWriter(fdDep)
        if _, err := w.RecordStart(); err != nil {
@@ -83,11 +85,8 @@ func fileCtime(fd *os.File) (string, error) {
 }
 
 func fileHash(fd *os.File) (string, error) {
-       h, err := blake2b.New256(nil)
-       if err != nil {
-               panic(err)
-       }
-       if _, err = io.Copy(h, bufio.NewReader(fd)); err != nil {
+       h := blake3.New(32, nil)
+       if _, err := io.Copy(h, bufio.NewReader(fd)); err != nil {
                return "", err
        }
        return hex.EncodeToString(h.Sum(nil)), nil
@@ -124,25 +123,34 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
        )
 }
 
-func writeDeps(fdDep *os.File, tgts []string) error {
+func writeDeps(fdDep *os.File, tgts []string) (err error) {
        if fdDep == nil {
                trace(CDebug, "no opened fdDep: %s", tgts)
                return nil
        }
-       ups := []string{}
-       upLevels := strings.Count(os.Getenv(EnvDirPrefix), "/")
-       for i := 0; i < upLevels; i++ {
-               ups = append(ups, "..")
-       }
-       up := path.Join(ups...)
        for _, tgt := range tgts {
-               if _, err := os.Stat(tgt); err == nil {
-                       if err = writeDep(fdDep, Cwd, path.Join(up, tgt)); err != nil {
-                               return err
-                       }
+               tgtAbs, err := filepath.Abs(tgt)
+               if err != nil {
+                       panic(err)
+               }
+               tgtDir := path.Join(Cwd, DirPrefix)
+               tgtRel, err := filepath.Rel(tgtDir, tgtAbs)
+               if err != nil {
+                       panic(err)
+               }
+               if _, errStat := os.Stat(tgt); errStat == nil {
+                       err = writeDep(fdDep, tgtDir, tgtRel)
+               } else {
+                       trace(CDebug, "ifchange: %s <- %s (unexisting)", fdDep.Name(), tgtRel)
+                       err = recfileWrite(
+                               fdDep,
+                               recfile.Field{Name: "Type", Value: DepTypeIfchange},
+                               recfile.Field{Name: "Target", Value: tgtRel},
+                               recfile.Field{Name: "Ctime", Value: "0.0"},
+                       )
                }
        }
-       return nil
+       return
 }
 
 type DepInfo struct {