Split command entrypoint from app package

.gitea/workflows/ci.yml

@@ -128,7 +128,7 @@ jobs:
             fi
             out="${DIST_DIR}/keepassgo-${goos}-${goarch}${ext}"
             GOOS="${goos}" GOARCH="${goarch}" CGO_ENABLED="${cgo_enabled}" \
-              go build -ldflags "-X main.appVersion=${app_version}" -o "${out}" .
+              go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=${app_version}" -o "${out}" ./cmd/keepassgo
           done
 
       - name: Build APK

.gitignore

@@ -1,6 +1,6 @@
 build/
 *.apk
-keepassgo
+/keepassgo
 android/keepassgo-android.jar
 packaging/archlinux/keepassgo-git/*.pkg.tar.zst
 packaging/archlinux/keepassgo-git/PKGBUILD

APK.md

@@ -29,7 +29,7 @@ Installed machine prerequisites expected by this repo:
 The repo tracks `gogio` as a Go tool, so the build runs through:
 
 ```sh
-go tool gogio -target android ...
+go tool gogio -target android ./cmd/keepassgo ...
 ```
 
 The Android build uses the branded icon asset at:

Makefile

@@ -6,7 +6,7 @@ APP_ID ?= org.julianfamily.keepassgo
 APK_OUT ?= build/keepassgo.apk
 APK_VERSION ?= 0.1.0.1
 APP_VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
-GO_LDFLAGS ?= -X main.appVersion=$(APP_VERSION)
+GO_LDFLAGS ?= -X git.julianfamily.org/keepassgo.appVersion=$(APP_VERSION)
 ANDROID_MIN_SDK ?= 28
 ANDROID_TARGET_SDK ?= 35
 SIGNKEY ?=
@@ -48,7 +48,7 @@ apk: android/keepassgo-android.jar
 		-minsdk $(ANDROID_MIN_SDK) \
 		-targetsdk $(ANDROID_TARGET_SDK) \
 		-icon assets/keepassgo-icon.png \
-		.
+		./cmd/keepassgo
 
 android/keepassgo-android.jar: $(shell find androidsrc -type f | sort)
 	@test -x "$(JAVA_HOME)/bin/javac" || { echo "JAVA_HOME must point to a working JDK install"; exit 1; }

README.md

@@ -38,14 +38,14 @@ KDBX security and KDF compatibility notes are documented in [`docs/kdbx-compatib
 Desktop build:
 
 ```bash
-go build ./...
+go build ./cmd/keepassgo
 ```
 
 By default, build outputs stamp the app version from `git describe --tags --always --dirty`.
 You can override the version shown in KeePassGO with:
 
 ```bash
-go build -ldflags "-X main.appVersion=v0.0.1" ./...
+go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=v0.0.1" ./cmd/keepassgo
 ```
 
 ## Arch Linux Package
@@ -89,7 +89,7 @@ go get -tool gioui.org/cmd/gogio@latest
 Package:
 
 ```bash
-go tool gogio -target android -icon assets/keepassgo-icon.png .
+go tool gogio -target android -icon assets/keepassgo-icon.png ./cmd/keepassgo
 ```
 
 You will need the Android SDK and NDK installed and configured for real device or release packaging.

android_share_android.go

@@ -1,6 +1,6 @@
 //go:build android
 
-package main
+package keepassgo
 
 /*
 #cgo CFLAGS: -Werror

android_share_stub.go

@@ -1,6 +1,6 @@
 //go:build !android
 
-package main
+package keepassgo
 
 func newPlatformVaultSharer(goos string) vaultSharer {
 	return nil

app.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"crypto/sha256"
@@ -6917,7 +6917,7 @@ func fill(c color.NRGBA) layout.Widget {
 	}
 }
 
-func main() {
+func Main() {
 	mode := flag.String("mode", "", "window mode: desktop or phone")
 	stateDir := flag.String("state-dir", "", "directory for KeePassGO state such as recent-vault history and default save targets")
 	grpcAddr := flag.String("grpc-addr", "", "address for the local gRPC API listener; use 'off' to disable")

buildapk/config.go

@@ -13,7 +13,7 @@ const (
 	DefaultAppID     = "org.julianfamily.keepassgo"
 	DefaultAPKOut    = "build/keepassgo.apk"
 	DefaultVersion   = "0.1.0.1"
-	DefaultLdflags   = "-X main.appVersion=dev"
+	DefaultLdflags   = "-X git.julianfamily.org/keepassgo.appVersion=dev"
 	DefaultMinSDK    = "28"
 	DefaultTargetSDK = "35"
 	DefaultIconPath  = "assets/keepassgo-icon.png"
@@ -58,7 +58,7 @@ func (c Config) GogioArgs() []string {
 		"-minsdk", c.MinSDK,
 		"-targetsdk", c.TargetSDK,
 		"-icon", c.IconPath,
-		".",
+		"./cmd/keepassgo",
 	}
 }
 

buildapk/config_test.go

@@ -21,7 +21,7 @@ func TestDefaultConfigGogioArgs(t *testing.T) {
 		"-minsdk", DefaultMinSDK,
 		"-targetsdk", DefaultTargetSDK,
 		"-icon", DefaultIconPath,
-		".",
+		"./cmd/keepassgo",
 	}
 
 	if got := cfg.GogioArgs(); !slices.Equal(got, want) {

clipboard_gio.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"io"

clipboard_gio_test.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"slices"

cmd/keepassgo/main.go

@@ -0,0 +1,7 @@
+package main
+
+import keepassgo "git.julianfamily.org/keepassgo"
+
+func main() {
+	keepassgo.Main()
+}

main_test.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"bytes"

packaging/archlinux/keepassgo-git/PKGBUILD.tmpl

@@ -41,7 +41,7 @@ build() {
   export GOFLAGS="-trimpath"
   local app_version
   app_version="$(git describe --tags --always --dirty)"
-  go build -ldflags "-X main.appVersion=${app_version}" -o keepassgo .
+  go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=${app_version}" -o keepassgo ./cmd/keepassgo
 }
 
 package() {

ui_accessibility.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"fmt"

ui_api.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"fmt"

ui_branding.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"image"

ui_editor.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"fmt"

ui_forms.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"fmt"

ui_header_dropdown.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"image"

ui_keyboard.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"fmt"

ui_layout_header.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"image"

ui_layout_lifecycle.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"gioui.org/layout"

ui_preferences.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"encoding/json"

ui_shortcuts.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"strings"

ui_sync_dialog.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"image/color"

ui_sync_menu_model.go

@@ -1,4 +1,4 @@
-package main
+package keepassgo
 
 import (
 	"runtime"