From ec11efc34763260e7c93f883ebb7b6ceb502dfb2 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 22 Feb 2025 07:59:19 -0600 Subject: minor rearrange --- debugger.go | 2 -- doHowto.go | 85 ------------------------------------------------ main.go | 1 + windowHowto.go | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 87 deletions(-) delete mode 100644 doHowto.go create mode 100644 windowHowto.go diff --git a/debugger.go b/debugger.go index 6481e5d..f7a6aca 100644 --- a/debugger.go +++ b/debugger.go @@ -5,13 +5,11 @@ package main */ import ( - "go.wit.com/gui" "go.wit.com/lib/debugger" "go.wit.com/log" ) func init() { - gui.InitArg() if debugger.ArgDebug() { log.Info("cmd line --debugger == true") go func() { diff --git a/doHowto.go b/doHowto.go deleted file mode 100644 index f9d220d..0000000 --- a/doHowto.go +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright 2017-2025 WIT.COM Inc. All rights reserved. -// Use of this source code is governed by the GPL 3.0 - -package main - -// An app to submit patches for the 30 GO GUI repos - -import ( - "go.wit.com/lib/fhelp" - "go.wit.com/lib/gui/shell" - "go.wit.com/log" -) - -func makeHowtoWin() *genericWindow { - howtoWin := initGenericWindow("Howto", "forge -- a GUI tool for git repostories") - tmp := `A good way to see how forge works is to download forge - - This will 'git clone' a few things (~50 repos): - ` - howtoWin.group.NewLabel(tmp) - grid := howtoWin.group.RawGrid() - grid.NewLabel("forge") - grid.NewLabel("the sources for forge") - grid.NextRow() - - grid.NewLabel("autogenpb") - grid.NewLabel("generates needed code for working with the protobuf files") - grid.NextRow() - - grid.NewLabel("go-clone") - grid.NewLabel("recursively 'git clone' dependencies based on go.mod") - grid.NextRow() - - grid.NewLabel("the GUI") - grid.NewLabel("GO plugins for libcurses and GTK") - grid.NextRow() - - grid.NewLabel("") // a stupid way to add padding - grid.NextRow() - - howtoWin.group.NewLabel("Working dir: " + me.forge.GetGoSrc()) - grid = howtoWin.group.RawGrid() - grid.NewButton("Download", func() { - howtoWin.Disable() - defer howtoWin.Enable() - log.Info("download here") - if path, err := fhelp.CheckCmd("go-clone"); err != nil { - log.Info("go-clone missing", path, err) - cmd := []string{"go", "install", "go.wit.com/apps/go-clone@latest"} - shell.RunRealtime(cmd) - } - if path, err := fhelp.CheckCmd("go-clone2"); err != nil { - log.Info("go-clone2 missing", path, err) - } - if path, err := fhelp.CheckCmd("go-clone"); err != nil { - log.Info("can't prep build. you probably need ~/go/bin in your PATH", path, err) - return - } - var cmd []string - if me.forge.IsGoWork() { - cmd = []string{"go-clone", "--work", "--recursive"} - } else { - cmd = []string{"go-clone", "--recursive"} - } - log.Info("Running:", cmd) - shell.RunRealtime(cmd) - - cmd = []string{"go-clone", "--recursive", "go.wit.com/apps/go-mod-clean"} - log.Info("Running:", cmd) - shell.RunRealtime(cmd) - - cmd = []string{"go-clone", "--recursive", "go.wit.com/apps/forge"} - log.Info("Running:", cmd) - shell.RunRealtime(cmd) - - cmd = []string{"go-clone", "--recursive", "go.wit.com/toolkits/gocui"} - log.Info("Running:", cmd) - shell.RunRealtime(cmd) - - cmd = []string{"go-clone", "--recursive", "go.wit.com/toolkits/andlabs"} - log.Info("Running:", cmd) - shell.RunRealtime(cmd) - }) - return howtoWin -} diff --git a/main.go b/main.go index bc1092b..dcb5803 100644 --- a/main.go +++ b/main.go @@ -43,6 +43,7 @@ func getVersion(repo *gitpb.Repo, name string) string { func main() { me = new(mainType) + gui.InitArg() me.pp = arg.MustParse(&argv) if argv.Bash { diff --git a/windowHowto.go b/windowHowto.go new file mode 100644 index 0000000..31b07a0 --- /dev/null +++ b/windowHowto.go @@ -0,0 +1,101 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + +package main + +// An app to submit patches for the 30 GO GUI repos + +import ( + "go.wit.com/lib/fhelp" + "go.wit.com/lib/gui/shell" + "go.wit.com/log" +) + +func makeHowtoWin() *genericWindow { + howtoWin := initGenericWindow("Howto", "forge -- a GUI tool for git repostories") + tmp := `A good way to see how forge works is to download forge + + This will 'git clone' a few things (~50 repos): + ` + howtoWin.group.NewLabel(tmp) + grid := howtoWin.group.RawGrid() + grid.NewLabel("forge") + grid.NewLabel("the sources for forge") + grid.NextRow() + + grid.NewLabel("autogenpb") + grid.NewLabel("generates needed code for working with the protobuf files") + grid.NextRow() + + grid.NewLabel("go-clone") + grid.NewLabel("recursively 'git clone' dependencies based on go.mod") + grid.NextRow() + + grid.NewLabel("the GUI") + grid.NewLabel("GO plugins for libcurses and GTK") + grid.NextRow() + + grid.NewLabel("") // a stupid way to add padding + grid.NextRow() + + howtoWin.group.NewLabel("Working dir: " + me.forge.GetGoSrc()) + grid = howtoWin.group.RawGrid() + grid.NewButton("Download", func() { + howtoWin.Disable() + defer howtoWin.Enable() + log.Info("download here") + if path, err := fhelp.CheckCmd("go-clone"); err != nil { + log.Info("go-clone missing", path, err) + cmd := []string{"go", "install", "go.wit.com/apps/go-clone@latest"} + shell.RunRealtime(cmd) + } + if _, err := fhelp.CheckCmd("autogenpb"); err != nil { + cmd := []string{"go", "install", "go.wit.com/apps/autogenpb@latest"} + shell.RunRealtime(cmd) + } + if _, err := fhelp.CheckCmd("go-mod-clean"); err != nil { + cmd := []string{"go", "install", "go.wit.com/apps/go-mod-clean@latest"} + shell.RunRealtime(cmd) + } + if path, err := fhelp.CheckCmd("go-clone"); err != nil { + log.Info("can't prep build. you probably need ~/go/bin in your PATH", path, err) + return + } + var basecmd []string + var cmd []string + if me.forge.IsGoWork() { + log.Info("NOT GO WORK") + basecmd = []string{"go-clone", "--work", "--recursive"} + } else { + log.Info("IS GO WORK") + basecmd = []string{"go-clone", "--recursive"} + } + // log.Info("Running:", cmd) + // shell.RunRealtime(cmd) + + cmd = append(basecmd, "go.wit.com/apps/go-mod-clean") + log.Info("Running:", cmd) + shell.RunRealtime(cmd) + + cmd = append(basecmd, "go.wit.com/apps/forge") + log.Info("Running:", cmd) + shell.RunRealtime(cmd) + + cmd = append(basecmd, "go.wit.com/toolkits/gocui") + log.Info("Running:", cmd) + shell.RunRealtime(cmd) + + cmd = append(basecmd, "go.wit.com/toolkits/andlabs") + log.Info("Running:", cmd) + shell.RunRealtime(cmd) + + // should, after go-clone, be able to go build + /* + repo := me.forge.FindByGoPath("go.wit.com/lib/proto/forgepb") + if repo != nil { + repo.RunVerbose([]string{"autogenpb"}) + } + */ + }) + return howtoWin +} -- cgit v1.2.3