alex/homemaker
1
Fork 0
Code Releases 1 Activity

More work on variants

Browse Source
This commit is contained in:
Alex Yatskov 2015-09-04 13:05:09 +09:00
parent 9bc09b72f5
commit ce68f7324a
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
task.go
View File

@ -22,7 +22,10 @@
package main package main
import "fmt" import (
"fmt"
"log"
)
type task struct { type task struct {
Deps []string Deps []string
@ -66,12 +69,12 @@ func (t *task) process(conf *config) error {
} }
func processTask(taskName string, conf *config) error { func processTask(taskName string, conf *config) error {
var taskNames []string taskNames := []string{taskName}
if len(conf.variant) > 0 { if len(conf.variant) > 0 {
taskNames = append(taskNames, fmt.Sprint(taskName, "%", conf.variant)) taskNames = append(taskNames, fmt.Sprint(taskName, "%", conf.variant))
} }
taskNames = append(taskNames, taskName)
var found bool
for _, tn := range taskNames { for _, tn := range taskNames {
t, ok := conf.Tasks[tn] t, ok := conf.Tasks[tn]
if !ok { if !ok {
@ -79,12 +82,25 @@ func processTask(taskName string, conf *config) error {
} }
if t.handled { if t.handled {
return nil found = true
continue
}
if conf.flags&flagVerbose != 0 {
log.Printf("executing task: %s", tn)
} }
t.handled = true t.handled = true
return t.process(conf) if err := t.process(conf); err != nil {
return err
} }
found = true
}
if !found {
return fmt.Errorf("task or variant not found: %s", taskName) return fmt.Errorf("task or variant not found: %s", taskName)
}
return nil
} }