X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=buildlog.go;h=f04efa41e2bf269251b2c56824eaa4d3e48e9581;hb=a9455044065855ae42d95d939ed0027f7a895b83;hp=b0d2f2d620b1961a306576594c501517f88763f7;hpb=4cf1dbe4348f796f043a85a62761be52dd7ef859;p=goredo.git

diff --git a/buildlog.go b/buildlog.go
index b0d2f2d..f04efa4 100644
--- a/buildlog.go
+++ b/buildlog.go
@@ -1,19 +1,17 @@
-/*
-goredo -- djb's redo implementation on pure Go
-Copyright (C) 2020-2023 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
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// goredo -- djb's redo implementation on pure Go
+// Copyright (C) 2020-2024 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
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
@@ -38,8 +36,7 @@ import (
 const HumanTimeFmt = "2006-01-02 15:04:05.000000000 Z07:00"
 
 type BuildLogJob struct {
-	dir      string
-	tgt      string
+	tgt      *Tgt
 	started  time.Time
 	exitCode int
 	rec      map[string][]string
@@ -75,8 +72,9 @@ func init() {
 	buildLogSeen = make(map[string]struct{})
 }
 
-func parseBuildLogRec(dir, tgt string) (map[string][]string, error) {
-	fd, err := os.Open(path.Join(dir, RedoDir, tgt+LogRecSuffix))
+func parseBuildLogRec(tgt *Tgt) (map[string][]string, error) {
+	h, t := path.Split(tgt.a)
+	fd, err := os.Open(path.Join(h, RedoDir, t+LogRecSuffix))
 	if err != nil {
 		return nil, ErrLine(err)
 	}
@@ -94,18 +92,17 @@ func depthPrefix(depth int) string {
 }
 
 func showBuildLogSub(sub *BuildLogJob, depth int) error {
-	abs := mustAbs(path.Join(sub.dir, sub.tgt))
-	if _, ok := buildLogSeen[abs]; ok {
+	if _, ok := buildLogSeen[sub.tgt.rel]; ok {
 		return nil
 	}
-	buildLogSeen[abs] = struct{}{}
+	buildLogSeen[sub.tgt.rel] = struct{}{}
 	dp := depthPrefix(depth)
 	fmt.Printf(
 		"%s%s%s\n",
 		sub.rec["Started"][0], dp,
-		colourize(CRedo, "redo "+sub.tgt),
+		colourize(CRedo, "redo "+sub.tgt.rel),
 	)
-	if err := showBuildLog(sub.dir, sub.tgt, sub.rec, depth+1); err != nil {
+	if err := showBuildLog(sub.tgt, sub.rec, depth+1); err != nil {
 		return err
 	}
 	durationSec, durationNsec, err := durationToInts(sub.rec["Duration"][0])
@@ -116,14 +113,14 @@ func showBuildLogSub(sub *BuildLogJob, depth int) error {
 		fmt.Printf(
 			"%s%s%s (code: %d) (%d.%ds)\n\n",
 			sub.rec["Finished"][0], dp,
-			colourize(CErr, "err "+sub.tgt),
+			colourize(CErr, "err "+sub.tgt.rel),
 			sub.exitCode, durationSec, durationNsec,
 		)
 	} else {
 		fmt.Printf(
 			"%s%s%s (%d.%ds)\n\n",
 			sub.rec["Finished"][0], dp,
-			colourize(CRedo, "done "+sub.tgt),
+			colourize(CRedo, "done "+sub.tgt.rel),
 			durationSec, durationNsec,
 		)
 	}
@@ -168,11 +165,10 @@ func showBuildLogCmd(m map[string][]string, depth int) error {
 	return nil
 }
 
-func showBuildLog(dir, tgt string, buildLogRec map[string][]string, depth int) error {
+func showBuildLog(tgt *Tgt, buildLogRec map[string][]string, depth int) error {
 	var err error
-	dirNormalized, tgtNormalized := cwdAndTgt(path.Join(dir, tgt))
 	if *flagBuildLogCommands || *flagBuildLogRecursive {
-		buildLogRec, err = parseBuildLogRec(dirNormalized, tgtNormalized)
+		buildLogRec, err = parseBuildLogRec(tgt)
 		if err != nil {
 			return err
 		}
@@ -182,7 +178,8 @@ func showBuildLog(dir, tgt string, buildLogRec map[string][]string, depth int) e
 			return err
 		}
 	}
-	fd, err := os.Open(path.Join(dirNormalized, RedoDir, tgtNormalized+LogSuffix))
+	tgtH, tgtT := path.Split(tgt.a)
+	fd, err := os.Open(path.Join(tgtH, RedoDir, tgtT+LogSuffix))
 	if err != nil {
 		return ErrLine(err)
 	}
@@ -198,12 +195,12 @@ func showBuildLog(dir, tgt string, buildLogRec map[string][]string, depth int) e
 	}
 	defer fd.Close()
 	subs := make([]*BuildLogJob, 0, len(buildLogRec["Ifchange"]))
-	for _, dep := range buildLogRec["Ifchange"] {
-		subDir, subTgt := cwdAndTgt(path.Join(dirNormalized, dep))
-		if subDir == dirNormalized && subTgt == tgtNormalized {
+	for _, depPath := range buildLogRec["Ifchange"] {
+		dep := NewTgt(path.Join(tgtH, depPath))
+		if dep.rel == tgt.rel {
 			continue
 		}
-		rec, err := parseBuildLogRec(subDir, subTgt)
+		rec, err := parseBuildLogRec(dep)
 		if err != nil {
 			if errors.Is(err, fs.ErrNotExist) {
 				continue
@@ -225,7 +222,6 @@ func showBuildLog(dir, tgt string, buildLogRec map[string][]string, depth int) e
 			}
 		}
 		subs = append(subs, &BuildLogJob{
-			dir:      dirNormalized,
 			tgt:      dep,
 			started:  started,
 			exitCode: exitCode,