mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 08:47:28 +01:00
Add a "wuffs genrelease" command
This commit is contained in:
1 parent
beed8a1c52
commit
dccf0c60d7
9 files changed
+479
-38
No files matched your search
+13
-25
@@ -18,7 +18,6 @@ import (
|
||||
"bytes"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path"
|
||||
@@ -119,12 +118,13 @@ func (h *genHelper) gen(dirname string, recursive bool) error {
|
||||
return fmt.Errorf("invalid package path %q", dirname)
|
||||
}
|
||||
|
||||
filenames, dirnames, err := listDir(h.wuffsRoot, dirname, recursive)
|
||||
qualFilenames, dirnames, err := listDir(
|
||||
filepath.Join(h.wuffsRoot, filepath.FromSlash(dirname)), ".wuffs", recursive)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if len(filenames) > 0 {
|
||||
if err := h.genDir(dirname, filenames); err != nil {
|
||||
if len(qualFilenames) > 0 {
|
||||
if err := h.genDir(dirname, qualFilenames); err != nil {
|
||||
return err
|
||||
}
|
||||
h.affected = append(h.affected, dirname)
|
||||
@@ -139,7 +139,7 @@ func (h *genHelper) gen(dirname string, recursive bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h *genHelper) genDir(dirname string, filenames []string) error {
|
||||
func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
|
||||
// TODO: skip the generation if the output file already exists and its
|
||||
// mtime is newer than all inputs and the wuffs-gen-foo command.
|
||||
|
||||
@@ -147,12 +147,9 @@ func (h *genHelper) genDir(dirname string, filenames []string) error {
|
||||
if !validName(packageName) {
|
||||
return fmt.Errorf(`invalid package %q, not in [a-z0-9]+`, packageName)
|
||||
}
|
||||
qualifiedFilenames := make([]string, len(filenames))
|
||||
for i, filename := range filenames {
|
||||
qualifiedFilenames[i] = filepath.Join(h.wuffsRoot, filepath.FromSlash(dirname), filename)
|
||||
}
|
||||
|
||||
if !h.skipgendeps {
|
||||
if err := h.genDirDependencies(qualifiedFilenames); err != nil {
|
||||
if err := h.genDirDependencies(qualFilenames); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -163,7 +160,7 @@ func (h *genHelper) genDir(dirname string, filenames []string) error {
|
||||
if lang == "c" {
|
||||
cmdArgs = append(cmdArgs, fmt.Sprintf("-cformatter=%s", h.cformatter))
|
||||
}
|
||||
cmdArgs = append(cmdArgs, qualifiedFilenames...)
|
||||
cmdArgs = append(cmdArgs, qualFilenames...)
|
||||
stdout := &bytes.Buffer{}
|
||||
|
||||
cmd := exec.Command(command, cmdArgs...)
|
||||
@@ -196,7 +193,7 @@ func (h *genHelper) genDir(dirname string, filenames []string) error {
|
||||
}
|
||||
}
|
||||
if len(h.langs) > 0 && packageName != "base" {
|
||||
if err := h.genWuffs(dirname, qualifiedFilenames); err != nil {
|
||||
if err := h.genWuffs(dirname, qualFilenames); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -226,19 +223,10 @@ func (h *genHelper) genDirDependencies(qualifiedFilenames []string) error {
|
||||
}
|
||||
|
||||
func (h *genHelper) genFile(dirname string, lang string, out []byte) error {
|
||||
outFilename := filepath.Join(h.wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+lang)
|
||||
if existing, err := ioutil.ReadFile(outFilename); err == nil && bytes.Equal(existing, out) {
|
||||
fmt.Println("gen unchanged: ", outFilename)
|
||||
return nil
|
||||
}
|
||||
if err := os.MkdirAll(filepath.Dir(outFilename), 0755); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ioutil.WriteFile(outFilename, out, 0644); err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Println("gen wrote: ", outFilename)
|
||||
return nil
|
||||
return writeFile(
|
||||
filepath.Join(h.wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+lang),
|
||||
out,
|
||||
)
|
||||
}
|
||||
|
||||
func (h *genHelper) genWuffs(dirname string, qualifiedFilenames []string) error {
|
||||
|
||||
+58
-8
@@ -16,8 +16,10 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
@@ -33,6 +35,7 @@ var commands = []struct {
|
||||
{"bench", doBench},
|
||||
{"gen", doGen},
|
||||
{"genlib", doGenlib},
|
||||
{"genrelease", doGenrelease},
|
||||
{"test", doTest},
|
||||
}
|
||||
|
||||
@@ -48,6 +51,7 @@ 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
|
||||
`)
|
||||
}
|
||||
@@ -79,8 +83,41 @@ func main1() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func listDir(wuffsRoot string, dirname string, returnSubdirs bool) (filenames []string, dirnames []string, err error) {
|
||||
f, err := os.Open(filepath.Join(wuffsRoot, filepath.FromSlash(dirname)))
|
||||
func findFiles(qualDirname string, suffix string) (filenames []string, err error) {
|
||||
filenames, err = findFiles1(nil, qualDirname, suffix)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
sort.Strings(filenames)
|
||||
return filenames, nil
|
||||
}
|
||||
|
||||
func findFiles1(dstQF []string, qualDirname string, suffix string) (qualFilenames []string, err error) {
|
||||
dstQF, relDirnames, err := appendDir(dstQF, qualDirname, suffix, true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, d := range relDirnames {
|
||||
dstQF, err = findFiles1(dstQF, filepath.Join(qualDirname, d), suffix)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return dstQF, nil
|
||||
}
|
||||
|
||||
func listDir(qualDirname string, suffix string, returnSubdirs bool) (qualFilenames []string, relDirnames []string, err error) {
|
||||
qualFilenames, relDirnames, err = appendDir(nil, qualDirname, suffix, returnSubdirs)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
sort.Strings(qualFilenames)
|
||||
sort.Strings(relDirnames)
|
||||
return qualFilenames, relDirnames, nil
|
||||
}
|
||||
|
||||
func appendDir(dstQF []string, qualDirname string, suffix string, returnSubdirs bool) (qualFilenames []string, relDirnames []string, err error) {
|
||||
f, err := os.Open(qualDirname)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
@@ -94,16 +131,29 @@ func listDir(wuffsRoot string, dirname string, returnSubdirs bool) (filenames []
|
||||
name := o.Name()
|
||||
if o.IsDir() {
|
||||
if returnSubdirs {
|
||||
dirnames = append(dirnames, name)
|
||||
relDirnames = append(relDirnames, name)
|
||||
}
|
||||
} else if strings.HasSuffix(name, ".wuffs") {
|
||||
filenames = append(filenames, name)
|
||||
} else if strings.HasSuffix(name, suffix) {
|
||||
dstQF = append(dstQF, filepath.Join(qualDirname, name))
|
||||
}
|
||||
}
|
||||
|
||||
sort.Strings(filenames)
|
||||
sort.Strings(dirnames)
|
||||
return filenames, dirnames, nil
|
||||
return dstQF, relDirnames, nil
|
||||
}
|
||||
|
||||
func writeFile(filename string, contents []byte) error {
|
||||
if existing, err := ioutil.ReadFile(filename); err == nil && bytes.Equal(existing, contents) {
|
||||
fmt.Println("gen unchanged: ", filename)
|
||||
return nil
|
||||
}
|
||||
if err := os.MkdirAll(filepath.Dir(filename), 0755); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ioutil.WriteFile(filename, contents, 0644); err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Println("gen wrote: ", filename)
|
||||
return nil
|
||||
}
|
||||
|
||||
const (
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
// Copyright 2018 The Wuffs Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
|
||||
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,
|
||||
}
|
||||
if err := gh.gen("std", true); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
revision := findRevision(wuffsRoot)
|
||||
for _, lang := range langs {
|
||||
if err := doGenrelease1(wuffsRoot, revision, v, lang, lang); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if lang == "c" {
|
||||
if err := doGenrelease1(wuffsRoot, revision, v, "c", "h"); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func doGenrelease1(wuffsRoot string, revision string, v cf.Version, lang string, suffix string) error {
|
||||
qualFilenames, err := findFiles(filepath.Join(wuffsRoot, "gen", suffix), "."+suffix)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
command := "wuffs-" + lang
|
||||
args := []string(nil)
|
||||
args = append(args, "genrelease", "-revision", revision, "-version", v.String())
|
||||
args = append(args, qualFilenames...)
|
||||
stdout := &bytes.Buffer{}
|
||||
|
||||
cmd := exec.Command(command, args...)
|
||||
cmd.Stdout = stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
if err := cmd.Run(); err == nil {
|
||||
// No-op.
|
||||
} else if _, ok := err.(*exec.ExitError); ok {
|
||||
return fmt.Errorf("%s: failed", command)
|
||||
} else {
|
||||
return err
|
||||
}
|
||||
|
||||
wv := fmt.Sprintf("wuffs-v%d.%d", v.Major, v.Minor)
|
||||
return writeFile(
|
||||
filepath.Join(wuffsRoot, "release", lang, wv, wv+"."+suffix),
|
||||
stdout.Bytes(),
|
||||
)
|
||||
}
|
||||
|
||||
func findRevision(wuffsRoot string) string {
|
||||
// Assume that we're using git.
|
||||
|
||||
head, err := ioutil.ReadFile(filepath.Join(wuffsRoot, ".git", "HEAD"))
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
refPrefix := []byte("ref: ")
|
||||
if !bytes.HasPrefix(head, refPrefix) {
|
||||
return ""
|
||||
}
|
||||
head = head[len(refPrefix):]
|
||||
if len(head) == 0 || head[len(head)-1] != '\n' {
|
||||
return ""
|
||||
}
|
||||
head = head[:len(head)-1]
|
||||
|
||||
ref, err := ioutil.ReadFile(filepath.Join(wuffsRoot, ".git", string(head)))
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
if len(ref) == 0 || ref[len(ref)-1] != '\n' {
|
||||
return ""
|
||||
}
|
||||
ref = ref[:len(ref)-1]
|
||||
|
||||
return string(ref)
|
||||
}
|
||||
+3
-2
@@ -139,11 +139,12 @@ type testHelper struct {
|
||||
}
|
||||
|
||||
func (h *testHelper) benchTest(dirname string, recursive bool) (failed bool, err error) {
|
||||
filenames, dirnames, err := listDir(h.wuffsRoot, dirname, recursive)
|
||||
qualFilenames, dirnames, err := listDir(
|
||||
filepath.Join(h.wuffsRoot, filepath.FromSlash(dirname)), ".wuffs", recursive)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if len(filenames) > 0 {
|
||||
if len(qualFilenames) > 0 {
|
||||
f, err := h.benchTestDir(dirname)
|
||||
if err != nil {
|
||||
return false, err
|
||||
|
||||
Reference in new issue
Block a user