mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 16:47:28 +01:00
Remove -cformatter flag
This commit is contained in:
1 parent
12b0f4c0bc
commit
8cd39fc1dd
5 files changed
+5
-56
No files matched your search
@@ -28,10 +28,6 @@ const (
|
||||
CcompilersDefault = "clang-5.0,gcc"
|
||||
CcompilersUsage = `comma-separated list of C compilers`
|
||||
|
||||
// TODO: remove the -cformatter flag entirely.
|
||||
CformatterDefault = "dumbindent"
|
||||
CformatterUsage = `C formatter`
|
||||
|
||||
FocusDefault = ""
|
||||
FocusUsage = `comma-separated list of tests or benchmarks (name prefixes) to focus on, e.g. "wuffs_gif_decode"`
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@ 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)
|
||||
cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage)
|
||||
genlinenumFlag := flags.Bool("genlinenum", cf.GenlinenumDefault, cf.GenlinenumUsage)
|
||||
langsFlag := flags.String("langs", langsDefault, langsUsage)
|
||||
skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage)
|
||||
@@ -61,9 +60,6 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
return fmt.Errorf("bad -ccompilers flag value %q", *ccompilersFlag)
|
||||
}
|
||||
}
|
||||
if !cf.IsAlphaNumericIsh(*cformatterFlag) {
|
||||
return fmt.Errorf("bad -cformatter flag value %q", *cformatterFlag)
|
||||
}
|
||||
langs, err := parseLangs(*langsFlag)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -84,7 +80,6 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
h := genHelper{
|
||||
wuffsRoot: wuffsRoot,
|
||||
langs: langs,
|
||||
cformatter: *cformatterFlag,
|
||||
genlinenum: *genlinenumFlag,
|
||||
skipgen: genlib && *skipgenFlag,
|
||||
skipgendeps: *skipgendepsFlag,
|
||||
@@ -117,7 +112,6 @@ type genHelper struct {
|
||||
wuffsRoot string
|
||||
langs []string
|
||||
ccompilers string
|
||||
cformatter string
|
||||
genlinenum bool
|
||||
skipgen bool
|
||||
skipgendeps bool
|
||||
@@ -193,9 +187,6 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
|
||||
for _, lang := range h.langs {
|
||||
command := "wuffs-" + lang
|
||||
cmdArgs := []string{"gen", "-package_name", packageName}
|
||||
if (lang == "c") && (h.cformatter != cf.CformatterDefault) {
|
||||
cmdArgs = append(cmdArgs, fmt.Sprintf("-cformatter=%s", h.cformatter))
|
||||
}
|
||||
if h.genlinenum != cf.GenlinenumDefault {
|
||||
cmdArgs = append(cmdArgs, fmt.Sprintf("-genlinenum=%t", h.genlinenum))
|
||||
}
|
||||
|
||||
@@ -31,7 +31,6 @@ func doTest(wuffsRoot string, args []string) error { return doBenchTest(wuffsRo
|
||||
func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
flags := flag.NewFlagSet("test", flag.ExitOnError)
|
||||
ccompilersFlag := flags.String("ccompilers", cf.CcompilersDefault, cf.CcompilersUsage)
|
||||
cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage)
|
||||
focusFlag := flags.String("focus", cf.FocusDefault, cf.FocusUsage)
|
||||
iterscaleFlag := flags.Int("iterscale", cf.IterscaleDefault, cf.IterscaleUsage)
|
||||
langsFlag := flags.String("langs", langsDefault, langsUsage)
|
||||
@@ -51,9 +50,6 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
if !cf.IsAlphaNumericIsh(*ccompilersFlag) {
|
||||
return fmt.Errorf("bad -ccompilers flag value %q", *ccompilersFlag)
|
||||
}
|
||||
if !cf.IsAlphaNumericIsh(*cformatterFlag) {
|
||||
return fmt.Errorf("bad -cformatter flag value %q", *cformatterFlag)
|
||||
}
|
||||
if !cf.IsAlphaNumericIsh(*focusFlag) {
|
||||
return fmt.Errorf("bad -focus flag value %q", *focusFlag)
|
||||
}
|
||||
@@ -99,7 +95,6 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
gh := genHelper{
|
||||
wuffsRoot: wuffsRoot,
|
||||
langs: langs,
|
||||
cformatter: *cformatterFlag,
|
||||
skipgen: *skipgenFlag,
|
||||
skipgendeps: *skipgendepsFlag,
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user