diff --git a/cmd/fyne/internal/commands/package-mobile.go b/cmd/fyne/internal/commands/package-mobile.go index db71726..c86f221 100644 --- a/cmd/fyne/internal/commands/package-mobile.go +++ b/cmd/fyne/internal/commands/package-mobile.go @@ -14,11 +14,11 @@ import ( ) func (p *Packager) packageAndroid(arch string, tags []string) error { - return mobile.RunNewBuild(arch, p.AppID, p.icon, p.Name, p.AppVersion, p.AppBuild, p.release, p.distribution, "", "", tags) + return mobile.RunNewBuild(arch, p.AppID, p.icon, p.Name, p.AppVersion, p.AppBuild, p.release, p.distribution, "", "", tags, p.verbose) } func (p *Packager) packageIOS(target string, tags []string) error { - err := mobile.RunNewBuild(target, p.AppID, p.icon, p.Name, p.AppVersion, p.AppBuild, p.release, p.distribution, p.certificate, p.profile, tags) + err := mobile.RunNewBuild(target, p.AppID, p.icon, p.Name, p.AppVersion, p.AppBuild, p.release, p.distribution, p.certificate, p.profile, tags, p.verbose) if err != nil { return err } diff --git a/cmd/fyne/internal/commands/package.go b/cmd/fyne/internal/commands/package.go index ba31e18..7df9a39 100644 --- a/cmd/fyne/internal/commands/package.go +++ b/cmd/fyne/internal/commands/package.go @@ -68,6 +68,7 @@ type Packager struct { *appData srcDir, dir, exe, os string install, release, distribution bool + verbose bool certificate, profile string // optional flags for releasing tags, category string tempDir string diff --git a/cmd/fyne/internal/commands/release.go b/cmd/fyne/internal/commands/release.go index 698d0da..5f8b2e4 100644 --- a/cmd/fyne/internal/commands/release.go +++ b/cmd/fyne/internal/commands/release.go @@ -53,6 +53,7 @@ func Release() *cli.Command { stringFlags["icon"](&r.icon), boolFlags["use-raw-icon"](&r.rawIcon), genericFlags["metadata"](&r.customMetadata), + boolFlags["verbose"](&r.Packager.verbose), }, Action: r.releaseAction, } diff --git a/cmd/fyne/internal/mobile/build.go b/cmd/fyne/internal/mobile/build.go index 96fd1a5..402a350 100644 --- a/cmd/fyne/internal/mobile/build.go +++ b/cmd/fyne/internal/mobile/build.go @@ -273,11 +273,12 @@ var ( ) // RunNewBuild executes a new mobile build for the specified configuration -func RunNewBuild(target, appID, icon, name, version string, build int, release, distribution bool, cert, profile string, tags []string) error { +func RunNewBuild(target, appID, icon, name, version string, build int, release, distribution bool, cert, profile string, tags []string, verbose bool) error { buildTarget = target buildBundleID = appID buildRelease = distribution buildTags = tags + buildV = verbose if release { buildLdflags = "-w" buildTrimpath = true diff --git a/cmd/fyne/internal/mobile/build_iosapp.go b/cmd/fyne/internal/mobile/build_iosapp.go index d500f32..429115b 100644 --- a/cmd/fyne/internal/mobile/build_iosapp.go +++ b/cmd/fyne/internal/mobile/build_iosapp.go @@ -83,11 +83,16 @@ func goIOSBuild(pkg *packages.Package, bundleID string, archs []string, } // We are using lipo tool to build multiarchitecture binaries. - cmd := exec.Command( - "xcrun", "lipo", + args := []string{ + "lipo", "-o", filepath.Join(tmpdir, "main/main"), "-create", - ) + } + if buildV { + printcmd("xcrun %s", strings.Join(args, " ")) + } + cmd := exec.Command("xcrun", args...) + var nmpkgs map[string]bool for _, arch := range archs { path := filepath.Join(tmpdir, arch) @@ -124,6 +129,9 @@ func goIOSBuild(pkg *packages.Package, bundleID string, archs []string, } cmd = exec.Command("xcrun", cmdStrings...) + if buildV { + printcmd("xcrun %s", strings.Join(cmdStrings, " ")) + } if err := runCmd(cmd); err != nil { return nil, err }