From c1a29418eb26ab019b1941f68a6f8983ae3981a0 Mon Sep 17 00:00:00 2001
From: Nazar Kanaev <nkanaev@live.com>
Date: Sat, 23 Sep 2023 21:32:32 +0100
Subject: [PATCH] reorganise bin files

---
 bin/feedtest.go => cmd/feed2json/main.go         |  0
 .../generate_versioninfo/main.go                 |  0
 .../package_macos/main.go                        |  0
 bin/reader.go => cmd/readability/main.go         |  0
 {src => cmd/yarr}/main.go                        |  0
 {src => cmd/yarr}/main_test.go                   |  0
 dockerfile.arm                                   |  8 ++++----
 makefile                                         | 16 ++++++++--------
 src/assets/assetsfs.go                           |  3 ---
 9 files changed, 12 insertions(+), 15 deletions(-)
 rename bin/feedtest.go => cmd/feed2json/main.go (100%)
 rename bin/generate_versioninfo.go => cmd/generate_versioninfo/main.go (100%)
 rename bin/package_macos.go => cmd/package_macos/main.go (100%)
 rename bin/reader.go => cmd/readability/main.go (100%)
 rename {src => cmd/yarr}/main.go (100%)
 rename {src => cmd/yarr}/main_test.go (100%)

diff --git a/bin/feedtest.go b/cmd/feed2json/main.go
similarity index 100%
rename from bin/feedtest.go
rename to cmd/feed2json/main.go
diff --git a/bin/generate_versioninfo.go b/cmd/generate_versioninfo/main.go
similarity index 100%
rename from bin/generate_versioninfo.go
rename to cmd/generate_versioninfo/main.go
diff --git a/bin/package_macos.go b/cmd/package_macos/main.go
similarity index 100%
rename from bin/package_macos.go
rename to cmd/package_macos/main.go
diff --git a/bin/reader.go b/cmd/readability/main.go
similarity index 100%
rename from bin/reader.go
rename to cmd/readability/main.go
diff --git a/src/main.go b/cmd/yarr/main.go
similarity index 100%
rename from src/main.go
rename to cmd/yarr/main.go
diff --git a/src/main_test.go b/cmd/yarr/main_test.go
similarity index 100%
rename from src/main_test.go
rename to cmd/yarr/main_test.go
diff --git a/dockerfile.arm b/dockerfile.arm
index 2b8a417e..20c5bc2c 100644
--- a/dockerfile.arm
+++ b/dockerfile.arm
@@ -28,17 +28,17 @@ RUN env \
         CGO_ENABLED=1 \
         GOOS=linux GOARCH=arm64 \
     go build \
-        -tags "sqlite_foreign_keys release linux" \
+        -tags "sqlite_foreign_keys linux" \
         -ldflags="-s -w" \
-        -o /root/out/yarr.arm64 src/main.go
+        -o /root/out/yarr.arm64 ./cmd/yarr
 
 RUN env \
         CC=arm-linux-gnueabihf-gcc \
         CGO_ENABLED=1 \
         GOOS=linux GOARCH=arm GOARM=7 \
     go build \
-        -tags "sqlite_foreign_keys release linux" \
+        -tags "sqlite_foreign_keys linux" \
         -ldflags="-s -w" \
-        -o /root/out/yarr.arm7 src/main.go
+        -o /root/out/yarr.arm7 ./cmd/yarr
 
 CMD ["/bin/bash"]
diff --git a/makefile b/makefile
index ed51260e..dea82bb2 100644
--- a/makefile
+++ b/makefile
@@ -8,26 +8,26 @@ GO_LDFLAGS := $(GO_LDFLAGS) -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITH
 
 build_default:
 	mkdir -p _output
-	go build -tags "sqlite_foreign_keys release" -ldflags="$(GO_LDFLAGS)" -o _output/yarr src/main.go
+	go build -tags "sqlite_foreign_keys" -ldflags="$(GO_LDFLAGS)" -o _output/yarr ./cmd/yarr
 
 build_macos:
 	mkdir -p _output/macos
-	GOOS=darwin GOARCH=amd64 go build -tags "sqlite_foreign_keys release macos" -ldflags="$(GO_LDFLAGS)" -o _output/macos/yarr src/main.go
+	GOOS=darwin GOARCH=amd64 go build -tags "sqlite_foreign_keys macos" -ldflags="$(GO_LDFLAGS)" -o _output/macos/yarr ./cmd/yarr
 	cp src/platform/icon.png _output/macos/icon.png
-	go run bin/package_macos.go -outdir _output/macos -version "$(VERSION)"
+	go run ./cmd/package_macos -outdir _output/macos -version "$(VERSION)"
 
 build_linux:
 	mkdir -p _output/linux
-	GOOS=linux GOARCH=amd64 go build -tags "sqlite_foreign_keys release linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr src/main.go
+	GOOS=linux GOARCH=amd64 go build -tags "sqlite_foreign_keys linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr ./cmd/yarr
 
 build_windows:
 	mkdir -p _output/windows
-	go run bin/generate_versioninfo.go -version "$(VERSION)" -outfile src/platform/versioninfo.rc
+	go run ./cmd/generate_versioninfo -version "$(VERSION)" -outfile src/platform/versioninfo.rc
 	windres -i src/platform/versioninfo.rc -O coff -o src/platform/versioninfo.syso
-	GOOS=windows GOARCH=amd64 go build -tags "sqlite_foreign_keys release windows" -ldflags="$(GO_LDFLAGS) -H windowsgui" -o _output/windows/yarr.exe src/main.go
+	GOOS=windows GOARCH=amd64 go build -tags "sqlite_foreign_keys windows" -ldflags="$(GO_LDFLAGS) -H windowsgui" -o _output/windows/yarr.exe ./cmd/yarr
 
 serve:
-	go run -tags "sqlite_foreign_keys" src/main.go -db local.db
+	go run -tags "sqlite_foreign_keys" ./cmd/yarr -db local.db
 
 test:
-	cd src && go test -tags "sqlite_foreign_keys release" ./...
+	cd src && go test -tags "sqlite_foreign_keys" ./...
diff --git a/src/assets/assetsfs.go b/src/assets/assetsfs.go
index 05e6a9d0..0ca62d49 100644
--- a/src/assets/assetsfs.go
+++ b/src/assets/assetsfs.go
@@ -1,6 +1,3 @@
-//go:build release
-// +build release
-
 package assets
 
 import "embed"