Merge pull request #48 from synfinatic/windows-cli

Add windows cli & fyne v2.1.1

CHANGELOG.md

@@ -1,5 +1,12 @@
 # AlpacaScope Changelog
 
+## v2.2.2 - 2021-11-11
+
+Added:
+ - Include a Windows CLI verion of the binary for people who don't have OpenGL
+    compatible hardware.
+ - Update Fyne to 2.1.1
+
 ## v2.2.1 - 2021-10-03
 
 Changed:

Makefile

@@ -9,7 +9,7 @@ endif
 BUILDINFOSDET ?=
 PROGRAM_ARGS ?=
 
-PROJECT_VERSION           := 2.2.1
+PROJECT_VERSION           := 2.2.2
 BUILD_ID                  := 1
 DOCKER_REPO               := synfinatic
 PROJECT_NAME              := alpacascope
@@ -40,6 +40,7 @@ DARWIN_RELEASE_GUI        := $(DIST_DIR)/AlpacaScope.app
 DARWIN_RELEASE_ZIP        := $(DIST_DIR)/AlpacaScope-$(PROJECT_VERSION).app.zip
 DARWIN_GUI                := $(DIST_DIR)/$(PROJECT_NAME)-gui-$(PROJECT_VERSION)-darwin-amd64
 WINDOWS_RELEASE           := $(DIST_DIR)/AlpacaScope.exe
+WINDOWS_CLI               := $(DIST_DIR)/AlpacaScope-CLI-$(PROJECT_VERSION).exe
 WINDOWS                   := $(DIST_DIR)/AlpacaScope-Debug-$(PROJECT_VERSION).exe
 
 GO_FILES = $(shell find . -type f -name '*.go' | grep -v _test.go) Makefile
@@ -62,7 +63,7 @@ $(DIST_DIR)/release.sig: .build-release $(DARWIN_RELEASE_ZIP) .verify_windows
 	cd dist && shasum -a 256 * | gpg --clear-sign >release.sig
 
 # This target builds anywhere
-.build-release: $(LINUX_BIN) $(LINUXARM64_BIN) $(LINUXARM32_BIN) $(DARWIN_BIN) $(DARWIN_GUI) $(DARWIN_RELEASE_GUI)
+.build-release: $(LINUX_BIN) $(LINUXARM64_BIN) $(LINUXARM32_BIN) $(DARWIN_BIN) $(DARWIN_GUI) $(DARWIN_RELEASE_GUI) $(WINDOWS_CLI)
 
 # this targets only build on MacOS
 build-gui: darwin-gui darwin-release-gui windows linux-gui ## Build GUI binaries
@@ -211,6 +212,12 @@ $(WINDOWS_RELEASE): $(GO_FILES) | .build-windows-check .prepare .fyne
 		-sourceDir gui && \
 		mv gui/gui.exe $(WINDOWS_RELEASE)
 
+windows-cli: $(WINDOWS_CLI)  ## Build Windows/amd64 CLI
+
+$(WINDOWS_CLI): $(GO_FILES) | .prepare
+	GOARCH=amd64 GOOS=windows go build -ldflags='$(LDFLAGS)' -o $(WINDOWS_CLI) ./cmd/...
+	@echo "Created: $(WINDOWS_CLI)"
+
 linux-gui: $(LINUX_GUI)  ## Build Linux/x86_64 GUI
 
 $(LINUX_GUI): $(GO_FILES) | .prepare .fyne-cross

go.mod

@@ -1,9 +1,9 @@
 module github.com/synfinatic/alpacascope
 
-go 1.15
+go 1.16
 
 require (
-	fyne.io/fyne/v2 v2.1.0
+	fyne.io/fyne/v2 v2.1.1
 	github.com/go-resty/resty/v2 v2.3.0
 	github.com/kr/text v0.2.0 // indirect
 	github.com/libp2p/go-reuseport v0.1.0

go.sum

@@ -1,5 +1,5 @@
-fyne.io/fyne/v2 v2.1.0 h1:qzdkaXL/UpmMtG4FlsX9xMZ0Q93CRzLxkoiSXyplP/I=
-fyne.io/fyne/v2 v2.1.0/go.mod h1:c1vwI38Ebd0dAdxVa6H1Pj6/+cK1xtDy61+I31g+s14=
+fyne.io/fyne/v2 v2.1.1 h1:3p39SwQ/rBiYODVYI4ggTuwMufWYmqaRMJvXTFg7jSw=
+fyne.io/fyne/v2 v2.1.1/go.mod h1:c1vwI38Ebd0dAdxVa6H1Pj6/+cK1xtDy61+I31g+s14=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=

telescope/time.go

@@ -1,6 +1,7 @@
 package telescope
 
 /*
+ * Note that all of these functions are NOT used by AlpacaScope!
  * Formulas from https://thecynster.home.blog/2019/11/04/calculating-sidereal-time/
  */
 import (