c2go -run

c2go.go

@@ -60,7 +60,8 @@ func isFile(name string) bool {
 }
 
 type Config struct {
-	Select string
+	SelectFile string
+	SelectCmd  string
 }
 
 func Run(pkgname, infile string, flags int, conf *Config) {

cmd/c2go/impl/c2go.go

@@ -30,7 +30,8 @@ func Main(flag *flag.FlagSet, args []string) {
 		json       = flag.Bool("json", false, "dump C AST to a file in json format")
 		test       = flag.Bool("test", false, "run test")
 		testmain   = flag.Bool("testmain", false, "generate TestMain as entry instead of main (only for cmd/test_xxx)")
-		sel        = flag.String("sel", "", "select a file (only available in project mode)")
+		runcmd     = flag.String("run", "", "select a command to run (only available in project mode)")
+		selfile    = flag.String("sel", "", "select a file (only available in project mode)")
 	)
 	flag.Parse(args)
 	var pkgname, infile string
@@ -50,7 +51,7 @@ func Main(flag *flag.FlagSet, args []string) {
 		preprocessor.SetDebug(preprocessor.DbgFlagAll)
 		gox.SetDebug(gox.DbgFlagInstruction) // | gox.DbgFlagMatch)
 	}
-	if *test {
+	if *test || *runcmd != "" {
 		flags |= c2go.FlagRunTest
 	}
 	if *testmain {
@@ -68,9 +69,9 @@ func Main(flag *flag.FlagSet, args []string) {
 	if *json {
 		flags |= c2go.FlagDumpJson
 	}
-	var conf *c2go.Config
-	if *sel != "" {
-		conf = &c2go.Config{Select: *sel}
+	conf := &c2go.Config{
+		SelectFile: *selfile,
+		SelectCmd:  *runcmd,
 	}
 	c2go.Run(pkgname, infile, flags, conf)
 }

proj.go

@@ -109,8 +109,8 @@ func execProj(projfile string, flags int, in *Config) {
 		conf.public, err = cpackages.ReadPubFile(pubfile)
 		check(err)
 
-		if in != nil && in.Select != "" {
-			execProjFile(canonical(base, in.Select), &conf, appFlags)
+		if in != nil && in.SelectFile != "" {
+			execProjFile(canonical(base, in.SelectFile), &conf, appFlags)
 			return
 		}
 		execProjSource(base, appFlags, &conf)
@@ -121,7 +121,14 @@ func execProj(projfile string, flags int, in *Config) {
 	if cmds := conf.Target.Cmds; len(cmds) != 0 {
 		conf.Target.Cmds = nil
 		conf.public = nil
+		cmdSel := ""
+		if in != nil {
+			cmdSel = in.SelectCmd
+		}
 		for _, cmd := range cmds {
+			if cmdSel != "" && cmd.Dir != cmdSel {
+				continue
+			}
 			conf.Target.Name = "main"
 			appFlags := flags
 			if (flags & FlagTestMain) != 0 {