fix: expandOutputs() wasn't expanding the empty set

alecthomas · alecthomas · commit a9e689aeb8f3 · 2024-03-11T08:26:21.000+11:00
Which should expand to the full set of outputs.
diff --git a/engine/engine.go b/engine/engine.go
@@ -4,6 +4,7 @@ import (
 	"crypto/sha256"
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -392,6 +393,9 @@ func (e *Engine) Build(outputs []string) error {
 
 // Glob-expand outputs.
 func (e *Engine) expandOutputs(outputs []string) ([]string, error) {
+	if len(outputs) == 0 {
+		return e.Outputs(), nil
+	}
 	expanded := []string{}
 	for _, output := range outputs {
 		normalised, err := e.normalisePath(output)
@@ -555,12 +559,17 @@ func (e *Engine) realRefHasher(target *Target, ref *parser.Ref) (Hasher, error)
 	if err != nil {
 		return 0, err
 	}
-
 	h.Int(uint64(info.Mode()))
-	if !info.IsDir() {
-		h.Int(uint64(info.Size()))
-		h.Int(uint64(info.ModTime().UnixNano()))
+	if info.IsDir() {
+		return h, nil
+	}
+
+	r, err := os.Open(ref.Text)
+	if err != nil {
+		return 0, err
 	}
+	defer r.Close()
+	_, _ = io.Copy(&h, r)
 	return h, nil
 }
 
diff --git a/engine/hasher.go b/engine/hasher.go
@@ -36,6 +36,11 @@ func HashSlice[T string | uint64 | []byte | Hasher](hasher *Hasher, slice []T) {
 
 func NewHasher() Hasher { return offset64 }
 
+func (h *Hasher) Write(data []byte) (int, error) {
+	h.Bytes(data)
+	return len(data), nil
+}
+
 // Int updates the hash with a uint64.
 func (h *Hasher) Int(data uint64) {
 	f := *h
