Fix dependencies relative paths determination

[goredo.git] / dep.go

diff --git a/dep.go b/dep.go
index 38d8bb79c200ede2acedeb9ce357fe313211d7c2..df5ae27f2af9737b070b84df719a24f255328d2b 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"
 )
 
+var DirPrefix string
+
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
        w := recfile.NewWriter(fdDep)
        if _, err := w.RecordStart(); err != nil {
@@ -129,17 +131,22 @@ func writeDeps(fdDep *os.File, tgts []string) error {
                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 {
+                       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 err = writeDep(fdDep, tgtDir, tgtRel); err != nil {
                                return err
                        }
+               } else {
+                       trace(CDebug, "skipping dep record, can not stat: %s", tgt)
                }
        }
        return nil