From 751eb693a5035cb6c750eab702eb1ce16877de94 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 14 Jul 2018 11:51:33 +1000 Subject: [PATCH] Have "wuffs genlib" take a -skipgen flag --- build-all.sh | 8 ++++---- cmd/wuffs/gen.go | 10 ++++++++++ cmd/wuffs/release.go | 1 + cmd/wuffs/test.go | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/build-all.sh b/build-all.sh index f8f3c4cb..85d2022b 100755 --- a/build-all.sh +++ b/build-all.sh @@ -39,10 +39,10 @@ go install github.com/google/wuffs/cmd/... go test github.com/google/wuffs/... -wuffs genlib -wuffs test -skipgen -mimic -wuffs bench -skipgen -mimic -reps=1 -iterscale=1 -wuffs genrelease -skipgen -version=0.0.0 +wuffs gen +wuffs genlib -skipgen +wuffs test -skipgen -mimic +wuffs bench -skipgen -mimic -reps=1 -iterscale=1 for f in example/*; do echo "Building $f" diff --git a/cmd/wuffs/gen.go b/cmd/wuffs/gen.go index bfb519c9..b7f54f88 100644 --- a/cmd/wuffs/gen.go +++ b/cmd/wuffs/gen.go @@ -42,6 +42,11 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { langsFlag := flags.String("langs", langsDefault, langsUsage) skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage) + skipgenFlag := (*bool)(nil) + if genlib { + skipgenFlag = flags.Bool("skipgen", skipgenDefault, skipgenUsage) + } + if err := flags.Parse(args); err != nil { return err } @@ -61,6 +66,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error { wuffsRoot: wuffsRoot, langs: langs, cformatter: *cformatterFlag, + skipgen: genlib && *skipgenFlag, skipgendeps: *skipgendepsFlag, } @@ -88,6 +94,7 @@ type genHelper struct { wuffsRoot string langs []string cformatter string + skipgen bool skipgendeps bool affected []string @@ -149,6 +156,9 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error { return fmt.Errorf(`invalid package %q, not in [a-z0-9]+`, packageName) } + if h.skipgen { + return nil + } if !h.skipgendeps { if err := h.genDirDependencies(qualFilenames); err != nil { return err diff --git a/cmd/wuffs/release.go b/cmd/wuffs/release.go index 66253016..f9febe07 100644 --- a/cmd/wuffs/release.go +++ b/cmd/wuffs/release.go @@ -49,6 +49,7 @@ func doGenrelease(wuffsRoot string, args []string) error { wuffsRoot: wuffsRoot, langs: langs, cformatter: cf.CformatterDefault, + skipgen: *skipgenFlag, } if err := gh.gen("std", true); err != nil { return err diff --git a/cmd/wuffs/test.go b/cmd/wuffs/test.go index e1ee7ebe..6ef30adc 100644 --- a/cmd/wuffs/test.go +++ b/cmd/wuffs/test.go @@ -100,6 +100,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error { wuffsRoot: wuffsRoot, langs: langs, cformatter: *cformatterFlag, + skipgen: *skipgenFlag, skipgendeps: *skipgendepsFlag, } for _, arg := range args {