mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Fold "wuffs genrelease" into "wuffs gen"
This commit is contained in:
1 parent
751eb693a5
commit
05c5b7ba2b
5 files changed
+18
-41
No files matched your search
@@ -230,7 +230,7 @@ func (h *genReleaseHelper) genWuffsVersion(w *bytes.Buffer, s []byte) (remaining
|
||||
return nil, fmt.Errorf("%q did not end with %q", cut, grVString)
|
||||
}
|
||||
|
||||
fmt.Fprintf(w, "// WUFFS_VERSION was overridden by \"wuffs genrelease\" on %v UTC",
|
||||
fmt.Fprintf(w, "// WUFFS_VERSION was overridden by \"wuffs gen -version\" on %v UTC",
|
||||
time.Now().UTC().Format("2006-01-02"))
|
||||
if h.revision != "" {
|
||||
fmt.Fprintf(w, ",\n// based on revision %s", h.revision)
|
||||
|
||||
+13
-1
@@ -46,6 +46,10 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
if genlib {
|
||||
skipgenFlag = flags.Bool("skipgen", skipgenDefault, skipgenUsage)
|
||||
}
|
||||
versionFlag := (*string)(nil)
|
||||
if !genlib {
|
||||
versionFlag = flags.String("version", cf.VersionDefault, cf.VersionUsage)
|
||||
}
|
||||
|
||||
if err := flags.Parse(args); err != nil {
|
||||
return err
|
||||
@@ -57,6 +61,14 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
v := cf.Version{}
|
||||
if !genlib {
|
||||
ok := false
|
||||
v, ok = cf.ParseVersion(*versionFlag)
|
||||
if !ok {
|
||||
return fmt.Errorf("bad -version flag value %q", *versionFlag)
|
||||
}
|
||||
}
|
||||
args = flags.Args()
|
||||
if len(args) == 0 {
|
||||
args = []string{"std/..."}
|
||||
@@ -87,7 +99,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
if genlib {
|
||||
return h.genlibAffected()
|
||||
}
|
||||
return doGenrelease1(wuffsRoot, langs, cf.Version{})
|
||||
return genrelease(wuffsRoot, langs, v)
|
||||
}
|
||||
|
||||
type genHelper struct {
|
||||
|
||||
@@ -35,7 +35,6 @@ var commands = []struct {
|
||||
{"bench", doBench},
|
||||
{"gen", doGen},
|
||||
{"genlib", doGenlib},
|
||||
{"genrelease", doGenrelease},
|
||||
{"test", doTest},
|
||||
}
|
||||
|
||||
@@ -51,7 +50,6 @@ The commands are:
|
||||
bench benchmark packages
|
||||
gen generate code for packages and dependencies
|
||||
genlib generate software libraries
|
||||
genrelease generate a stand-alone release
|
||||
test test packages
|
||||
`)
|
||||
}
|
||||
|
||||
+3
-36
@@ -16,7 +16,6 @@ package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
@@ -26,39 +25,7 @@ import (
|
||||
cf "github.com/google/wuffs/cmd/commonflags"
|
||||
)
|
||||
|
||||
func doGenrelease(wuffsRoot string, args []string) error {
|
||||
flags := flag.NewFlagSet("genrelease", flag.ExitOnError)
|
||||
langsFlag := flags.String("langs", langsDefault, langsUsage)
|
||||
skipgenFlag := flags.Bool("skipgen", skipgenDefault, skipgenUsage)
|
||||
versionFlag := flags.String("version", cf.VersionDefault, cf.VersionUsage)
|
||||
|
||||
if err := flags.Parse(args); err != nil {
|
||||
return err
|
||||
}
|
||||
langs, err := parseLangs(*langsFlag)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
v, ok := cf.ParseVersion(*versionFlag)
|
||||
if !ok {
|
||||
return fmt.Errorf("bad -version flag value %q", *versionFlag)
|
||||
}
|
||||
|
||||
if !*skipgenFlag {
|
||||
gh := genHelper{
|
||||
wuffsRoot: wuffsRoot,
|
||||
langs: langs,
|
||||
cformatter: cf.CformatterDefault,
|
||||
skipgen: *skipgenFlag,
|
||||
}
|
||||
if err := gh.gen("std", true); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return doGenrelease1(wuffsRoot, langs, v)
|
||||
}
|
||||
|
||||
func doGenrelease1(wuffsRoot string, langs []string, v cf.Version) error {
|
||||
func genrelease(wuffsRoot string, langs []string, v cf.Version) error {
|
||||
revision := findRevision(wuffsRoot)
|
||||
for _, lang := range langs {
|
||||
suffix := lang
|
||||
@@ -66,7 +33,7 @@ func doGenrelease1(wuffsRoot string, langs []string, v cf.Version) error {
|
||||
suffix = "h"
|
||||
}
|
||||
|
||||
filename, contents, err := doGenrelease2(wuffsRoot, revision, v, lang, suffix)
|
||||
filename, contents, err := genreleaseLang(wuffsRoot, revision, v, lang, suffix)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -77,7 +44,7 @@ func doGenrelease1(wuffsRoot string, langs []string, v cf.Version) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func doGenrelease2(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) {
|
||||
func genreleaseLang(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) (filename string, contents []byte, err error) {
|
||||
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", lang), "."+suffix)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
|
||||
+1
-1
@@ -116,7 +116,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := doGenrelease1(wuffsRoot, langs, cf.Version{}); err != nil {
|
||||
if err := genrelease(wuffsRoot, langs, cf.Version{}); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user