[bug] let's stop using upx in windows

Some antivirus detects the upxed binaries as viruses.

- Related: #54

1 files changed, 1 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 2c85152..71b99fd 100755
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ tgz:
 CROSS_FLAGS = CGO_ENABLED=1 GOARCH=386 GOOS=windows CC="/usr/bin/i686-w64-mingw32-gcc" CGO_LDFLAGS="-lssp" CXX="i686-w64-mingw32-c++"
 
 deps_win:
-	choco install -y golang python upx nssm nsis wget 7zip
+	choco install -y golang python nssm nsis wget 7zip
 openvpn_win:
 	if not exist staging\openvpn mkdir staging\openvpn
 	wget https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe -O staging/openvpn/tap-windows.exe
@@ -45,11 +45,9 @@ openvpn_cross_win:
 	cp $(STAGING)/openvpn/lib/engines-1_1/*.dll $(STAGING)
 helper_win:
 	go build -ldflags "-s -w" -o $(STAGING)/$(HELPER_BIN).exe ./helper
-	upx $(STAGING)/$(HELPER_BIN).exe
 systray_win:
 	go get -u $(SYSTRAY)
 	powershell '$$gopath=go env GOPATH;$$version=git -C $$gopath/src/$(SYSTRAY) describe --tags; go build -ldflags "-H windowsgui -s -w -X main.version=$$version" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY)'
-	upx $(STAGING)/$(SYSTRAY_BIN).exe
 build_win: staging\nssm.exe helper_win systray_win
 # since it's tedious, I assume you did bootstrap openvpn_win manually already.
 	echo "[+] building windows"
@@ -61,7 +59,6 @@ build_cross_win: staging/nssm.exe
 	$(CROSS_FLAGS) $(MAKE) helper_win
 	$(CROSS_FLAGS) go get $(SYSTRAY)
 	$(CROSS_FLAGS) go build -ldflags "-H windowsgui -s -w -X main.version=$(VERSION)" -o $(STAGING)/$(SYSTRAY_BIN).exe $(SYSTRAY)
-	upx $(STAGING)/$(SYSTRAY_BIN).exe
 	mkdir -p dist
 	make -C win VERSION=$(VERSION)
 	makensis win/RiseupVPN-installer.nsi