Consolidate Makefile, flatten zwgen

Author: lukescott

Makefile

@@ -1,6 +1,7 @@
 .PHONY: test
 
 generate:
+	go generate ./gen
 	go generate ./cc
 
 interceptty:

cc/command-classes.go

@@ -7,9 +7,9 @@ import (
 	"sync"
 )
 
-//go:generate zwgen command-classes -c zwgen.config.yaml -o .
-//go:generate zwgen parser -c zwgen.config.yaml -o ./command-classes.gen.go
-//go:generate zwgen devices -c zwgen.config.yaml -o ./devices.gen.go
+//go:generate go run ../gen/main.go command-classes -c gen.config.yaml -o .
+//go:generate go run ../gen/main.go parser -c gen.config.yaml -o ./command-classes.gen.go
+//go:generate go run ../gen/main.go devices -c gen.config.yaml -o ./devices.gen.go
 
 type (
 	CommandClassID byte

cc/zwgen.config.yaml cc/gen.config.yamlcc/zwgen.config.yaml renamed to cc/gen.config.yaml

@@ -5,4 +5,3 @@
 ### Command Class User Code
 
 - `USER_CODE` param is listed as an `ARRAY`, but `VARIANT` matches the documentation.
-

zwgen/zwgen/data/NOTES.md gen/NOTES.mdzwgen/zwgen/data/NOTES.md renamed to gen/NOTES.md

@@ -1,4 +1,4 @@
-package zwgen
+package gen
 
 import (
 	"bytes"
@@ -16,7 +16,7 @@ import (
 	"golang.org/x/tools/imports"
 )
 
-//go:generate go-bindata -pkg=zwgen templates/... data/...
+//go:generate go-bindata -pkg=gen templates/... data/...
 
 type Generator struct {
 	output    string

zwgen/zwgen/bindata.go gen/bindata.gozwgen/zwgen/bindata.go renamed to gen/bindata.go

@@ -1,4 +1,4 @@
-package zwgen
+package gen
 
 import (
 	"regexp"

zwgen/zwgen/data/zwave-defs.xml gen/data/zwave-defs.xmlzwgen/zwgen/data/zwave-defs.xml renamed to gen/data/zwave-defs.xml

@@ -1,3 +1,5 @@
+// +build ignore
+
 package main
 
 import (
@@ -6,13 +8,13 @@ import (
 	"os"
 
 	"github.com/codegangsta/cli"
-	"github.com/gozwave/gozw/zwgen/zwgen"
+	"github.com/gozwave/gozw/gen"
 )
 
 func main() {
 
 	app := cli.NewApp()
-	app.Name = "zwgen"
+	app.Name = ""
 	app.Usage = "Generate code for the Z-Wave protocol"
 
 	before := func(c *cli.Context) error {
@@ -45,7 +47,7 @@ func main() {
 			},
 			Before: before,
 			Action: func(ctx *cli.Context) {
-				gen, err := zwgen.NewGenerator(ctx.String("output"), ctx.String("config"))
+				gen, err := gen.NewGenerator(ctx.String("output"), ctx.String("config"))
 				if err != nil {
 					fmt.Println(err)
 					os.Exit(1)
@@ -73,7 +75,7 @@ func main() {
 			},
 			Before: before,
 			Action: func(ctx *cli.Context) {
-				gen, err := zwgen.NewGenerator(ctx.String("output"), ctx.String("config"))
+				gen, err := gen.NewGenerator(ctx.String("output"), ctx.String("config"))
 				if err != nil {
 					fmt.Println(err)
 					os.Exit(1)
@@ -102,7 +104,7 @@ func main() {
 			},
 			Before: before,
 			Action: func(ctx *cli.Context) {
-				gen, err := zwgen.NewGenerator(ctx.String("output"), ctx.String("config"))
+				gen, err := gen.NewGenerator(ctx.String("output"), ctx.String("config"))
 				if err != nil {
 					fmt.Println(err)
 					os.Exit(1)

zwgen/zwgen/generator.go gen/generator.gozwgen/zwgen/generator.go renamed to gen/generator.go

@@ -1,4 +1,4 @@
-package zwgen
+package gen
 
 type ArrayAttrib struct {
 	Key     string `xml:"key,attr"`