diff --git a/CHANGELOG.md b/CHANGELOG.md index 10a4181d..cb2ce99a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Changelog + + + + +## ~v1.5.9 + +*May 8, 2023* + +Init. + +### BREAKING CHANGES + +- Template + +### IMPROVEMENTS + +- Makefiles (HLS, HLM, HLT): append cross-compile +- Release: init applications + +### BUG FIXES + +- Gitignore (HLT): change m_hls.apk -> m_hlt.apk + + + + + ## v1.5.8 *May 8, 2023* @@ -21,3 +48,8 @@ Init. ### BUG FIXES - Template + + + + + diff --git a/bin/.gitignore b/bin/.gitignore index d6b7ef32..a0991ff4 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,3 @@ * !.gitignore +!Makefile diff --git a/bin/Makefile b/bin/Makefile new file mode 100644 index 00000000..781270fc --- /dev/null +++ b/bin/Makefile @@ -0,0 +1,4 @@ +.PHONY: default clean +default: clean +clean: + ls | grep -xv ".gitignore" | xargs rm diff --git a/cmd/hidden_lake/messenger/Makefile b/cmd/hidden_lake/messenger/Makefile index 8533edfe..d428e554 100644 --- a/cmd/hidden_lake/messenger/Makefile +++ b/cmd/hidden_lake/messenger/Makefile @@ -3,14 +3,19 @@ GC=go build BINPATH=../../../bin MOBILEPATH=./cmd/m_hlm -.PHONY: default build run test all-clean clean \ +.PHONY: default all-build build run test all-clean clean \ mobile-default mobile-build mobile-install mobile-clean -all-clean: clean mobile-clean default: build run + +all-build: build mobile-build +all-clean: clean mobile-clean + build: make build -C ../service $(GC) -o $(BINPATH)/hlm ./cmd/hlm + GOARCH=amd64 GOOS=linux $(GC) -o $(BINPATH)/hlm_linux ./cmd/hlm + GOARCH=amd64 GOOS=windows $(GC) -o $(BINPATH)/hlm_windows.exe ./cmd/hlm run: ./$(BINPATH)/hls & ./$(BINPATH)/hlm @@ -18,17 +23,17 @@ test: for i in {1..$(N)}; do go clean -testcache; echo $$i; go test ./...; done clean: pkill -15 hls || true - rm -f $(BINPATH)/hls hls.cfg - rm -f $(BINPATH)/hlm hlm.cfg hlm.stg - rm -rf hls.db hlm.db + make clean -C ../service + rm -f $(BINPATH)/hlm $(BINPATH)/hlm_linux $(BINPATH)/hlm_windows.exe + rm -f hlm.cfg hlm.db hlm.stg mobile-default: mobile-build mobile-install # fyne not supported "--sourceDir cmd/m_hlm" mobile-build: cd ./cmd/m_hlm && fyne package -os android -appID hidden_lake.messenger -icon icon.png - cp ./cmd/m_hlm/m_hlm.apk $(BINPATH)/m_hlm.apk + cp ./cmd/m_hlm/m_hlm.apk $(BINPATH)/hlm_android.apk mobile-install: cd ./cmd/m_hlm && fyne install -os android -appID hidden_lake.messenger -icon icon.png mobile-clean: - rm -f $(MOBILEPATH)/m_hlm.apk $(BINPATH)/m_hlm.apk + rm -f $(MOBILEPATH)/m_hlm.apk $(BINPATH)/hlm_android.apk rm -rf $(MOBILEPATH)/hidden_lake diff --git a/cmd/hidden_lake/service/Makefile b/cmd/hidden_lake/service/Makefile index f166fe68..6bbff676 100644 --- a/cmd/hidden_lake/service/Makefile +++ b/cmd/hidden_lake/service/Makefile @@ -3,28 +3,33 @@ GC=go build BINPATH=../../../bin MOBILEPATH=./cmd/m_hls -.PHONY: default build run test all-clean clean \ +.PHONY: default all-build build run test all-clean clean \ mobile-default mobile-build mobile-install mobile-clean -all-clean: clean mobile-clean default: build run + +all-build: build mobile-build +all-clean: clean mobile-clean + build: - $(GC) -o $(BINPATH)/hls ./cmd/hls + $(GC) -o $(BINPATH)/hls ./cmd/hls # main + GOARCH=amd64 GOOS=linux $(GC) -o $(BINPATH)/hls_linux ./cmd/hls + GOARCH=amd64 GOOS=windows $(GC) -o $(BINPATH)/hls_windows.exe ./cmd/hls run: ./$(BINPATH)/hls test: for i in {1..$(N)}; do go clean -testcache; echo $$i; go test ./...; done clean: - rm -f $(BINPATH)/hls hls.cfg - rm -rf hls.db + rm -f $(BINPATH)/hls $(BINPATH)/hls_linux $(BINPATH)/hls_windows.exe + rm -f hls.cfg hls.db mobile-default: mobile-build mobile-install # fyne not supported "--sourceDir cmd/m_hls" mobile-build: cd ./cmd/m_hls && fyne package -os android -appID hidden_lake.service -icon icon.png - cp ./cmd/m_hls/m_hls.apk $(BINPATH)/m_hls.apk + cp ./cmd/m_hls/m_hls.apk $(BINPATH)/hls_android.apk mobile-install: cd ./cmd/m_hls && fyne install -os android -appID hidden_lake.service -icon icon.png mobile-clean: - rm -f ./cmd/m_hls/m_hls.apk $(BINPATH)/m_hls.apk + rm -f $(MOBILEPATH)/m_hls.apk $(BINPATH)/hls_android.apk rm -rf $(MOBILEPATH)/hidden_lake diff --git a/cmd/hidden_lake/traffic/Makefile b/cmd/hidden_lake/traffic/Makefile index 3a48f2c6..0876e686 100644 --- a/cmd/hidden_lake/traffic/Makefile +++ b/cmd/hidden_lake/traffic/Makefile @@ -3,27 +3,33 @@ GC=go build BINPATH=../../../bin MOBILEPATH=./cmd/m_hlt -.PHONY: default build run test all-clean clean \ +.PHONY: default all-build build run test all-clean clean \ mobile-default mobile-build mobile-install mobile-clean -all-clean: clean mobile-clean default: build run + +all-build: build mobile-build +all-clean: clean mobile-clean + build: $(GC) -o $(BINPATH)/hlt ./cmd/hlt + GOARCH=amd64 GOOS=linux $(GC) -o $(BINPATH)/hlt_linux ./cmd/hlt + GOARCH=amd64 GOOS=windows $(GC) -o $(BINPATH)/hlt_windows.exe ./cmd/hlt run: ./$(BINPATH)/hlt test: for i in {1..$(N)}; do go clean -testcache; echo $$i; go test ./...; done clean: - rm -rf $(BINPATH)/hlt $(BINPATH)/hlt.cfg $(BINPATH)/hlt.db + rm -f $(BINPATH)/hlt $(BINPATH)/hlt_linux $(BINPATH)/hlt_windows.exe + rm -f hlt.cfg hlt.db mobile-default: mobile-build mobile-install # fyne not supported "--sourceDir cmd/m_hlt" mobile-build: cd ./cmd/m_hlt && fyne package -os android -appID hidden_lake.traffic -icon icon.png - cp ./cmd/m_hlt/m_hlt.apk $(BINPATH)/m_hlt.apk + cp ./cmd/m_hlt/m_hlt.apk $(BINPATH)/hlt_android.apk mobile-install: cd ./cmd/m_hlt && fyne install -os android -appID hidden_lake.traffic -icon icon.png mobile-clean: - rm -f ./cmd/m_hlt/m_hlt.apk $(BINPATH)/m_hlt.apk + rm -f $(MOBILEPATH)/m_hlt.apk $(BINPATH)/hlt_android.apk rm -rf $(MOBILEPATH)/hidden_lake diff --git a/cmd/hidden_lake/traffic/cmd/m_hlt/.gitignore b/cmd/hidden_lake/traffic/cmd/m_hlt/.gitignore index 55a97afa..95587838 100644 --- a/cmd/hidden_lake/traffic/cmd/m_hlt/.gitignore +++ b/cmd/hidden_lake/traffic/cmd/m_hlt/.gitignore @@ -1 +1 @@ -m_hls.apk +m_hlt.apk