X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=dep.go;h=e6663e65fb7afaa64dac6f435a6b633d70ff9625;hb=fc990d88c883a4802788d8949f735bc88d5a5fc7;hp=0f62d30243f0256e2a0be731de93f010be45052a;hpb=67e92d5a298516292bbbee1f7714708cdc0766f8;p=goredo.git

diff --git a/dep.go b/dep.go
index 0f62d30..e6663e6 100644
--- a/dep.go
+++ b/dep.go
@@ -22,6 +22,7 @@ package main
 import (
 	"bufio"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -33,10 +34,6 @@ import (
 	"golang.org/x/crypto/blake2b"
 )
 
-const EnvNoHash = "REDO_NO_HASH"
-
-var NoHash bool
-
 func recfileWrite(fdDep *os.File, fields ...recfile.Field) error {
 	w := recfile.NewWriter(fdDep)
 	if _, err := w.RecordStart(); err != nil {
@@ -108,20 +105,17 @@ func writeDep(fdDep *os.File, cwd, tgt string) error {
 	if err != nil {
 		return err
 	}
-	fields := []recfile.Field{
+	hsh, err := fileHash(fd)
+	if err != nil {
+		return err
+	}
+	return recfileWrite(
+		fdDep,
 		recfile.Field{Name: "Type", Value: DepTypeIfchange},
 		recfile.Field{Name: "Target", Value: tgt},
 		recfile.Field{Name: "Ctime", Value: ts},
-	}
-	var hsh string
-	if !NoHash {
-		hsh, err = fileHash(fd)
-		if err != nil {
-			return err
-		}
-		fields = append(fields, recfile.Field{Name: "Hash", Value: hsh})
-	}
-	return recfileWrite(fdDep, fields...)
+		recfile.Field{Name: "Hash", Value: hsh},
+	)
 }
 
 func writeDeps(fdDep *os.File, tgts []string) error {
@@ -144,3 +138,56 @@ func writeDeps(fdDep *os.File, tgts []string) error {
 	}
 	return nil
 }
+
+type DepInfo struct {
+	build     string
+	always    bool
+	stamp     string
+	ifcreates []string
+	ifchanges []map[string]string
+}
+
+func depRead(fdDep *os.File) (*DepInfo, error) {
+	r := recfile.NewReader(fdDep)
+	m, err := r.NextMap()
+	if err != nil {
+		return nil, err
+	}
+	depInfo := DepInfo{}
+	if b := m["Build"]; b == "" {
+		return nil, errors.New(".dep missing Build:")
+	} else {
+		depInfo.build = b
+	}
+	for {
+		m, err := r.NextMap()
+		if err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, err
+		}
+		switch m["Type"] {
+		case DepTypeAlways:
+			depInfo.always = true
+		case DepTypeIfcreate:
+			dep := m["Target"]
+			if dep == "" {
+				return nil, errors.New("invalid format of .dep")
+			}
+			depInfo.ifcreates = append(depInfo.ifcreates, dep)
+		case DepTypeIfchange:
+			delete(m, "Type")
+			depInfo.ifchanges = append(depInfo.ifchanges, m)
+		case DepTypeStamp:
+			hsh := m["Hash"]
+			if hsh == "" {
+				return nil, errors.New("invalid format of .dep")
+			}
+			depInfo.stamp = hsh
+		default:
+			return nil, errors.New("invalid format of .dep")
+		}
+	}
+	return &depInfo, nil
+}