diff options
author | Ondrej Fabry <ofabry@cisco.com> | 2020-06-23 14:10:53 +0200 |
---|---|---|
committer | Ondrej Fabry <ofabry@cisco.com> | 2020-06-24 08:17:33 +0200 |
commit | ceed73403bdb61387d04be8b47183e9c4a970749 (patch) | |
tree | 3f48a49051672efb44945b279b9f69693bc48540 /binapigen/run.go | |
parent | 94620e85f0bdbb054af07ce3670fadc1f76cfdf0 (diff) |
Fix codec fallback and generate type imports
Change-Id: Idd76c7f19d952939caf153928ac60175845078ff
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Diffstat (limited to 'binapigen/run.go')
-rw-r--r-- | binapigen/run.go | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/binapigen/run.go b/binapigen/run.go index 441c43d..e6086ee 100644 --- a/binapigen/run.go +++ b/binapigen/run.go @@ -19,44 +19,13 @@ import ( "os" "path/filepath" - "github.com/sirupsen/logrus" - "git.fd.io/govpp.git/binapigen/vppapi" ) -var debugMode = true - -func logf(f string, v ...interface{}) { - if debugMode { - logrus.Debugf(f, v...) - } -} - -func GenerateBinapiFile(gen *Generator, file *File, outputDir string) *GenFile { - packageDir := filepath.Join(outputDir, file.PackageName) - filename := filepath.Join(packageDir, file.PackageName+outputFileExt) - - g := gen.NewGenFile(filename) - g.file = file - g.packageDir = filepath.Join(outputDir, file.PackageName) - - generatePackage(g, &g.buf) - - return g -} - -func GenerateRPC(gen *Generator, file *File, outputDir string) *GenFile { - packageDir := filepath.Join(outputDir, file.PackageName) - filename := filepath.Join(packageDir, file.PackageName+rpcFileSuffix+outputFileExt) - - g := gen.NewGenFile(filename) - g.file = file - g.packageDir = filepath.Join(outputDir, file.PackageName) - - generatePackageRPC(g, &g.buf) - - return g -} +const ( + outputFileExt = ".ba.go" // file extension of the Go generated files + rpcFileSuffix = "_rpc" // file name suffix for the RPC services +) func Run(apiDir string, opts Options, f func(*Generator) error) { if err := run(apiDir, opts, f); err != nil { @@ -87,3 +56,29 @@ func run(apiDir string, opts Options, f func(*Generator) error) error { return nil } + +func GenerateBinapi(gen *Generator, file *File, outputDir string) *GenFile { + packageDir := filepath.Join(outputDir, file.PackageName) + filename := filepath.Join(packageDir, file.PackageName+outputFileExt) + + g := gen.NewGenFile(filename) + g.file = file + g.outputDir = outputDir + + generateFileBinapi(g, &g.buf) + + return g +} + +func GenerateRPC(gen *Generator, file *File, outputDir string) *GenFile { + packageDir := filepath.Join(outputDir, file.PackageName) + filename := filepath.Join(packageDir, file.PackageName+rpcFileSuffix+outputFileExt) + + g := gen.NewGenFile(filename) + g.file = file + g.outputDir = outputDir + + generateFileRPC(g, &g.buf) + + return g +} |