summaryrefslogtreecommitdiff
path: root/cmd/rescribe
diff options
context:
space:
mode:
authorNick White <git@njw.name>2025-12-04 23:00:26 +0000
committerNick White <git@njw.name>2025-12-04 23:00:26 +0000
commitf0620cab78b7deb10bad927d71bbc55fe5e89c4d (patch)
treeac90e259adedb1fa93bd8dc526993bbaaa44f385 /cmd/rescribe
parent1c314f09820846591247ebbd92d809981f2d4f40 (diff)
Update fyne packaging release for windows (macOS may need further updates)
Diffstat (limited to 'cmd/rescribe')
-rw-r--r--cmd/rescribe/TODO2
-rw-r--r--cmd/rescribe/makefile18
2 files changed, 10 insertions, 10 deletions
diff --git a/cmd/rescribe/TODO b/cmd/rescribe/TODO
index 2a31b9a..838bd06 100644
--- a/cmd/rescribe/TODO
+++ b/cmd/rescribe/TODO
@@ -1,5 +1,7 @@
Add option to choose multiple languages (easy on tesseract level, slightly tricky on GUI level)
+Remove filesystem permission from flatpak - unneeded for loading now thanks to portals, but would need to rework for saving before it's possible
+
Write to PDF as we go along, so memory requirements are reduced. Would require further modifying fpdf: https://github.com/jung-kurt/gofpdf/issues/110
Maybe pay apple $100 for a certificate to avoid their security warnings (can be easily included in 'fyne package')
diff --git a/cmd/rescribe/makefile b/cmd/rescribe/makefile
index ea500b9..0a4376a 100644
--- a/cmd/rescribe/makefile
+++ b/cmd/rescribe/makefile
@@ -18,6 +18,8 @@
# perfectly for us.
OSXCROSSBIN=$(HOME)/src/osxcross/target/bin
+GOPATH=$(HOME)/go
+
EMBEDS=embed_darwin.go embed_darwin_amd64.go embed_darwin_arm64.go embed_linux.go embed_windows.go embed_other.go
GODEPS=gui.go main.go $(EMBEDS)
VERSION=1.4.0
@@ -49,8 +51,8 @@ build/darwin/rescribe: build/darwin_amd64/rescribe build/darwin_arm64/rescribe
PATH="$(PATH):$(OSXCROSSBIN)" lipo -create build/darwin_amd64/rescribe build/darwin_arm64/rescribe -output $@
build/darwin/Rescribe.app: build/darwin/rescribe
- go install fyne.io/fyne/v2/cmd/fyne@v2.1.2
- fyne package --release --certificate Rescribe --id xyz.rescribe.rescribe --tags embed --name Rescribe --exe build/darwin/rescribe --os darwin --icon icon.png --appVersion $(VERSION)
+ go install fyne.io/tools/cmd/fyne@v1.7.0
+ $(GOPATH)/bin/fyne package --release --certificate Rescribe --id xyz.rescribe.rescribe --tags embed --name Rescribe --exe build/darwin/rescribe --os darwin --icon icon.png --app-version $(VERSION)
codesign -s Rescribe Rescribe.app
mv Rescribe.app $@
@@ -58,15 +60,11 @@ dist/darwin/rescribe.zip: build/darwin/Rescribe.app
mkdir -p dist/darwin
cd build/darwin; zip -r ../../dist/darwin/rescribe.zip Rescribe.app
-build/windows/rescribe-bin.exe: $(GODEPS)
- go generate
- mkdir -p build/windows
- CC="x86_64-w64-mingw32-gcc" CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -tags embed -o $@ .
-
-dist/windows/rescribe.exe: build/windows/rescribe-bin.exe
+dist/windows/rescribe.exe: $(GODEPS)
mkdir -p dist/windows
- CC="x86_64-w64-mingw32-gcc" fyne package --tags embed --name Rescribe --exe build/windows/rescribe-bin.exe --os windows --icon icon.png --appVersion $(VERSION)
- mv rescribe.exe $@
+ go generate
+ go install fyne.io/tools/cmd/fyne@v1.7.0
+ CC="x86_64-w64-mingw32-gcc" $(GOPATH)/bin/fyne package --tags embed --name Rescribe --exe $@ --os windows --icon icon.png --app-version $(VERSION)
# used for flatpak building
modules.tar.xz: ../../go.mod