Skip to content

Add --thriftNoRecurse flag to control passing -r to thrift #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robbertvanginkel wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Add --thriftNoRecurse flag to control passing -r to thrift #760

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion thrift/thrift-gen/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var (
thriftBinary = flag.String("thriftBinary", "thrift", "Command to use for the Apache Thrift binary")
apacheThriftImport = flag.String("thriftImport", "github.com/apache/thrift/lib/go/thrift", "Go package to use for the Thrift import")
packagePrefix = flag.String("packagePrefix", "", "The package prefix (will be used similar to how Apache Thrift uses it)")
thriftNoRecurse = flag.Bool("thriftNoRecurse", false, "Indicates if thrift should not generate included files (-r flag)")
)

func execCmd(name string, args ...string) error {
Expand Down Expand Up @@ -78,7 +79,13 @@ func runThrift(inFile string, outDir string) error {

// Generate the Apache Thrift generated code.
goArgs := fmt.Sprintf("go:thrift_import=%s,package_prefix=%s", *apacheThriftImport, *packagePrefix)
if err := execThrift("-r", "--gen", goArgs, "-out", outDir, inFile); err != nil {
args := []string{
"--gen", goArgs, "-out", outDir, inFile,
}
if !*thriftNoRecurse {
args = append(args, "-r")
}
if err := execThrift(args...); err != nil {
return fmt.Errorf("thrift compile failed: %v", err)
}

Expand Down