diff options
Diffstat (limited to 'branding/templates')
| -rwxr-xr-x | branding/templates/makefile/Makefile | 18 | ||||
| -rwxr-xr-x | branding/templates/windows/template.nsi | 34 |
2 files changed, 31 insertions, 21 deletions
diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile index 5994e19..c042d27 100755 --- a/branding/templates/makefile/Makefile +++ b/branding/templates/makefile/Makefile @@ -34,11 +34,19 @@ pkg_win: staging\openvpn\openvpn.exe copy ..\bin\bitmask-helper staging\bitmask_helper.exe "C:\Program Files (x86)\NSIS\makensis.exe" windows/$(APPNAME)-installer.nsi else -pkg_win: staging/openvpn/openvpn.exe - echo "[+] building windows" +pkg_win_stage_1: staging/openvpn/openvpn.exe + echo "[+] building windows [stage1]" + cp ../bin/windows/bitmask-vpn staging/bitmask-vpn.exe + cp ../bin/windows/bitmask-helper-go staging/helper.exe + touch windows/uninstall.exe + makensis -DUNINSTALLER windows/$(APPNAME)-installer.nsi + mv dist/produce-bitmask-uninstaller.exe ../../deploy/ + +pkg_win_stage_2: staging/openvpn/openvpn.exe + echo "[+] building windows [stage2]" cp ../bin/windows/bitmask-vpn staging/bitmask-vpn.exe - #cp ../bin/windows/bitmask-helper staging/bitmask_helper.exe cp ../bin/windows/bitmask-helper-go staging/helper.exe + cp ../windows/staging/uninstall-signed.exe windows/uninstall.exe makensis windows/$(APPNAME)-installer.nsi mv dist/$(APPNAME)-$(VERSION).exe ../../deploy/ endif @@ -117,10 +125,10 @@ staging\openvpn\openvpn.exe: copy .\staging\openvpn\openvpn.exe .\staging copy .\staging\openvpn\*.dll .\staging staging/openvpn/openvpn.exe: - mkdir -p staging/openvpn + @mkdir -p staging/openvpn wget https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe -O $(STAGING)/openvpn/tap-windows.exe wget https://downloads.leap.se/thirdparty/windows/openvpn-x86_64-w64-mingw32.tar.bz2 -O $(STAGING)/openvpn/openvpn.tar.bz2 - tar xvjf $(STAGING)/openvpn/openvpn.tar.bz2 -C $(STAGING)/openvpn/ + @tar xjf $(STAGING)/openvpn/openvpn.tar.bz2 -C $(STAGING)/openvpn/ cp $(STAGING)/openvpn/bin/openvpn.exe $(STAGING)/openvpn cp $(STAGING)/openvpn/bin/*.dll $(STAGING) cp $(STAGING)/openvpn/lib/engines-1_1/*.dll $(STAGING) diff --git a/branding/templates/windows/template.nsi b/branding/templates/windows/template.nsi index e3b2379..6fa189b 100755 --- a/branding/templates/windows/template.nsi +++ b/branding/templates/windows/template.nsi @@ -2,10 +2,10 @@ !echo "Stage 1: building uninstaller" ; we don't care about this installer, in this step we just pick the uninstaller ; to be able to sign it. - OutFile "$%TEMP%\tempinstaller.exe" - SetCompressor off + OutFile "..\dist\produce-bitmask-uninstaller.exe" + SetCompress off !else - !echo "Stage 2: building installer" + !echo "Stage 2: building main installer" Outfile "..\dist\$applicationName-$version.exe" SetCompressor /SOLID lzma !endif @@ -59,7 +59,6 @@ Section "InstallFiles" DetailPrint "Trying to uninstall any older helper..." ClearErrors Delete 'C:\Program Files\$applicationName\bitmask_helper.exe' - IfErrors 0 noErrorHelper DetailPrint "Trying to uninstall new helper..." ClearErrors @@ -67,14 +66,14 @@ Section "InstallFiles" ExecWait '"$INSTDIR\helper.exe" remove' ClearErrors Delete 'C:\Program Files\$applicationName\helper.exe' - IfErrors 0 noErrorHelper + ;IfErrors 0 noErrorHelper ; uninstalling old nssm helper - could fail if it isn't there, or if nssm is not there... ClearErrors DetailPrint "Trying to uninstall an old style helper..." ExecWait '"$INSTDIR\nssm.exe" stop $applicationNameLower-helper' ExecWait '"$INSTDIR\nssm.exe" remove $applicationNameLower-helper confirm' - IfErrors 0 noErrorHelper + ;IfErrors 0 noErrorHelper DetailPrint "Failed to stop nssm-style helper, maybe it was not there" ; let's try to stop it in case it's the new style helper -- we need to do it to be able to overwrite it. @@ -82,16 +81,10 @@ Section "InstallFiles" ClearErrors DetailPrint "Trying to uninstall a new style helper..." ExecWait '"$INSTDIR\bitmask_helper.exe" stop' - IfErrors 0 noErrorHelper + ;IfErrors 0 noErrorHelper DetailPrint "Failed to stop new-style helper, maybe it was not there" - ClearErrors - DetailPrint "Trying to uninstall a new style helper..." - ExecWait '"$INSTDIR\helper.exe" stop' - IfErrors 0 noErrorHelper - DetailPrint "Failed to stop new-style helper, maybe it was not there" - - noErrorHelper: + ;noErrorHelper: ; now we try to delete the systray, locked by the app - just to know if another instance of FoobarVPN is running. ClearErrors @@ -105,9 +98,7 @@ Section "InstallFiles" noDelError: - ; TODO -- write uninstaller in a separate stage, so we can sign it! SetOutPath $INSTDIR - WriteUninstaller $INSTDIR\uninstall.exe ; Add ourselves to Add/remove programs WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$applicationNameLower" "DisplayName" "$applicationName" @@ -125,6 +116,7 @@ Section "InstallFiles" createShortCut "$SMPROGRAMS\$applicationName\$applicationName.lnk" "$INSTDIR\bitmask-vpn.exe" "" "$INSTDIR\icon.ico" File "readme.txt" + File "uninstall.exe" File "/oname=icon.ico" "..\assets\icon.ico" $extra_install_files @@ -156,6 +148,8 @@ Section /o "TAP Virtual Ethernet Adapter" SecTAP DetailPrint "TAP installed!" SectionEnd +!ifdef UNINSTALLER +; this section should not be in the main installer, because it will cause warnings. Section "Uninstall" ; we uninstall the new-style go helper ExecWait '"$INSTDIR\bitmask_helper.exe" stop' @@ -180,9 +174,17 @@ Section "Uninstall" Delete $INSTDIR\uninstall.exe RMDir $INSTDIR SectionEnd +!endif Function .onInit +!ifdef UNINSTALLER + ; If UNINSTALLER is defined, then we don't do anything execpt write out the uninstaller. + SetSilent silent + WriteUninstaller "c:\bitmask-uninstall.exe" + Quit ; bail out quickly when running the UNINSTALLER stage. +!else !insertmacro SelectByParameter ${SecTAP} SELECT_TAP 1 +!endif FunctionEnd ;---------------------------------------- |