X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=ood.go;h=15d0ae5abb6d15990dda880b627c14e096ab8ca7;hp=4189ed459cae740df414d766ac3e6e8ceaedb675;hb=67e92d5a298516292bbbee1f7714708cdc0766f8;hpb=634ee31ae35a2eaac517e0ffa1b7caede4b27ac5

diff --git a/ood.go b/ood.go
index 4189ed4..15d0ae5 100644
--- a/ood.go
+++ b/ood.go
@@ -31,6 +31,13 @@ import (
 	"go.cypherpunks.ru/recfile"
 )
 
+const (
+	DepTypeIfcreate = "ifcreate"
+	DepTypeIfchange = "ifchange"
+	DepTypeAlways   = "always"
+	DepTypeStamp    = "stamp"
+)
+
 type TgtErr struct {
 	Tgt string
 	Err error
@@ -42,6 +49,14 @@ func (e TgtErr) Error() string {
 	return fmt.Sprintf("%s: %s", e.Tgt, e.Err)
 }
 
+func cwdMustRel(paths ...string) string {
+	rel, err := filepath.Rel(Cwd, path.Join(paths...))
+	if err != nil {
+		panic(err)
+	}
+	return rel
+}
+
 func cwdAndTgt(tgt string) (string, string) {
 	cwd, tgt := path.Split(tgt)
 	cwd, err := filepath.Abs(cwd)
@@ -75,15 +90,12 @@ func isBuiltNow(fdDep *os.File) (bool, *recfile.Reader, error) {
 }
 
 func rebuildStamped(cwd, tgt, depPath string) (string, error) {
-	relTgt, err := filepath.Rel(Cwd, path.Join(cwd, tgt))
-	if err != nil {
-		panic(err)
-	}
+	relTgt := cwdMustRel(cwd, tgt)
 	errs := make(chan error, 1)
-	if err = runScript(relTgt, errs); err != nil {
+	if err := runScript(relTgt, errs); err != nil {
 		return "", err
 	}
-	if err = <-errs; !isOkRun(err) {
+	if err := <-errs; !isOkRun(err) {
 		return "", errors.New("build failed")
 	}
 	fdDep, err := os.Open(depPath)
@@ -107,7 +119,7 @@ func rebuildStamped(cwd, tgt, depPath string) (string, error) {
 			}
 			return "", err
 		}
-		if m["Type"] == "stamp" {
+		if m["Type"] == DepTypeStamp {
 			stampTheir = m["Hash"]
 			break
 		}
@@ -115,11 +127,10 @@ func rebuildStamped(cwd, tgt, depPath string) (string, error) {
 	return stampTheir, nil
 }
 
-func isOOD(cwd, tgt string, level int) (bool, error) {
-	tgtOrig := tgt
+func isOOD(cwd, tgtOrig string, level int) (bool, error) {
 	indent := strings.Repeat(". ", level)
 	trace(CDebug, "ood: %s%s checking", indent, tgtOrig)
-	cwd, tgt = cwdAndTgt(path.Join(cwd, tgt))
+	cwd, tgt := cwdAndTgt(path.Join(cwd, tgtOrig))
 	depPath := path.Join(cwd, RedoDir, tgt+DepSuffix)
 	fdDep, err := os.Open(depPath)
 	if err != nil {
@@ -150,14 +161,14 @@ func isOOD(cwd, tgt string, level int) (bool, error) {
 			return true, TgtErr{tgtOrig, err}
 		}
 		switch m["Type"] {
-		case "always":
+		case DepTypeAlways:
 			trace(CDebug, "ood: %s%s -> always", indent, tgtOrig)
 			ood = true
-		case "ifcreate":
+		case DepTypeIfcreate:
 			ifcreates = append(ifcreates, m)
-		case "ifchange":
+		case DepTypeIfchange:
 			ifchanges = append(ifchanges, m)
-		case "stamp":
+		case DepTypeStamp:
 			stampOur = m["Hash"]
 			trace(CDebug, "ood: %s%s -> stamped: %s", indent, tgtOrig, stampOur)
 		default: