implement genpkg sub command

Author: tsingbx

cmd/internal/base/base.go

@@ -100,30 +100,14 @@ func (c *Command) Runnable() bool {
 	return c.Run != nil
 }
 
-// Usage is the usage-reporting function, filled in by package main
-// but here for reference by other packages.
-//
-// flag.Usage func()
-
-// CmdName - "build", "install", "list", "mod tidy", etc.
-var CmdName string
-
-// Main runs a command.
-func Main(c *Command, app string, args []string) {
-	name := c.UsageLine
-	if i := strings.Index(name, " ["); i >= 0 {
-		c.UsageLine = app + name[i:]
-	}
-	c.Run(c, args)
-}
-
-func RunCmdWithName(cmd *Command, args []string, name string) {
+func RunCmdWithName(cmd *Command, args []string, name string, out *io.PipeWriter) {
 	err := cmd.Flag.Parse(args)
-	check(err)
+	Check(err)
 
 	cfgFile := config.LLCPPG_CFG
+
 	bytesOfConf, err := config.MarshalConfigFile(cfgFile)
-	check(err)
+	Check(err)
 
 	if cmd.Flag.NArg() == 0 {
 		args = append(args, "-")
@@ -132,12 +116,32 @@ func RunCmdWithName(cmd *Command, args []string, name string) {
 	nameCmd := exec.Command(name, args...)
 	nameCmd.Stdin = bytes.NewReader(bytesOfConf)
 	nameCmd.Stdout = os.Stdout
+	if out != nil {
+		nameCmd.Stdout = out
+	}
 	nameCmd.Stderr = os.Stderr
 	nameCmd.Run()
 }
 
-func check(err error) {
+func Check(err error) {
 	if err != nil {
 		panic(err)
 	}
 }
+
+// Usage is the usage-reporting function, filled in by package main
+// but here for reference by other packages.
+//
+// flag.Usage func()
+
+// CmdName - "build", "install", "list", "mod tidy", etc.
+var CmdName string
+
+// Main runs a command.
+func Main(c *Command, app string, args []string) {
+	name := c.UsageLine
+	if i := strings.Index(name, " ["); i >= 0 {
+		c.UsageLine = app + name[i:]
+	}
+	c.Run(c, args)
+}

cmd/internal/genpkg/flags.go

@@ -0,0 +1,13 @@
+package genpkg
+
+import "flag"
+
+var modulePath string
+var cfgPath string
+var verbose bool
+
+func addFlags(fs *flag.FlagSet) {
+	fs.BoolVar(&verbose, "v", false, "enable verbose output")
+	fs.StringVar(&modulePath, "mod", "", "the module path of the generated code,if not set,will not init a new module")
+	fs.StringVar(&cfgPath, "cfg", "", "the llcppg config file")
+}

cmd/internal/genpkg/genpkg.go

@@ -1,9 +1,13 @@
 package genpkg
 
 import (
-	"fmt"
+	"bytes"
+	"io"
+	"os"
+	"os/exec"
 
 	"github.com/goplus/llcppg/cmd/internal/base"
+	"github.com/goplus/llcppg/config"
 )
 
 var Cmd = &base.Command{
@@ -13,8 +17,43 @@ var Cmd = &base.Command{
 
 func init() {
 	Cmd.Run = runCmd
+	addFlags(&Cmd.Flag)
 }
 
 func runCmd(cmd *base.Command, args []string) {
-	fmt.Println("todo genpkg")
+	err := cmd.Flag.Parse(args)
+	if err != nil {
+		panic(err)
+	}
+
+	cfgFile := config.LLCPPG_CFG
+
+	config.HandleMarshalConfigFile(cfgFile, func(b []byte, err error) {
+
+		base.Check(err)
+
+		r, w := io.Pipe()
+
+		go func() {
+			defer w.Close()
+			llcppsigfetchCmdArgs := make([]string, len(args))
+			copy(llcppsigfetchCmdArgs, args)
+			if cmd.Flag.NArg() == 0 {
+				llcppsigfetchCmdArgs = append(llcppsigfetchCmdArgs, "-")
+			}
+			llcppsigfetchCmd := exec.Command("llcppsigfetch", llcppsigfetchCmdArgs...)
+			llcppsigfetchCmd.Stdin = bytes.NewReader(b)
+			llcppsigfetchCmd.Stdout = w
+			llcppsigfetchCmd.Stderr = os.Stderr
+			err = llcppsigfetchCmd.Run()
+			base.Check(err)
+		}()
+
+		gogensigCmd := exec.Command("gogensig", args...)
+		gogensigCmd.Stdin = r
+		gogensigCmd.Stdout = os.Stdout
+		gogensigCmd.Stderr = os.Stderr
+		err = gogensigCmd.Run()
+		base.Check(err)
+	})
 }

cmd/internal/gensig/gensig.go

@@ -15,5 +15,5 @@ func init() {
 }
 
 func runCmd(cmd *base.Command, args []string) {
-	base.RunCmdWithName(cmd, args, "llcppsigfetch")
+	base.RunCmdWithName(cmd, args, "llcppsigfetch", nil)
 }

cmd/internal/gensym/gensym.go

@@ -15,5 +15,5 @@ func init() {
 }
 
 func runCmd(cmd *base.Command, args []string) {
-	base.RunCmdWithName(cmd, args, "llcppsymg")
+	base.RunCmdWithName(cmd, args, "llcppsymg", nil)
 }

cmd/llcppg/genpkg_cmd.gox

@@ -6,6 +6,8 @@ use "genpkg"
 
 short "generate a go package by signature information of symbols"
 
+flagOff
+
 run args => {
 	self.Cmd.Run self.Cmd, args
 }

config/parse.go

@@ -60,3 +60,10 @@ func MarshalConfigFile(cfgFile string) ([]byte, error) {
 	}
 	return json.MarshalIndent(&conf, "", "  ")
 }
+
+func HandleMarshalConfigFile(cfgFile string, handle func(b []byte, err error)) {
+	b, err := MarshalConfigFile(cfgFile)
+	if handle != nil {
+		handle(b, err)
+	}
+}

go.mod

@@ -5,7 +5,7 @@ go 1.23.0
 require (
 	github.com/goplus/cobra v1.9.12 //gop:class
 	github.com/goplus/gogen v1.19.5
-	github.com/goplus/lib v0.3.0
+	github.com/goplus/lib v0.2.0
 	github.com/goplus/llgo v0.11.6-0.20250824004317-e4218f90d792
 	github.com/goplus/mod v0.17.1
 	github.com/qiniu/x v1.15.1

go.sum

@@ -2,8 +2,8 @@ github.com/goplus/cobra v1.9.12 h1:0F9EdEbeGyITGz+mqoHoJ5KpUw97p1CkxV74IexHw5s=
 github.com/goplus/cobra v1.9.12/go.mod h1:p4LhfNJDKEpiGjGiNn0crUXL5dUPA5DX2ztYpEJR34E=
 github.com/goplus/gogen v1.19.5 h1:YWPwpRA1PusPhptv9jKg/XiN+AQGiAD9r6I86mJ3lR4=
 github.com/goplus/gogen v1.19.5/go.mod h1:owX2e1EyU5WD+Nm6oH2m/GXjLdlBYcwkLO4wN8HHXZI=
-github.com/goplus/lib v0.3.0 h1:y0ZGb5Q/RikW1oMMB4Di7XIZIpuzh/7mlrR8HNbxXCA=
-github.com/goplus/lib v0.3.0/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0=
+github.com/goplus/lib v0.2.0 h1:AjqkN1XK5H23wZMMlpaUYAMCDAdSBQ2NMFrLtSh7W4g=
+github.com/goplus/lib v0.2.0/go.mod h1:SgJv3oPqLLHCu0gcL46ejOP3x7/2ry2Jtxu7ta32kp0=
 github.com/goplus/llgo v0.11.6-0.20250824004317-e4218f90d792 h1:EbF48QxuTaklX5MPwSuskZhu+dI9CHDIPW9S05uyhsM=
 github.com/goplus/llgo v0.11.6-0.20250824004317-e4218f90d792/go.mod h1:GeJLuuvv1yU+XBX+45SITayPgj7tsHVntEY+LEFPx+I=
 github.com/goplus/mod v0.17.1 h1:ITovxDcc5zbURV/Wrp3/SBsYLgC1KrxY6pq1zMM2V94=