Merge pull request OpenVPN#24 from chipitsine/master

several packaging improvements
InHavk · Jan 9, 2017 · 35f460a · 35f460a
2 parents 6e12e47 + c4e278c
commit 35f460a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/installer/tap-windows6.nsi b/installer/tap-windows6.nsi
@@ -8,7 +8,7 @@
 
 ; TAP-Windows install script for Windows, using NSIS
 
-SetCompressor lzma
+SetCompressor /SOLID lzma
 
 !addplugindir .
 !include "MUI.nsh"
@@ -177,6 +177,12 @@ Function .onInit
 	${GetParameters} $R0
 	ClearErrors
 
+${IfNot} ${AtLeastWinVista}
+	MessageBox MB_OK "This package requires at least Windows Vista"
+	SetErrorLevel 1
+	Quit
+${EndIf}
+
 	!insertmacro SelectByParameter ${SecTAP} SELECT_TAP 1
 	!insertmacro SelectByParameter ${SecTAPUtilities} SELECT_UTILITIES 0
 	!insertmacro SelectByParameter ${SecTAPSDK} SELECT_SDK 0
@@ -271,9 +277,15 @@ Section -post
 	WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" "$INSTDIR\Uninstall.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\icon.ico"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${PRODUCT_VERSION}"
-
-	; Advise a reboot
-	;Messagebox MB_OK "IMPORTANT: Rebooting the system is advised in order to finalize TAP driver installation/upgrade (this is an informational message only, pressing OK will not reboot)."
+	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoModify" 1
+	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "NoRepair" 1
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "${PRODUCT_PUBLISHER}"
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "HelpLink" "https://openvpn.net/index.php/open-source.html"
+	WriteRegStr HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "https://openvpn.net"
+
+	${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+	IntFmt $0 "0x%08X" $0
+	WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "EstimatedSize" "$0"
 
 SectionEnd
 

diff --git a/version.m4 b/version.m4
@@ -1,5 +1,6 @@
 dnl define the TAP version
 define([PRODUCT_NAME], [TAP-Windows])
+define([PRODUCT_PUBLISHER], [OpenVPN Technologies, Inc.])
 define([PRODUCT_VERSION], [9.21.2])
 define([PRODUCT_VERSION_RESOURCE], [9,0,0,21])
 define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])