}
func showBuildLogSub(sub *BuildLogJob, depth int) error {
- if _, ok := buildLogSeen[sub.tgt.a]; ok {
+ if _, ok := buildLogSeen[sub.tgt.rel]; ok {
return nil
}
- buildLogSeen[sub.tgt.a] = 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.String()),
+ colourize(CRedo, "redo "+sub.tgt.rel),
)
if err := showBuildLog(sub.tgt, sub.rec, depth+1); err != nil {
return err
fmt.Printf(
"%s%s%s (code: %d) (%d.%ds)\n\n",
sub.rec["Finished"][0], dp,
- colourize(CErr, "err "+sub.tgt.String()),
+ 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.String()),
+ colourize(CRedo, "done "+sub.tgt.rel),
durationSec, durationNsec,
)
}
subs := make([]*BuildLogJob, 0, len(buildLogRec["Ifchange"]))
for _, depPath := range buildLogRec["Ifchange"] {
dep := NewTgt(path.Join(tgt.h, depPath))
- if dep.a == tgt.a {
+ if dep.rel == tgt.rel {
continue
}
rec, err := parseBuildLogRec(dep)
}
switch m["Type"] {
case DepTypeIfcreate:
- data[DotNodes{tgt.String(), NewTgt(m["Target"]).String()}] = true
+ data[DotNodes{tgt.rel, NewTgt(string(chunk)).rel}] = true
case DepTypeIfchange:
dep = NewTgt(path.Join(tgt.h, m["Target"]))
if dep.a == tgt.a {
continue
}
- data[DotNodes{tgt.String(), dep.String()}] = false
+ data[DotNodes{tgt.rel, dep.rel}] = false
if isSrc(dep) {
continue
}
tracef(CDebug, "checking %d dependant targets: %v", len(queueSrc), queueSrc)
queue := make(map[string]*Tgt)
for _, tgt := range queueSrc {
- for _, dep := range deps[tgt.a] {
- queue[dep.a] = dep
+ for _, dep := range deps[tgt.rel] {
+ queue[dep.rel] = dep
}
}
return nil
}
queueSrc = append(queueSrc, tgt)
- seen[tgt.a] = tgt
+ seen[tgt.rel] = tgt
jobs++
}
Jobs.Wait()
close(okChecker)
}()
for _, tgt := range tgts {
- if _, ok := seen[tgt.a]; ok {
+ if _, ok := seen[tgt.rel]; ok {
tracef(CDebug, "%s was already build as a dependant", tgt)
continue
}
case CmdNameRedoTargets:
raws := make([]string, 0, len(tgts))
for _, tgt := range tgts {
- raws = append(raws, tgt.String())
+ raws = append(raws, tgt.rel)
}
if tgtsWasEmpty {
raws = []string{Cwd}
}
seen := make(map[string]*Tgt)
for _, tgt := range tgts {
- collectWholeDeps(deps[tgt.a], deps, seen)
+ collectWholeDeps(deps[tgt.rel], deps, seen)
}
res = make([]string, 0, len(seen))
for _, dep := range seen {
- res = append(res, dep.String())
+ res = append(res, dep.rel)
}
}
sort.Strings(res)
case CmdNameRedoOOD:
raws := make([]string, 0, len(tgts))
for _, tgt := range tgts {
- raws = append(raws, tgt.String())
+ raws = append(raws, tgt.rel)
}
if tgtsWasEmpty {
raws, err = targetsWalker([]string{Cwd})
{
raws := make([]string, 0, len(tgts))
for _, tgt := range tgts {
- raws = append(raws, tgt.String())
+ raws = append(raws, tgt.rel)
}
if tgtsWasEmpty {
raws, err = targetsWalker([]string{Cwd})
}
res := make([]string, 0, len(srcs))
for _, tgt := range srcs {
- res = append(res, tgt.String())
+ res = append(res, tgt.rel)
}
srcs = nil
sort.Strings(res)
func isOOD(tgt *Tgt, level int, seen map[string]*Tgt) (bool, error) {
indent := strings.Repeat(". ", level)
tracef(CDebug, "ood: %s%s checking", indent, tgt)
- ood, cached := OODCache[tgt.a]
+ ood, cached := OODCache[tgt.rel]
if cached {
tracef(CDebug, "ood: %s%s -> cached: %v", indent, tgt, ood)
return ood, nil
}
- depInfo := DepInfoCache[tgt.Dep()]
+ depInfo := DepInfoCache[tgt.rel]
var err error
if depInfo == nil {
depInfo, err = depRead(tgt)
ood = true
tracef(CDebug, "ood: %s%s -> no dep: %s", indent, tgt, tgt.Dep())
}
- OODCache[tgt.a] = ood
+ OODCache[tgt.rel] = ood
return ood, nil
}
if err != nil {
return true, TgtError{tgt, ErrLine(err)}
}
}
- DepInfoCache[tgt.Dep()] = depInfo
+ if DepInfoCache != nil {
+ DepInfoCache[tgt.rel] = depInfo
+ }
}
if depInfo.build == BuildUUID {
tracef(CDebug, "ood: %s%s -> already built", indent, tgt)
- OODCache[tgt.a] = false
+ OODCache[tgt.rel] = false
return false, nil
}
if !FileExists(tgt.a) {
tracef(CDebug, "ood: %s%s -> non-existent", indent, tgt)
- OODCache[tgt.a] = true
+ OODCache[tgt.rel] = true
return true, nil
}
for _, dep := range depInfo.ifchanges {
tracef(CDebug, "ood: %s%s -> %s: checking", indent, tgt, dep.tgt)
- ood, cached = OODCache[dep.tgt.a]
+ ood, cached = OODCache[dep.tgt.rel]
if cached {
tracef(CDebug, "ood: %s%s -> %s: cached: %v", indent, tgt, dep.tgt, ood)
if ood {
if errors.Is(err, fs.ErrNotExist) {
tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgt, dep.tgt)
ood = true
- OODCache[dep.tgt.a] = ood
+ OODCache[dep.tgt.rel] = ood
goto Done
}
return ood, TgtError{tgt, ErrLine(err)}
if inode.Size != dep.inode.Size {
tracef(CDebug, "ood: %s%s -> %s: size differs", indent, tgt, dep.tgt)
ood = true
- OODCache[dep.tgt.a] = ood
+ OODCache[dep.tgt.rel] = ood
goto Done
}
if InodeTrust != InodeTrustNone && inode.Equals(dep.inode) {
if dep.hash != hsh {
tracef(CDebug, "ood: %s%s -> %s: hash differs", indent, tgt, dep.tgt)
ood = true
- OODCache[dep.tgt.a] = ood
+ OODCache[dep.tgt.rel] = ood
goto Done
}
tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgt, dep.tgt)
}
- if dep.tgt.a == tgt.a {
+ if dep.tgt.rel == tgt.rel {
tracef(CDebug, "ood: %s%s -> %s: same target", indent, tgt, dep.tgt)
continue
}
if isSrc(dep.tgt) {
tracef(CDebug, "ood: %s%s -> %s: is source", indent, tgt, dep.tgt)
- OODCache[dep.tgt.a] = false
+ OODCache[dep.tgt.rel] = false
continue
}
- if _, ok := seen[dep.tgt.a]; ok {
+ if _, ok := seen[dep.tgt.rel]; ok {
tracef(CDebug, "ood: %s%s -> %s: was always built", indent, tgt, dep.tgt)
- OODCache[dep.tgt.a] = false
+ OODCache[dep.tgt.rel] = false
continue
}
Done:
tracef(CDebug, "ood: %s%s: %v", indent, tgt, ood)
- OODCache[tgt.a] = ood
+ OODCache[tgt.rel] = ood
return ood, nil
}
func (e *RunError) Name() string {
var name string
if e.DoFile == "" {
- name = e.Tgt.String()
+ name = e.Tgt.rel
} else {
name = fmt.Sprintf("%s (%s)", e.Tgt, e.DoFile)
}
doFile = NewTgt(path.Join(ups...))
if strings.HasPrefix(doFile.t, "default.") {
basename = basename[:len(basename)-(len(doFile.t)-len("default.")-len(".do"))-1]
- runErr.DoFile = doFile.String()
+ runErr.DoFile = doFile.rel
}
}
// Prepare command line
var cmdName string
var args []string
- if err = unix.Access(doFile.String(), unix.X_OK); err == nil {
+ if err = unix.Access(doFile.rel, unix.X_OK); err == nil {
cmdName = doFile.t
args = make([]string, 0, 3)
} else {
srcs map[string]*Tgt,
) error {
for _, tgt := range tgts {
- if _, ok := seenDeps[tgt.Dep()]; ok {
+ if _, ok := seenDeps[tgt.rel]; ok {
continue
}
- seenDeps[tgt.Dep()] = struct{}{}
+ seenDeps[tgt.rel] = struct{}{}
depInfo, err := depRead(tgt)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
return ErrLine(err)
}
for _, dep := range depInfo.ifchanges {
- if _, ok := seen[dep.tgt.a]; ok {
+ if _, ok := seen[dep.tgt.rel]; ok {
continue
}
- seen[dep.tgt.a] = struct{}{}
+ seen[dep.tgt.rel] = struct{}{}
if isSrc(dep.tgt) {
- srcs[dep.tgt.a] = dep.tgt
- } else if dep.tgt.a != tgt.a {
+ srcs[dep.tgt.rel] = dep.tgt
+ } else if dep.tgt.rel != tgt.rel {
if err := sourcesWalker(
[]*Tgt{dep.tgt},
seen, seenDeps, srcs,
seen map[string]*Tgt,
) {
for _, tgt := range tgts {
- if _, exists := seen[tgt.a]; exists {
+ if _, exists := seen[tgt.rel]; exists {
continue
}
- seen[tgt.a] = tgt
- collectWholeDeps(deps[tgt.a], deps, seen)
+ seen[tgt.rel] = tgt
+ collectWholeDeps(deps[tgt.rel], deps, seen)
}
}
return mustRel(Cwd, path.Join(paths...))
}
-func cwdAndTgt(tgt string) (string, string) {
- cwd, tgt := path.Split(tgt)
- return mustAbs(cwd), tgt
-}
-
type Tgt struct {
// a/h/t resemble zsh'es :a, :h, :t modifiers
a string // absolute path