core tool buildDesktop detects presence of a cmd directory and builds…

… in there. Fixes #1381
cogentcore · Dec 18, 2024 · b09ad07 · b09ad07
1 parent 80c6bef
commit b09ad07
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/cmd/core/cmd/build.go b/cmd/core/cmd/build.go
@@ -78,9 +78,21 @@ func buildDesktop(c *config.Config, platform config.Platform) error {
 		}
 	}
 	ldflags += " " + config.LinkerFlags(c)
+
+	inCmd := false
+	fi, err := os.Stat("cmd")
+	if err == nil && fi.IsDir() {
+		os.Chdir("cmd")
+		inCmd = true
+	}
+
 	args = append(args, "-ldflags", ldflags, "-o", filepath.Join(c.Build.Output, output))
 
-	err := xc.Run("go", args...)
+	err = xc.Run("go", args...)
+	if inCmd {
+		os.Rename(output, filepath.Join("..", output))
+		os.Chdir("../")
+	}
 	if err != nil {
 		return fmt.Errorf("error building for platform %s/%s: %w", platform.OS, platform.Arch, err)
 	}