Compare commits

..

5 Commits

Author SHA1 Message Date
Jeff Carr 97a0f679f6 fix build 2025-09-21 23:22:47 -05:00
Jeff Carr b3f63523b4 try to make this work again 2025-09-11 17:42:23 -05:00
Jeff Carr 3b559eff7e minor 2025-09-11 14:21:28 -05:00
Jeff Carr b46996bac2 common forge.Init() 2025-09-11 04:46:40 -05:00
Jeff Carr 8e67e31bbe new init & config() 2025-09-11 03:36:31 -05:00
7 changed files with 45 additions and 100 deletions

View File

@ -4,8 +4,10 @@ VERSION = $(shell git describe --tags)
BUILDTIME = $(shell date +%Y.%m.%d) BUILDTIME = $(shell date +%Y.%m.%d)
all: build all: build
./go-gui-toolkits -rm -f go-gui*.deb
ls -l ~/go/lib/go-gui/ go-deb --gui andlabs gui
#./go-gui-toolkits
#ls -l ~/go/lib/go-gui/
build: goimports build: goimports
GO111MODULE=off go build \ GO111MODULE=off go build \
@ -19,9 +21,14 @@ install:
GO111MODULE=off go install \ GO111MODULE=off go install \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}" -ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
debian:
rm -f go-gui-tool*
go-deb --dir ~/incoming/
goimports: goimports:
reset reset
goimports -w *.go goimports -w *.go
clean: clean:
rm -f ~/go/lib/go-gui/*.so rm -f ~/go/lib/go-gui/*.so
go-mod-clean purge

6
build
View File

@ -1,6 +1,8 @@
#!/bin/bash -x #!/bin/bash -x
# make build rm -rf ~/go/lib/*
go-gui-toolkits
ls -lt ~/go/lib/
mkdir -p files/usr/lib/go-gui-toolkits mkdir -p files/usr/lib/go-gui-toolkits
cp -a ~/go/lib/go-gui/*.so files/usr/lib/go-gui-toolkits/ cp -a ~/go/lib/*.so files/usr/lib/go-gui-toolkits/

View File

@ -1,3 +1,4 @@
Package: go-gui-toolkits
Maintainer: Jeff Carr <jcarr@wit.com> Maintainer: Jeff Carr <jcarr@wit.com>
Depends: Depends:
Architecture: amd64 Architecture: amd64

18
exit.go Normal file
View File

@ -0,0 +1,18 @@
package main
import (
"os"
"go.wit.com/log"
)
func okExit(thing string) {
log.Info(thing, "ok")
// log.Info("Finished go-clean on", check.GetGoPath(), "ok")
os.Exit(0)
}
func badExit(err error) {
log.Info("go-gui-toolkits failed: ", err)
os.Exit(-1)
}

28
go.mod
View File

@ -1,28 +0,0 @@
module go.wit.com/apps/utils/go-gui-toolkits
go 1.24.1
require (
go.wit.com/lib/protobuf/forgepb v0.0.124
go.wit.com/log v0.22.17
)
require (
github.com/alexflint/go-scalar v1.2.0 // indirect
github.com/destel/rill v0.8.0 // indirect
github.com/go-cmd/cmd v1.4.3 // indirect
github.com/google/uuid v1.6.0 // indirect
go.wit.com/dev/alexflint/arg v1.6.2 // indirect
go.wit.com/gui v0.22.51 // indirect
go.wit.com/lib/cobol v0.0.3 // indirect
go.wit.com/lib/fhelp v0.0.16 // indirect
go.wit.com/lib/gui/shell v0.22.30 // indirect
go.wit.com/lib/protobuf/bugpb v0.0.5 // indirect
go.wit.com/lib/protobuf/gitpb v0.0.113 // indirect
go.wit.com/lib/protobuf/guipb v0.0.12 // indirect
go.wit.com/widget v1.1.30 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.28.0 // indirect
google.golang.org/protobuf v1.36.8 // indirect
)

52
go.sum
View File

@ -1,52 +0,0 @@
github.com/alexflint/go-scalar v1.2.0 h1:WR7JPKkeNpnYIOfHRa7ivM21aWAdHD0gEWHCx+WQBRw=
github.com/alexflint/go-scalar v1.2.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/destel/rill v0.8.0 h1:PzWvw4Du+9SUy87riG/Ef4GHQpYX8qDtPMYzu40Lqvw=
github.com/destel/rill v0.8.0/go.mod h1:srKuXzvGqINUEGYR5b/iwvW+L9/S35RxVHWGYbXNoO4=
github.com/go-cmd/cmd v1.4.3 h1:6y3G+3UqPerXvPcXvj+5QNPHT02BUw7p6PsqRxLNA7Y=
github.com/go-cmd/cmd v1.4.3/go.mod h1:u3hxg/ry+D5kwh8WvUkHLAMe2zQCaXd00t35WfQaOFk=
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
go.wit.com/dev/alexflint/arg v1.6.2 h1:5TSmo0qJnfSY82MrjjtxFOoX7EkTmMs/hsmOcCFxNmU=
go.wit.com/dev/alexflint/arg v1.6.2/go.mod h1:3MrBCZBVbb5vea1NpJ8pdwGoDXIAIOHcZqj0fGuRUrM=
go.wit.com/gui v0.22.51 h1:PPo9qwK52cp1nENBvPWF2tFRtUa1/hPiNhVsNbdm02g=
go.wit.com/gui v0.22.51/go.mod h1:ulugUrJlDrt2tIoJYHoRJQY18+upZ0bF0gYNj3089Tc=
go.wit.com/lib/cobol v0.0.3 h1:INYKEyg8YgwxqmAxFYCoPS8MjR9T7wqd6s30fPffc7k=
go.wit.com/lib/cobol v0.0.3/go.mod h1:2SnyAHBsNYPkn1fjrSme23OkmfZZ8JRx4wphozf8QPg=
go.wit.com/lib/fhelp v0.0.16 h1:yuh9KxQJRJtc+SUxy+nh9ZEE2QrorYHYtLvYo4WVUnY=
go.wit.com/lib/fhelp v0.0.16/go.mod h1:zEIo2anni9klmU/tq8i3XDa4mL+PpRdMOMIafhXcb5g=
go.wit.com/lib/gui/shell v0.22.30 h1:d9Gjgry3P4bZCVz8WeOVodkp7IIerCl+74kfMPOV6qA=
go.wit.com/lib/gui/shell v0.22.30/go.mod h1:BWVNCsK4gyo085YJnTz+zqe/8N8tGKSMrCHfGWna4JE=
go.wit.com/lib/protobuf/bugpb v0.0.5 h1:o09DPLf4GwbU99vy8oVPdv2BNyEdRsy0wnFUnXiO8L0=
go.wit.com/lib/protobuf/bugpb v0.0.5/go.mod h1:FkkeImmqh67mOnz8MHM6Ohs6km9T8Vr4mdgztCypsSk=
go.wit.com/lib/protobuf/forgepb v0.0.124 h1:QKp2gU3j2julSTR9MjvfnF/tUSKdhcXq+sznM3d4uKE=
go.wit.com/lib/protobuf/forgepb v0.0.124/go.mod h1:wssPxfp3yD5TwqIJG9xjXBHKna+YMdAJQMQ+E3zLFW4=
go.wit.com/lib/protobuf/gitpb v0.0.113 h1:4hfVhSOmRgO7PWyDR7UwTHdttuMKUg0qcY06SpFRWdk=
go.wit.com/lib/protobuf/gitpb v0.0.113/go.mod h1:Lckf78Yf2hHK3xuyiK9faSdHR/DHvhUd2ooZnY/z9l8=
go.wit.com/lib/protobuf/guipb v0.0.12 h1:Yxf0eCVRU4R+w33SulLSnkDMi6KiW/mL7O5nHEelVFU=
go.wit.com/lib/protobuf/guipb v0.0.12/go.mod h1:eD5DG8UozJli7Q6BDoIVNThJjcaTfsOi9AGwlk5gOUk=
go.wit.com/log v0.22.17 h1:rAnrUPbQ/k34Fxqq4buKofvwKRvODcV4/qiXJREiqD4=
go.wit.com/log v0.22.17/go.mod h1:XE4lTfAibWgwBJksIk7u3IEJ8xcBvNhnlewYAQGj2Ew=
go.wit.com/widget v1.1.30 h1:O/dIG7QtDrZkR5P6f8JAMyevBiMXSun9vL6F0KFAWV8=
go.wit.com/widget v1.1.30/go.mod h1:wj7TpAr2gk7Poa+v8XQkH1aidnTdgAa/a8GxrMtcztw=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

29
main.go
View File

@ -2,29 +2,26 @@ package main
import ( import (
"go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/forgepb"
"go.wit.com/log"
) )
// go will sit here until the window exits // go will sit here until the window exits
func main() { func main() {
forge := forgepb.Init() forge := forgepb.Init()
all := forge.Repos.SortByFullPath()
for all.Scan() {
check := all.Next()
repotype := check.GetRepoType() cmd := []string{"make", "install"}
if repotype != "plugin" { if repo := forge.Repos.FindByNamespace("go.wit.com/toolkits/gocui"); repo != nil {
continue repo.RunVerbose(cmd)
} }
if forge.Config.IsReadOnly(check.GetGoPath()) { if repo := forge.Repos.FindByNamespace("go.wit.com/toolkits/andlabs"); repo != nil {
// ignore read only stuff repo.RunVerbose(cmd)
continue }
}
log.Info("STARTING 'make install' in", check.GetGoPath()) if repo := forge.Repos.FindByNamespace("go.wit.com/toolkits/nocui"); repo != nil {
if err := forge.Install(check, nil); err != nil { repo.RunVerbose(cmd)
log.Warn("INSTALL FAILED", check.GetGoPath(), err) }
}
if repo := forge.Repos.FindByNamespace("go.wit.com/toolkits/fyne"); repo != nil {
repo.RunVerbose(cmd)
} }
} }