From d1d4b83ed0ade3752c79594f520f43be104ab70c Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Tue, 3 Jul 2018 20:19:12 +0200 Subject: [pkg] win build fixes Coments can not be ident and let's copy nssm.exe from chocolatey. --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e1c78df..7e9ec69 100755 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ STAGING := staging deps_win: choco install -y golang python upx nssm nsis wget 7zip openvpn_win: - mkdir staging\openvpn + 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 - # eventually, this should be built statically and cross compiled in the same pipeline that we build the installer. +# eventually, this should be built statically and cross compiled in the same pipeline that we build the installer. wget https://downloads.leap.se/thirdparty/windows/openvpn-x86_64-w64-mingw32.tar.bz2 -O staging/openvpn/openvpn.tar.bz2 7z e -y -ostaging/openvpn/ staging/openvpn/openvpn.tar.bz2 7z e -y -r -ostaging/openvpn/ staging/openvpn/openvpn.tar *.dll @@ -19,8 +19,8 @@ helper_win: systray_win: go get -tags "standalone" -u $(SYSTRAY) go build -tags "standalone" -ldflags "-H windowsgui -s -w" -o $(STAGING)/bitmask-systray.exe $(SYSTRAY) -build_win: helper_win systray_win - # since it's tedious, I assume you did bootstrap openvpn_win manually already. +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" if not exist dist mkdir dist make -C win @@ -29,3 +29,6 @@ build_osx: echo "[+] building osx..." build_snap: echo "[+] building snap..." + +staging\nssm.exe: + xcopy /y "C:\ProgramData\chocolatey\lib\NSSM\tools\nssm.exe" $(STAGING) -- cgit v1.2.3