Add a "puffs genlib" command.

This commit is contained in:
Nigel Tao committed 2017-08-10 16:48:14 +10:00
1 parent b3710e583f
commit 8488ab0d86
8 files changed
+287 -17

No files matched your search

+122
View File
@@ -0,0 +1,122 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
// puffs-genlib-c builds C software libraries.
package main
import (
"flag"
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"
)
var (
dstdirFlag = flag.String("dstdir", "", "directory containing the object files ")
srcdirFlag = flag.String("srcdir", "", "directory containing the C source files")
)
func main() {
if err := main1(); err != nil {
os.Stderr.WriteString(err.Error() + "\n")
os.Exit(1)
}
}
func main1() error {
flag.Parse()
if *dstdirFlag == "" {
return fmt.Errorf("empty -dstdir flag")
}
if *srcdirFlag == "" {
return fmt.Errorf("empty -srcdir flag")
}
args := flag.Args()
for _, cc := range []string{"clang", "gcc"} {
for _, dynamism := range []string{"static", "dynamic"} {
outDir := filepath.Join(*dstdirFlag, cc+"-"+dynamism)
if err := os.MkdirAll(outDir, 0755); err != nil {
return err
}
if err := genObj(outDir, cc, dynamism, args); err != nil {
return err
}
if err := genLib(outDir, cc, dynamism, args); err != nil {
return err
}
}
}
return nil
}
// TODO: are these extensions correct for non-Linux?
var (
objExtensions = map[string]string{
"dynamic": ".lo",
"static": ".o",
}
libExtensions = map[string]string{
"dynamic": ".so",
"static": ".a",
}
)
func genObj(outDir string, cc string, dynamism string, filenames []string) error {
for _, filename := range filenames {
in := filepath.Join(*srcdirFlag, filename+".c")
out := outFilename(outDir, dynamism, filename)
args := []string(nil)
args = append(args, "-O3", "-std=c99")
if dynamism == "dynamic" {
args = append(args, "-fPIC", "-DPIC")
}
args = append(args, "-c", "-o", out, in)
cmd := exec.Command(cc, args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
}
fmt.Printf("genlib: %s\n", out)
}
return nil
}
func genLib(outDir string, cc string, dynamism string, filenames []string) error {
args := []string(nil)
switch dynamism {
case "dynamic":
// TODO: add a "-Wl,-soname,libpuffs.so.1.2.3" argument?
args = append(args, "-shared", "-fPIC", "-o")
case "static":
cc = "ar"
args = append(args, "rc")
}
out := filepath.Join(outDir, "libpuffs"+libExtensions[dynamism])
args = append(args, out)
for _, filename := range filenames {
args = append(args, outFilename(outDir, dynamism, filename))
}
cmd := exec.Command(cc, args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
}
fmt.Printf("genlib: %s\n", out)
return nil
}
func outFilename(outDir string, dynamism string, filename string) string {
filename = strings.Replace(filename, "/", "-", -1)
filename = strings.Replace(filename, "\\", "-", -1)
filename = filepath.Join(outDir, filename+objExtensions[dynamism])
return filename
}
+40 -8
View File
@@ -21,7 +21,10 @@ import (
"github.com/google/puffs/lang/token"
)
func doGen(puffsRoot string, args []string) error {
func doGen(puffsRoot string, args []string) error { return doGenGenlib(puffsRoot, args, false) }
func doGenlib(puffsRoot string, args []string) error { return doGenGenlib(puffsRoot, args, true) }
func doGenGenlib(puffsRoot string, args []string, genlib bool) error {
flags := flag.NewFlagSet("gen", flag.ExitOnError)
langsFlag := flags.String("langs", langsDefault, langsUsage)
if err := flags.Parse(args); err != nil {
@@ -36,36 +39,48 @@ func doGen(puffsRoot string, args []string) error {
args = []string{"std/..."}
}
affected := []string(nil)
for _, arg := range args {
recursive := strings.HasSuffix(arg, "/...")
if recursive {
arg = arg[:len(arg)-4]
}
if err := gen(puffsRoot, arg, langs, recursive); err != nil {
var err error
affected, err = gen(affected, puffsRoot, arg, langs, recursive)
if err != nil {
return err
}
}
if genlib {
if err := genlibAffected(puffsRoot, langs, affected); err != nil {
return err
}
}
return nil
}
func gen(puffsRoot, dirname string, langs []string, recursive bool) error {
func gen(affected []string, puffsRoot, dirname string, langs []string, recursive bool) (retAffected []string, retErr error) {
filenames, dirnames, err := listDir(puffsRoot, dirname, recursive)
if err != nil {
return err
return nil, err
}
if len(filenames) > 0 {
if err := genDir(puffsRoot, dirname, filenames, langs); err != nil {
return err
return nil, err
}
affected = append(affected, dirname)
}
if len(dirnames) > 0 {
for _, d := range dirnames {
if err := gen(puffsRoot, dirname+"/"+d, langs, recursive); err != nil {
return err
var err error
affected, err = gen(affected, puffsRoot, dirname+"/"+d, langs, recursive)
if err != nil {
return nil, err
}
}
}
return nil
return affected, nil
}
func genDir(puffsRoot string, dirname string, filenames []string, langs []string) error {
@@ -156,3 +171,20 @@ func genFile(puffsRoot string, dirname string, lang string, out []byte) error {
fmt.Println("gen wrote: ", outFilename)
return nil
}
func genlibAffected(puffsRoot string, langs []string, affected []string) error {
for _, lang := range langs {
command := "puffs-genlib-" + lang
args := []string(nil)
args = append(args, "-dstdir", filepath.Join(puffsRoot, "gen", "lib", lang))
args = append(args, "-srcdir", filepath.Join(puffsRoot, "gen", lang))
args = append(args, affected...)
cmd := exec.Command(command, args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
}
}
return nil
}
+2
View File
@@ -21,6 +21,7 @@ var commands = []struct {
}{
{"bench", doBench},
{"gen", doGen},
{"genlib", doGenlib},
{"test", doTest},
}
@@ -35,6 +36,7 @@ The commands are:
bench benchmark packages
gen generate code for packages and dependencies
genlib generate software libraries
test test packages
`)
}
+3 -2
View File
@@ -51,7 +51,7 @@ func doBenchTest(puffsRoot string, args []string, bench bool) error {
}
// Ensure that we are testing the latest version of the generated code.
if err := gen(puffsRoot, arg, langs, recursive); err != nil {
if _, err := gen(nil, puffsRoot, arg, langs, recursive); err != nil {
return err
}
@@ -103,7 +103,8 @@ func benchTestDir(puffsRoot string, dirname string, langs []string, cmdArgs []st
for _, lang := range langs {
command := "puffs-test-" + lang
args := append([]string(nil), cmdArgs...)
args := []string(nil)
args = append(args, cmdArgs...)
args = append(args, filepath.Join(puffsRoot, "test", lang, filepath.FromSlash(dirname)))
cmd := exec.Command(command, args...)
cmd.Stdout = os.Stdout