diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index b997bae2..155e22d5 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -39,6 +39,8 @@ func doGenlib(wuffsRoot string, args []string) error { return doGenGenlib(wuffsR func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { flags := flag.NewFlagSet("gen", flag.ExitOnError) langsFlag := flags.String("langs", langsDefault, langsUsage) + skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage) + if err := flags.Parse(args); err != nil { return err } @@ -52,8 +54,9 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { } h := genHelper{ - wuffsRoot: wuffsRoot, - langs: langs, + wuffsRoot: wuffsRoot, + langs: langs, + skipgendeps: *skipgendepsFlag, } for _, arg := range args { @@ -76,11 +79,13 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { } type genHelper struct { - wuffsRoot string - langs []string - affected []string - seen map[string]struct{} - tm t.Map + wuffsRoot string + langs []string + skipgendeps bool + + affected []string + seen map[string]struct{} + tm t.Map } func (h *genHelper) gen(dirname string, recursive bool) error { @@ -127,8 +132,10 @@ func (h *genHelper) genDir(dirname string, filenames []string) error { for i, filename := range filenames { qualifiedFilenames[i] = filepath.Join(h.wuffsRoot, filepath.FromSlash(dirname), filename) } - if err := h.genDirDependencies(qualifiedFilenames); err != nil { - return err + if !h.skipgendeps { + if err := h.genDirDependencies(qualifiedFilenames); err != nil { + return err + } } cmdArgs := []string{"gen", "-package_name", packageName} cmdArgs = append(cmdArgs, qualifiedFilenames...) diff --git a/cmd/wuffs/main.go b/cmd/wuffs/main.go index 0de677e6..7363c711 100644 --- a/cmd/wuffs/main.go +++ b/cmd/wuffs/main.go @@ -112,6 +112,9 @@ const ( skipgenDefault = false skipgenUsage = `whether to skip automatically generating code when testing` + + skipgendepsDefault = false + skipgendepsUsage = `whether to skip automatically generating packages' dependencies` ) func parseLangs(commaSeparated string) ([]string, error) { diff --git a/cmd/wuffs/test.go b/cmd/wuffs/test.go index 05975733..d2b0ac8f 100644 --- a/cmd/wuffs/test.go +++ b/cmd/wuffs/test.go @@ -36,6 +36,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error { mimicFlag := flags.Bool("mimic", cf.MimicDefault, cf.MimicUsage) repsFlag := flags.Int("reps", cf.RepsDefault, cf.RepsUsage) skipgenFlag := flags.Bool("skipgen", skipgenDefault, skipgenUsage) + skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage) if err := flags.Parse(args); err != nil { return err @@ -90,8 +91,9 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error { // Ensure that we are testing the latest version of the generated code. if !*skipgenFlag { gh := genHelper{ - wuffsRoot: wuffsRoot, - langs: langs, + wuffsRoot: wuffsRoot, + langs: langs, + skipgendeps: *skipgendepsFlag, } if err := gh.gen(arg, recursive); err != nil { return err