build: address PR review — fix Android launcher flags, systray tag, rename target

This commit is contained in:
sky5454 2026-04-12 18:50:52 +08:00
parent 168b6bec58
commit 681b2a258b
4 changed files with 9 additions and 12 deletions

View file

@ -116,7 +116,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
sudo apt-get install -y zip sudo apt-get install -y zip
make build-all-android make build-android-bundle
gh release upload "${{ inputs.tag }}" \ gh release upload "${{ inputs.tag }}" \
build/picoclaw-android-universal.zip \ build/picoclaw-android-universal.zip \
--clobber --clobber

View file

@ -216,15 +216,12 @@ build-android-arm64: generate
build-launcher-android-arm64: build-launcher-android-arm64:
@echo "Building picoclaw-launcher for android/arm64..." @echo "Building picoclaw-launcher for android/arm64..."
@mkdir -p $(BUILD_DIR) @mkdir -p $(BUILD_DIR)
@$(MAKE) -C web build \ @$(MAKE) -C web build-android-arm64 \
OUTPUT="$(CURDIR)/$(BUILD_DIR)/picoclaw-launcher-android-arm64" \ OUTPUT="$(CURDIR)/$(BUILD_DIR)/picoclaw-launcher-android-arm64"
WEB_GO='GOOS=android GOARCH=arm64 CGO_ENABLED=0 go' \
GO_BUILD_TAGS='stdjson' \
LDFLAGS='$(LDFLAGS)'
@echo "Build complete: $(BUILD_DIR)/picoclaw-launcher-android-arm64" @echo "Build complete: $(BUILD_DIR)/picoclaw-launcher-android-arm64"
## build-all-android: Build core and launcher for all Android architectures and package as universal zip ## build-android-bundle: Build core and launcher for all Android architectures and package as universal zip
build-all-android: generate build-android-bundle: generate
@echo "Building core for all Android architectures..." @echo "Building core for all Android architectures..."
@mkdir -p $(BUILD_DIR) @mkdir -p $(BUILD_DIR)
GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-android-arm64 ./$(CMD_DIR) GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-android-arm64 ./$(CMD_DIR)
@ -260,7 +257,7 @@ build-all: generate
GOOS=windows GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR) GOOS=windows GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe ./$(CMD_DIR)
GOOS=netbsd GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-amd64 ./$(CMD_DIR) GOOS=netbsd GOARCH=amd64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-amd64 ./$(CMD_DIR)
GOOS=netbsd GOARCH=arm64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-arm64 ./$(CMD_DIR) GOOS=netbsd GOARCH=arm64 $(GO) build $(GOFLAGS) -ldflags "$(LDFLAGS)" -o $(BUILD_DIR)/$(BINARY_NAME)-netbsd-arm64 ./$(CMD_DIR)
@$(MAKE) build-all-android @$(MAKE) build-android-bundle
@echo "All builds complete" @echo "All builds complete"
## install: Install picoclaw to system and copy builtin skills ## install: Install picoclaw to system and copy builtin skills

View file

@ -1,5 +1,5 @@
.PHONY: dev dev-frontend dev-backend build build-frontend build-dev-picoclaw test lint clean \ .PHONY: dev dev-frontend dev-backend build build-frontend build-dev-picoclaw test lint clean \
build-android-arm64 build-all-android build-android-arm64 build-android-bundle
# Go variables # Go variables
GO?=CGO_ENABLED=0 go GO?=CGO_ENABLED=0 go
@ -99,7 +99,7 @@ build-android-arm64: build-frontend
GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o "$(OUTPUT_ANDROID_ARM64)" ./$(BACKEND_DIR)/ GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o "$(OUTPUT_ANDROID_ARM64)" ./$(BACKEND_DIR)/
# Build launcher for all Android architectures # Build launcher for all Android architectures
build-all-android: build-frontend build-android-bundle: build-frontend
@mkdir -p $(BUILD_DIR) @mkdir -p $(BUILD_DIR)
GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o "$(BUILD_DIR)/picoclaw-launcher-android-arm64" ./$(BACKEND_DIR)/ GOOS=android GOARCH=arm64 $(GO) build -tags stdjson -ldflags "$(LDFLAGS)" -o "$(BUILD_DIR)/picoclaw-launcher-android-arm64" ./$(BACKEND_DIR)/
@echo "All Android launcher builds complete" @echo "All Android launcher builds complete"

View file

@ -1,4 +1,4 @@
//go:build (!darwin && !freebsd && !android) || cgo //go:build !android && ((!darwin && !freebsd) || cgo)
package main package main