Add a skipgendeps flag

This commit is contained in:
Nigel Tao committed 2017-12-03 13:09:15 +11:00
1 parent 9867cd5e3a
commit df4539f6ff
3 files changed
+23 -11

No files matched your search

+16 -9
View File
@@ -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...)
+3
View File
@@ -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) {
+4 -2
View File
@@ -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