fix build

Makefile

@@ -8,6 +8,10 @@ go-build: goimports
 	GO111MODULE=off go build \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
+verbose:
+	GO111MODULE=off go build -v -x \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
 install: goimports
 	GO111MODULE=off go install \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
@@ -36,6 +40,17 @@ check-git-clean:
 old-debian-release: install
 	wit-test debian --dry-run --verbose --release
 
+debian-release: install
+	forge dirty
+	rm -f ~/incoming/*.deb
+	rm -f ~/go/lib/go-gui/*
+	forge --install go.wit.com/apps/go-deb
+	go-deb -h # check to make sure go-deb builds
+	wit-test debian --verbose
+	ls -hl ~/incoming/
+	do-aptly
+	rm -f ~/go/bin/forged # causes bash completion annoyances
+
 debian-release-force: install
 	forge dirty
 	rm -f ~/incoming/*.deb
@@ -44,8 +59,9 @@ debian-release-force: install
 	go-deb -h # check to make sure go-deb builds
 	wit-test debian --force --verbose
 	ls -hl ~/incoming/
-	dpkg-deb -c ~/incoming/go-gui-toolkits*.deb
+	-dpkg-deb -c ~/incoming/go-gui-toolkits*.deb
 	do-aptly
+	rm -f ~/go/bin/forged # causes bash completion annoyances
 
 debian-release-build-only: install
 	wit-test debian --verbose --release

argv.go

@@ -9,6 +9,9 @@ package main
 */
 
 import (
+	"fmt"
+	"os"
+
 	"go.wit.com/lib/debugger"
 	"go.wit.com/lib/gui/logsettings"
 	"go.wit.com/log"
@@ -19,8 +22,10 @@ var argv args
 type args struct {
 	TestBuild   *EmptyCmd `arg:"subcommand:build"              help:"try appropriate 'go build'"`
 	DebBuild    *EmptyCmd `arg:"subcommand:debian"             help:"build missing .deb packages"`
+	MacBuild    *EmptyCmd `arg:"subcommand:macos"              help:"build macos packages"`
 	MakeInstall *EmptyCmd `arg:"subcommand:install"            help:"run make install in each repo"`
 	ListPkgs    *EmptyCmd `arg:"subcommand:list"               help:"list all the packages on mirrors.wit.com"`
+	Test        *EmptyCmd `arg:"subcommand:test"               help:"test build everything first"`
 	Clone       *EmptyCmd `arg:"subcommand:repomap-clone"      help:"go-clone from a gowebd repomap"`
 	Upgrade     *EmptyCmd `arg:"subcommand:upgrade"            help:"apt upgrade packages installed from mirrors.wit.com"`
 	RepoMap     string    `arg:"--repomap"                     help:"location of the repomap"`
@@ -29,10 +34,8 @@ type args struct {
 	Verbose     bool      `arg:"--verbose"                     help:"be loud about it"`
 	Force       bool      `arg:"--force"                       help:"rebuild everything"`
 	Recursive   bool      `arg:"--recursive"                   help:"go-clone --recursive"`
-	Test        bool      `arg:"--test"                        help:"test build after everything else"`
 	WITCOM      bool      `arg:"--witcom"                      help:"add the GPL header"`
-	Bash        bool      `arg:"--bash"                        help:"generate bash completion"`
+	Max         int32     `arg:"--max"                         help:"stop building after max builds"`
-	BashAuto    []string  `arg:"--auto-complete"               help:"does the actual autocompletion"`
 }
 
 type EmptyCmd struct {
@@ -60,3 +63,30 @@ func init() {
 func (args) Version() string {
 	return "wit-test " + VERSION + "    Built on " + BUILDTIME
 }
+
+/*
+	handles shell autocomplete
+*/
+
+func (a args) DoAutoComplete(argv []string) {
+	switch argv[0] {
+	case "list":
+		fmt.Println("--all --mine --favorites --private")
+	case "debian":
+		fmt.Println("--dry-run --force --release --verbose macos --max")
+	case "upgrade":
+		fmt.Println("--dry-run")
+	case "build":
+		fmt.Println("--verbose --force")
+	case "install":
+		fmt.Println("--verbose")
+	case "repomap-clone":
+		fmt.Println("--repomap")
+	default:
+		if argv[0] == ARGNAME {
+			// list the subcommands here
+			fmt.Println("--bash list build debian install repomap-clone upgrade")
+		}
+	}
+	os.Exit(0)
+}

argvAutocomplete.go

@@ -1,94 +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
-
-import (
-	"fmt"
-	"os"
-	"strings"
-)
-
-/*
-	handles shell autocomplete
-*/
-
-// used for shell auto completion
-var ARGNAME string = "wit-test" // todo: get this from $0 ?
-
-func (args) doBashAuto() {
-	argv.doBashHelp()
-	switch argv.BashAuto[0] {
-	case "list":
-		fmt.Println("--all --mine --favorites --private")
-	case "debian":
-		fmt.Println("--dry-run")
-	case "upgrade":
-		fmt.Println("--dry-run")
-	case "build":
-		fmt.Println("--verbose")
-	case "install":
-		fmt.Println("--verbose")
-	case "repomap-clone":
-		fmt.Println("--repomap")
-	default:
-		if strings.HasSuffix(argv.BashAuto[0], ARGNAME) {
-			// list the subcommands here
-			fmt.Println("--bash list build debian install repomap-clone upgrade")
-		}
-	}
-	os.Exit(0)
-}
-
-// prints help to STDERR // TODO: move everything below this to go-args
-func (args) doBashHelp() {
-	if argv.BashAuto[1] != "''" {
-		// if this is not blank, then the user has typed something
-		return
-	}
-	if argv.BashAuto[0] != ARGNAME {
-		// if this is not the name of the command, the user already started doing something
-		return
-	}
-	if argv.BashAuto[0] == ARGNAME {
-		// me.argpp.WriteHelp(os.Stderr)
-		// return
-	}
-	fmt.Fprintln(os.Stderr, "")
-	fmt.Fprintln(os.Stderr, "list:           show every package on mirrors.wit.com")
-	fmt.Fprintln(os.Stderr, "build:          go build every package that identifies as a binary")
-	fmt.Fprintln(os.Stderr, "install:        go install every package into ~/go/bin")
-	fmt.Fprintln(os.Stderr, "repomap-clone:  go-clone every package from a gowebd repomap")
-	fmt.Fprintln(os.Stderr, "")
-}
-
-// complete -F forge --bash forge
-func (args) doBash() {
-	fmt.Println("# add this in your bashrc:")
-	fmt.Println("")
-	fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash")
-	fmt.Println("#")
-	fmt.Println("# todo: make this output work/parse with:")
-	fmt.Println("# complete -C " + ARGNAME + " --bash go")
-	fmt.Println("")
-	fmt.Println("_" + ARGNAME + "_complete()")
-	fmt.Println("{")
-	fmt.Println("	# sets local to this func vars")
-	fmt.Println("	local cur prev all")
-	fmt.Println("	cur=${COMP_WORDS[COMP_CWORD]}")
-	fmt.Println("	prev=${COMP_WORDS[COMP_CWORD-1]}")
-	fmt.Println("	all=${COMP_WORDS[@]}")
-	fmt.Println("")
-	fmt.Println("	# this is where we generate the go-arg output")
-	fmt.Println("        GOARGS=$(" + ARGNAME + " --auto-complete $prev \\'$cur\\' $all)")
-	fmt.Println("")
-	fmt.Println("	# this compares the command line input from the user")
-	fmt.Println("	# to whatever strings we output")
-	fmt.Println("        COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) )  # THIS WORKS")
-	fmt.Println("	return 0")
-	fmt.Println("}")
-	fmt.Println("complete -F _" + ARGNAME + "_complete " + ARGNAME)
-	fmt.Println("")
-	fmt.Println("# copy and paste the above into your bash shell should work")
-	os.Exit(0)
-}

doAptUpgrade.go

@@ -22,14 +22,16 @@ func doAptUpgrade() {
 	}
 
 	fmt.Println("Installed Packages:")
-	loop := me.forge.Machine.Wit.SortByName()
+	loop := me.machine.Wit.SortByName()
 	for loop.Scan() {
 		p := loop.Next()
 		// log.Info("apt install", name)
-		if me.forge.Machine.IsInstalled(p.Name) {
+		if me.machine.IsInstalled(p.Name) {
+			cmd := []string{"apt", "install", p.Name}
 			if argv.DryRun {
-				log.Info("--dry-run", []string{"apt", "install", p.Name})
+				log.Info("--dry-run", cmd)
 			} else {
+				log.Info("Running:", cmd)
 				shell.RunRealtime([]string{"apt", "install", p.Name})
 			}
 		}
@@ -41,7 +43,7 @@ func doAptList() {
 	log.DaemonMode(true)
 	defer log.DaemonMode(false)
 	fmt.Println("Installed Packages:")
-	loop := me.forge.Machine.Wit.SortByName()
+	loop := me.machine.Wit.SortByName()
 	for loop.Scan() {
 		p := loop.Next()
 		var end string
@@ -49,12 +51,12 @@ func doAptList() {
 		if me.forge.Config.IsPrivate(p.Name) {
 			end += "(private) "
 		}
-		if actualp := me.forge.Machine.FindVersion(p.Name, p.Version); actualp != nil {
+		if actualp := me.machine.FindByVersion(p.Name, p.Version); actualp != nil {
 			// end += "(version match) "
 		} else {
 			end += "(version mismatch) " + actualp.Version + " " + version + " "
 		}
-		if actualp := me.forge.Machine.FindInstalledByName(p.Name); actualp != nil {
+		if actualp := me.machine.FindInstalledByName(p.Name); actualp != nil {
 			if p.Version != actualp.Version {
 				end += "(installed " + actualp.Version + " vs " + p.Version + ") "
 			} else {

doDebian.go

@@ -15,10 +15,17 @@ func buildDeb() {
 	log.DaemonMode(true)
 	defer log.DaemonMode(false)
 
+	if argv.Test != nil {
 		if err := doInstall(); err != nil {
 			log.Info("doInstall() failed", err)
 			badExit(err)
 		}
+	}
+
+	var counter int
+	if int(argv.Max) == 0 {
+		argv.Max = 50
+	}
 
 	all := me.forge.Repos.SortByFullPath()
 	for all.Scan() {
@@ -41,12 +48,12 @@ func buildDeb() {
 		}
 
 		if argv.Release {
-			cmd = []string{"go-deb", "--release", "--no-gui", "--auto", "--forge", check.GetGoPath(), "--dir", outdir}
+			cmd = []string{"go-deb", "--release", "--dir", outdir}
 		} else {
-			cmd = []string{"go-deb", "--auto", "--no-gui", "--forge", check.GetGoPath(), "--dir", outdir}
+			cmd = []string{"go-deb", "--dir", outdir}
 		}
 		if me.forge.Config.IsPrivate(check.GetGoPath()) {
-			cmd = []string{"go-deb", "--auto", "--no-gui", "--forge", check.GetGoPath(), "--dir", outdir}
+			cmd = []string{"go-deb", "--dir", outdir}
 			continue
 		}
 
@@ -67,6 +74,27 @@ func buildDeb() {
 			}
 		}
 
+		counter += 1
+
+		if counter > int(argv.Max) {
+			log.Info("did --max builds", argv.Max)
+			okExit("")
+		}
+
+		/*
+			build-darwin:
+				GOOS=darwin GOARCH=amd64 GO111MODULE=off go build -v -o go-clone-darwin.x86 \
+					-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+			build-darwin-arm64:
+				GOOS=darwin GOARCH=arm64 GO111MODULE=off go build -v -o go-clone-darwin.arm \
+					-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+		*/
+		if argv.MacBuild != nil {
+			log.Info("todo: add mac builds")
+			continue
+		}
+
 		/*
 			_, err := os.Stat(filepath.Join(outdir, debnames[check]))
 			if err == nil {
@@ -79,6 +107,7 @@ func buildDeb() {
 		*/
 
 		if err := check.RunVerbose(cmd); err != nil {
+			log.Info(check.FullPath, cmd)
 			failed[check] = fmt.Sprint("godeb failed", cmd, "with", err)
 			badExit(err)
 		} else {

doInstall.go

@@ -41,10 +41,10 @@ func doInstall() error {
 		ver := trimNonNumericFromStart(manufactured)
 		name := me.forge.Config.DebName(check.GetGoPath())
 		var realver string
-		if installedPackage := me.forge.Machine.FindInstalledByName(name); installedPackage != nil {
+		if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil {
 			realver = installedPackage.Version
 		}
-		if actualp := me.forge.Machine.FindVersion(name, ver); actualp != nil {
+		if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
 			end += " (version match) " + actualp.Version + " " + ver + " "
 			state[check] = "on mirrors"
 		} else {
@@ -53,8 +53,8 @@ func doInstall() error {
 			}
 			// end += "" + ver + " "
 		}
-		if me.forge.Machine.IsInstalled(name) {
+		if me.machine.IsInstalled(name) {
-			if actualp := me.forge.Machine.FindInstalledByName(name); actualp != nil {
+			if actualp := me.machine.FindInstalledByName(name); actualp != nil {
 				if ver != actualp.Version {
 					end += "(installed " + actualp.Version + ") "
 				} else {

doListRepos.go

@@ -40,10 +40,10 @@ func doListRepos() {
 		ver := trimNonNumericFromStart(manufactured)
 		name := me.forge.Config.DebName(check.GetGoPath())
 		var realver string
-		if installedPackage := me.forge.Machine.FindInstalledByName(name); installedPackage != nil {
+		if installedPackage := me.machine.FindInstalledByName(name); installedPackage != nil {
 			realver = installedPackage.Version
 		}
-		if actualp := me.forge.Machine.FindVersion(name, ver); actualp != nil {
+		if actualp := me.machine.FindByVersion(name, ver); actualp != nil {
 			end += " (version match) " + actualp.Version + " " + ver + " "
 			state[check] = "on mirrors"
 		} else {
@@ -52,8 +52,8 @@ func doListRepos() {
 			}
 			// end += "" + ver + " "
 		}
-		if me.forge.Machine.IsInstalled(name) {
+		if me.machine.IsInstalled(name) {
-			if actualp := me.forge.Machine.FindInstalledByName(name); actualp != nil {
+			if actualp := me.machine.FindInstalledByName(name); actualp != nil {
 				if ver != actualp.Version {
 					end += "(installed " + actualp.Version + ") "
 				} else {

main.go

@@ -11,10 +11,10 @@ import (
 	"unicode"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/gui"
+	"go.wit.com/lib/gui/prep"
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
+	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
 
@@ -22,33 +22,28 @@ import (
 var VERSION string
 var BUILDTIME string
 
+// used for shell auto completion
+var ARGNAME string = "wit-test" // todo: get this from $0 ?
+
 var failed map[*gitpb.Repo]string
 var state map[*gitpb.Repo]string
 var debnames map[*gitpb.Repo]string
 
 func main() {
 	me = new(autoType)
+	prep.Bash(ARGNAME, argv.DoAutoComplete) // todo: this line should be:  prep.Bash(argv)
+	// me.myGui = prep.Gui()                   // prepares the GUI package for go-args
 	me.argpp = arg.MustParse(&argv)
 
-	if argv.Bash {
-		argv.doBash()
-		os.Exit(0)
-	}
-	if len(argv.BashAuto) != 0 {
-		argv.doBashAuto()
-		os.Exit(0)
-	}
 	dumpDebug()
 
 	failed = make(map[*gitpb.Repo]string)
 	state = make(map[*gitpb.Repo]string)
 	debnames = make(map[*gitpb.Repo]string)
 
-	// load the ~/.config/forge/ config
 	me.forge = forgepb.Init()
 
-	me.myGui = gui.New()
+	me.machine, _ = zoopb.InitMachine()
-	me.myGui.Default()
 
 	if argv.Clone != nil {
 		if argv.RepoMap != "" {
@@ -71,7 +66,7 @@ func main() {
 		log.DaemonMode(true)
 		defer log.DaemonMode(false)
 		fmt.Println("Installed Packages:")
-		loop := me.forge.Machine.Wit.SortByName()
+		loop := me.machine.Wit.SortByName()
 		for loop.Scan() {
 			p := loop.Next()
 			var end string
@@ -79,12 +74,12 @@ func main() {
 			if me.forge.Config.IsPrivate(p.Name) {
 				end += "(private) "
 			}
-			if actualp := me.forge.Machine.FindVersion(p.Name, p.Version); actualp != nil {
+			if actualp := me.machine.FindByVersion(p.Name, p.Version); actualp != nil {
 				// end += "(version match) "
 			} else {
 				end += "(version mismatch) " + actualp.Version + " " + version + " "
 			}
-			if actualp := me.forge.Machine.FindInstalledByName(p.Name); actualp != nil {
+			if actualp := me.machine.FindInstalledByName(p.Name); actualp != nil {
 				if p.Version != actualp.Version {
 					end += "(installed " + actualp.Version + " vs " + p.Version + ") "
 				} else {
@@ -117,155 +112,7 @@ func main() {
 		okExit("EVERYTHING BUILT!")
 	}
 
-	if argv.Test {
-		homeDir, _ := os.UserHomeDir()
-
-		testdir := filepath.Join(homeDir, "go/src/go.wit.com/apps/utils/wit-utils/go-clone-test/")
-		os.Chdir(testdir)
-		shell.RunRealtime([]string{"go", "install"})
-
-		workdir := filepath.Join(homeDir, "gowork")
-		if err := os.MkdirAll(workdir, os.ModePerm); err != nil {
-			badExit(err)
-		}
-		os.Chdir(workdir)
-		shell.RunRealtime([]string{"go-clone-test"})
-	}
-
 	okExit("everything compiled")
-
-	/*
-		all := me.forge.Repos.SortByFullPath()
-		for all.Scan() {
-			check := all.Next()
-
-			repotype := check.GetRepoType()
-			if repotype == "binary" || repotype == "plugin" {
-				// we only want to process things that can be compiled with 'go build'
-			} else {
-				// log.Info("skipping repo", check.GetGoPath(), repotype)
-				continue
-			}
-
-			if me.forge.Config.IsReadOnly(check.GetGoPath()) {
-				// ignore read only stuff
-				continue
-			}
-
-			// var cmd []string
-			var start string
-			var end string
-
-			// add te repotype
-			end += check.GetRepoType()
-
-			manufactured := check.GetCurrentVersion()
-			ver := trimNonNumericFromStart(manufactured)
-			name := me.forge.Config.DebName(check.GetGoPath())
-			var realver string
-			if installedPackage := me.forge.Machine.FindInstalledByName(name); installedPackage != nil {
-				realver = installedPackage.Version
-			}
-			if actualp := me.forge.Machine.FindVersion(name, ver); actualp != nil {
-				end += " (version match) " + actualp.Version + " " + ver + " "
-				state[check] = "on mirrors"
-			} else {
-				if realver != "" {
-					end += fmt.Sprintf(" (version  miss) %s vs %s ", realver, ver)
-				}
-				// end += "" + ver + " "
-			}
-			if me.forge.Machine.IsInstalled(name) {
-				if actualp := me.forge.Machine.FindInstalledByName(name); actualp != nil {
-					if ver != actualp.Version {
-						end += "(installed " + actualp.Version + ") "
-					} else {
-						end += "(installed ok) "
-					}
-				} else {
-					end += "(installed) "
-				}
-			}
-
-			debname := name + "_" + ver + "_amd64.deb"
-			debnames[check] = debname
-			outdir := getOutdir(check)
-			_, err := os.Stat(filepath.Join(outdir, debname))
-			if err == nil {
-				// log.Info("exists", filepath.Join(outdir, debname))
-				state[check] = "in incoming"
-			} else {
-				// log.Info(debname, "does not exist")
-			}
-
-			if state[check] == "" {
-				state[check] = "need to build"
-			}
-			start = fmt.Sprintf("%-15s %-20s %-50s", state[check], ver, debname)
-
-			if state[check] == "need to build" {
-				end += " (will build) "
-			}
-
-			log.Info(start, end)
-			if name == "" {
-				// err := fmt.Sprintf("name is blank error %+v", repo)
-				log.Warn("name is blank error", check.GetGoPath())
-			}
-
-			if argv.DryRun {
-				continue
-			}
-			if argv.TestBuild != nil {
-				if argv.DryRun {
-					continue
-				}
-				if argv.Verbose {
-					verbose := []string{"-v", "-x"}
-					if err := me.forge.Build(check, verbose); err != nil {
-						log.Warn("BUILD FAILED", check.GetGoPath(), err)
-						failed[check] = fmt.Sprintf("%s %s %v", "go build", check.GetGoPath(), err)
-					}
-				} else {
-					if err := me.forge.Build(check, nil); err != nil {
-						log.Warn("BUILD FAILED", check.GetGoPath(), err)
-						failed[check] = fmt.Sprintf("%s %s %v", "go build", check.GetGoPath(), err)
-					}
-				}
-				continue
-			}
-
-			if argv.MakeInstall != nil {
-				log.Info("STARTING 'make install' in", check.GetGoPath())
-				if argv.DryRun {
-					continue
-				}
-				if argv.Verbose {
-					verbose := []string{"-v", "-x"}
-					if err := me.forge.Install(check, verbose); err != nil {
-						log.Warn("INSTALL FAILED", check.GetGoPath(), err)
-						failed[check] = fmt.Sprintf("%s %s %v", "go install", check.GetGoPath(), err)
-					}
-				} else {
-					if err := me.forge.Install(check, nil); err != nil {
-						log.Warn("INSTALL FAILED", check.GetGoPath(), err)
-						failed[check] = fmt.Sprintf("%s %s %v", "go install", check.GetGoPath(), err)
-					}
-				}
-				continue
-			}
-		}
-		if len(failed) != 0 {
-			log.Info("")
-			log.Info("something failed on:")
-			for repo, cmd := range failed {
-				log.Info("failed cmd  :", cmd, repo.GetGoPath())
-			}
-			// me.forge.CheckoutUser()
-			// shell.Run([]string{"forge", "--find-private"})
-			badExit(errors.New("some repos failed"))
-		}
-	*/
 }
 
 // this is dumb. sync this with go-deb
@@ -287,7 +134,7 @@ func okExit(thing string) {
 }
 
 func badExit(err error) {
-	log.Info("go-clean failed: ", err, me.forge.GetGoSrc())
+	log.Info("go-clean failed: ", err, me.forge.Config.ReposDir)
 	os.Exit(-1)
 }
 

structs.go

@@ -5,8 +5,8 @@ package main
 
 import (
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/gui"
 	"go.wit.com/lib/protobuf/forgepb"
+	"go.wit.com/lib/protobuf/zoopb"
 )
 
 var me *autoType
@@ -14,6 +14,6 @@ var me *autoType
 // this app's variables
 type autoType struct {
 	argpp   *arg.Parser    // go-arg preprocessor
-	myGui *gui.Node      // the gui handle
 	forge   *forgepb.Forge // your customized repo preferences and settings
+	machine *zoopb.Machine // your customized repo preferences and settings
 }