fixes to marshal

This commit is contained in:
Jeff Carr 2024-12-01 10:42:32 -06:00
parent a483e69d12
commit 3532a553e4
2 changed files with 10 additions and 5 deletions

View File

@ -12,8 +12,8 @@ no-gui: build
./go-clone --no-gui
build:
make -C ../../lib/protobuf/gitpb/
GO111MODULE=off go build \
reset
GO111MODULE=off go build -v \
-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
install:
@ -49,6 +49,9 @@ clean:
git-clone:
./go-clone --recursive --go-src --no-work go.wit.com/lib/daemons/virtigod
test-build: build
./go-clone --build go.wit.com/apps/helloworld
debian:
go-deb --no-gui --repo go.wit.com/apps/go-clone

View File

@ -10,6 +10,7 @@ import (
"go.wit.com/lib/gui/repolist"
"go.wit.com/lib/gui/shell"
"go.wit.com/lib/protobuf/forgepb"
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
)
@ -20,6 +21,7 @@ var BUILDTIME string
var pp *arg.Parser
var forge *forgepb.Forge
var rv *repolist.RepoList
var argvRepo *gitpb.Repo
func main() {
pp = arg.MustParse(&argv)
@ -40,8 +42,8 @@ func main() {
// forge.ConfigPrintTable()
os.Setenv("REPO_WORK_PATH", forge.GetGoSrc())
pb := forge.Repos.FindByGoPath(argv.Repo)
if pb == nil {
argvRepo = forge.Repos.FindByGoPath(argv.Repo)
if argvRepo == nil {
log.Info("yep, need to clone", argv.Repo)
} else {
log.Info("already have", argv.Repo)
@ -49,7 +51,6 @@ func main() {
okExit(argv.Repo)
}
// gui is in testing
myGui := gui.New()
// myGui.Default()
@ -201,6 +202,7 @@ func redoGoModAll() {
func build() {
if argv.Build {
log.Info("need to try to build here")
forge.Build(argvRepo, nil)
} else {
log.Info("skipping build")
}