Merge pull request #1 from p1ratrulezzz/develop

Develop

.gitignore

@@ -2,3 +2,8 @@
 /src/app/resources/
 /bin/
 /src/app/resources_enc/
+/fyne-cross/
+/Command_Line_Tools_for_Xcode_12.4.dmg
+/Icon.png
+/jetbrainser.syso
+/resources.zip

Makefile

@@ -3,15 +3,20 @@ OUTDIR=bin
 SRCPATH=jetbrainser/src/app
 
 build:
-	#GOARCH=amd64 GOOS=darwin go build -o "${OUTDIR}/${BINARY_NAME}-osx64" "${SRCPATH}"
-	GOARCH=amd64 GOOS=linux go build -o "${OUTDIR}/${BINARY_NAME}-linux-x64" "${SRCPATH}"
-	GOARCH=amd64 GOOS=windows go build -o "${OUTDIR}/${BINARY_NAME}-win-x64.exe" "${SRCPATH}"
-	GOARCH=arm64 GOOS=linux go build -o "${OUTDIR}/${BINARY_NAME}-linux-arm64" "${SRCPATH}"
-	GOARCH=arm64 GOOS=windows go build -o "${OUTDIR}/${BINARY_NAME}-win-arm64.exe" "${SRCPATH}"
-	GOARCH=arm64 GOOS=darwin go build -o "${OUTDIR}/${BINARY_NAME}-osx-arm64" "${SRCPATH}"
-	GOARCH=amd64 GOOS=darwin go build -o "${OUTDIR}/${BINARY_NAME}-osx-amd64" "${SRCPATH}"
+	CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -tags console -o "${OUTDIR}/${BINARY_NAME}-linux-x64" "${SRCPATH}"
+	CGO_ENABLED=0 GOARCH=amd64 GOOS=windows go build -tags console -o "${OUTDIR}/${BINARY_NAME}-win-x64.exe" "${SRCPATH}"
+	CGO_ENABLED=0 GOARCH=arm64 GOOS=linux go build -tags console -o "${OUTDIR}/${BINARY_NAME}-linux-arm64" "${SRCPATH}"
+	CGO_ENABLED=0 GOARCH=arm64 GOOS=windows go build -tags console -o "${OUTDIR}/${BINARY_NAME}-win-arm64.exe" "${SRCPATH}"
+	CGO_ENABLED=0 GOARCH=arm64 GOOS=darwin go build -tags console -o "${OUTDIR}/${BINARY_NAME}-osx-arm64" "${SRCPATH}"
+	CGO_ENABLED=0 GOARCH=amd64 GOOS=darwin go build -tags console -o "${OUTDIR}/${BINARY_NAME}-osx-amd64" "${SRCPATH}"
 	chmod +x bin/*
 
+buildgui:
+	rm -rf fyne-cross/dist
+	go run github.com/fyne-io/fyne-cross linux -arch=amd64,arm64 -tags gui -output jetbrainser ./src/app
+	go run github.com/fyne-io/fyne-cross windows -arch=amd64 -tags gui -output jetbrainser.exe ./src/app
+	go run github.com/fyne-io/fyne-cross darwin -app-id com.jetbrainser.app -arch=amd64,arm64 -tags gui -output jetbrainser ./src/app
+
 clean:
 	go clean
 	# rm -f "${OUTDIR}/${BINARY_NAME}-linux_64"

build.cmd

@@ -1,27 +1,32 @@
+SET CGO_ENABLED=0
 SET BINARY_NAME=jetbrainser
 SET OUTDIR=bin
 SET SRCPATH=jetbrainser/src/app
 
 SET GOARCH=amd64
 SET GOOS=linux
+REM SET CC=x86_64-linux-musl-gcc
+REM SET CXX=x86_64-linux-musl-g++
 go build -o "%OUTDIR%/%BINARY_NAME%-linux-x64" "%SRCPATH%"
 
 SET GOARCH=amd64
 SET GOOS=windows
-go build -o "%OUTDIR%/%BINARY_NAME%-win-x64.exe" "%SRCPATH%"
+SET CC=x86_64-pc-cygwin-gcc
+SET CXX=x86_64-pc-cygwin-g++
+go build -tags console -o "%OUTDIR%/%BINARY_NAME%-win-x64.exe" "%SRCPATH%"
 
 SET GOARCH=arm64
 SET GOOS=linux
-go build -o "%OUTDIR%/%BINARY_NAME%-linux-arm64" "%SRCPATH%"
+go build -tags console -o "%OUTDIR%/%BINARY_NAME%-linux-arm64" "%SRCPATH%"
 
 SET GOARCH=arm64
 SET GOOS=windows
-go build -o "%OUTDIR%/%BINARY_NAME%-win-arm64.exe" "%SRCPATH%"
+go build -tags console -o "%OUTDIR%/%BINARY_NAME%-win-arm64.exe" "%SRCPATH%"
 
 SET GOARCH=arm64
 SET GOOS=darwin
-go build -o "%OUTDIR%/%BINARY_NAME%-osx-arm64" "%SRCPATH%"
+go build -tags console -o "%OUTDIR%/%BINARY_NAME%-osx-arm64" "%SRCPATH%"
 
 SET GOARCH=amd64
 SET GOOS=darwin
-go build -o "%OUTDIR%/%BINARY_NAME%-osx-amd64" "%SRCPATH%"
+go build -tags console -o "%OUTDIR%/%BINARY_NAME%-osx-amd64" "%SRCPATH%"

go.mod

@@ -3,8 +3,39 @@ module jetbrainser
 go 1.18
 
 require (
-	github.com/inancgumus/screen v0.0.0-20190314163918-06e984b86ed3 // indirect
-	golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+	fyne.io/fyne/v2 v2.1.4
+	github.com/inancgumus/screen v0.0.0-20190314163918-06e984b86ed3
+	golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f
+)
+
+require (
+	github.com/BurntSushi/toml v1.1.0 // indirect
+	github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/fyne-io/fyne-cross v1.2.1 // indirect
+	github.com/go-delve/delve v1.8.3 // indirect
+	github.com/go-gl/gl v0.0.0-20210813123233-e4099ee2221f // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211024062804-40e447a793be // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/godbus/dbus/v5 v5.0.4 // indirect
+	github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff // indirect
+	github.com/mattn/go-shellwords v1.0.12 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 // indirect
+	github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.4.0 // indirect
+	github.com/yuin/goldmark v1.4.1 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/image v0.0.0-20200430140353-33d19683fad8 // indirect
+	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
 	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	howett.net/plist v1.0.0 // indirect
 )