Trace only non-dependant targets

[goredo.git] / main.go

diff --git a/main.go b/main.go
index 42d83beb0fddb14f15a3f5addb8181b5c362c7f1..afeb353f43d002c727f6596d1786052c6ee7f47c 100644 (file)
--- a/main.go
+++ b/main.go
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+       "bufio"
        "crypto/rand"
        "flag"
        "fmt"
@@ -77,17 +78,20 @@ func main() {
                        "redo",
                        "redo-always",
                        "redo-cleanup",
+                       "redo-dot",
                        "redo-ifchange",
                        "redo-ifcreate",
                        "redo-log",
                        "redo-stamp",
                        "redo-whichdo",
                } {
+                       fmt.Println(os.Args[0], "<-", cmdName)
                        if err := os.Symlink(os.Args[0], cmdName); err != nil {
                                rc = 1
                                log.Println(err)
                        }
                }
+               fmt.Println("no creating optional:", os.Args[0], "<- tai64nlocal")
                os.Exit(rc)
        }
        log.SetFlags(0)
@@ -99,7 +103,6 @@ func main() {
        }
 
        NoColor = os.Getenv(EnvNoColor) != ""
-       NoHash = os.Getenv(EnvNoHash) == "1"
        NoSync = os.Getenv(EnvNoSync) == "1"
 
        TopDir = os.Getenv(EnvTopDir)
@@ -140,10 +143,11 @@ func main() {
        if Debug || os.Getenv(EnvLogPid) == "1" {
                MyPid = os.Getpid()
        }
+       var traced bool
        if *flagTrace {
-               Trace = true
+               traced = true
        } else {
-               Trace = os.Getenv(EnvTrace) == "1"
+               traced = os.Getenv(EnvTrace) == "1"
        }
 
        // Those are internal envs
@@ -186,10 +190,14 @@ func main() {
 CmdSwitch:
        switch cmdName {
        case "redo":
-               Force = true
-               ok, err = ifchange(tgts)
+               for _, tgt := range tgts {
+                       ok, err = ifchange([]string{tgt}, true, traced)
+                       if err != nil || !ok {
+                               break
+                       }
+               }
        case "redo-ifchange":
-               ok, err = ifchange(tgts)
+               ok, err = ifchange(tgts, false, traced)
                writeDeps(fdDep, tgts)
        case "redo-ifcreate":
                if fdDep == nil {
@@ -213,6 +221,8 @@ CmdSwitch:
                                break
                        }
                }
+       case "redo-dot":
+               err = dotPrint(tgts)
        case "redo-stamp":
                if fdDep == nil {
                        log.Fatalln("no", EnvDepFd)
@@ -245,7 +255,10 @@ CmdSwitch:
                if err != nil {
                        break
                }
-               fdTmp.Seek(0, 0)
+               _, err = fdTmp.Seek(0, 0)
+               if err != nil {
+                       break
+               }
                r := recfile.NewReader(fdTmp)
                for {
                        m, err := r.NextMap()
@@ -255,13 +268,13 @@ CmdSwitch:
                                }
                                break CmdSwitch
                        }
-                       rel, err := filepath.Rel(Cwd, path.Join(cwd, m["Target"]))
-                       if err != nil {
-                               panic(err)
-                       }
-                       fmt.Println(rel)
+                       fmt.Println(cwdMustRel(cwd, m["Target"]))
                }
                ok = doFile != ""
+       case "tai64nlocal":
+               bw := bufio.NewWriter(os.Stdout)
+               err = tai64nLocal(bw, os.Stdin)
+               bw.Flush()
        default:
                log.Fatalln("unknown command", cmdName)
        }