This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9562ad7b95d09119933740fe0bc7d90975e53286 Author: David Jencks <[email protected]> AuthorDate: Thu Apr 30 09:51:16 2020 -0700 traits generation changes --- cmd/util/doc-gen/generators/traitdocgen.go | 33 ++---------------------------- cmd/util/doc-gen/main.go | 4 ++-- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/cmd/util/doc-gen/generators/traitdocgen.go b/cmd/util/doc-gen/generators/traitdocgen.go index f09f641..2d0bd7e 100644 --- a/cmd/util/doc-gen/generators/traitdocgen.go +++ b/cmd/util/doc-gen/generators/traitdocgen.go @@ -110,10 +110,7 @@ func (g *traitDocGen) GenerateType(context *generator.Context, t *types.Type, ou } func (g *traitDocGen) Finalize(c *generator.Context, w io.Writer) error { - if err := g.FinalizeNav(c); err != nil { - return err - } - return g.FinalizeList(c) + return g.FinalizeNav(c) } func (g *traitDocGen) FinalizeNav(*generator.Context) error { @@ -134,7 +131,7 @@ func (g *traitDocGen) FinalizeNav(*generator.Context) error { sort.Strings(g.generatedTraitFiles) for _, t := range g.generatedTraitFiles { name := traitNameFromFile(t) - content = append(content, "** xref:traits/"+t+"["+name+"]") + content = append(content, "** xref:traits:"+t+"["+name+"]") } content = append(content, adocNavMarkerEnd) content = append(content, post...) @@ -142,32 +139,6 @@ func (g *traitDocGen) FinalizeNav(*generator.Context) error { return writeFile(file, content) } -func (g *traitDocGen) FinalizeList(*generator.Context) error { - docDir := g.arguments.CustomArgs.(*CustomArgs).DocDir - listPath := g.arguments.CustomArgs.(*CustomArgs).ListPath - filename := path.Join(docDir, listPath) - - file, content, err := readFile(filename) - if err != nil { - return err - } - defer file.Close() - - pre, post := split(content, adocListMarkerStart, adocListMarkerEnd) - - content = append([]string(nil), pre...) - content = append(content, adocListMarkerStart) - sort.Strings(g.generatedTraitFiles) - for _, t := range g.generatedTraitFiles { - name := traitNameFromFile(t) - content = append(content, "* xref:traits/"+t+"["+name+" Trait]") - } - content = append(content, adocListMarkerEnd) - content = append(content, post...) - - return writeFile(file, content) -} - func traitNameFromFile(file string) string { name := strings.TrimSuffix(file, ".adoc") name = strings.ReplaceAll(name, "trait", "") diff --git a/cmd/util/doc-gen/main.go b/cmd/util/doc-gen/main.go index 84e7515..2b56b9a 100644 --- a/cmd/util/doc-gen/main.go +++ b/cmd/util/doc-gen/main.go @@ -32,9 +32,9 @@ func main() { customArgs := &generators.CustomArgs{} pflag.CommandLine.StringVar(&customArgs.DocDir, "doc-dir", "./docs", "Root of the document directory.") pflag.CommandLine.StringVar(&customArgs.DeployDir, "deploy-dir", "./deploy", "Root of the deploy directory.") - pflag.CommandLine.StringVar(&customArgs.TraitPath, "traits-path", "modules/ROOT/pages/traits", "Path to the traits directory.") + pflag.CommandLine.StringVar(&customArgs.TraitPath, "traits-path", "modules/traits/pages", "Path to the traits directory.") pflag.CommandLine.StringVar(&customArgs.NavPath, "nav-path", "modules/ROOT/nav.adoc", "Path to the navigation file.") - pflag.CommandLine.StringVar(&customArgs.ListPath, "list-path", "modules/ROOT/pages/traits/traits.adoc", "Path to the trait list file.") + pflag.CommandLine.StringVar(&customArgs.ListPath, "list-path", "modules/traits/pages/traits.adoc", "Path to the trait list file.") arguments.CustomArgs = customArgs if err := arguments.Execute(
