diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2009-01-21 16:59:41 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2009-01-21 16:59:41 +0000 |
| commit | 63c9b4973cf7b3e437ab92b4c8b7cea7c8630932 (patch) | |
| tree | 69f3e681e5bf3de48b4c54876decb98831b59ce2 | |
| parent | 08580d0a33ed92ab36391b31c4745db86541b1da (diff) | |
| download | openvpn-63c9b4973cf7b3e437ab92b4c8b7cea7c8630932.tar.gz openvpn-63c9b4973cf7b3e437ab92b4c8b7cea7c8630932.tar.xz openvpn-63c9b4973cf7b3e437ab92b4c8b7cea7c8630932.zip | |
Version 2.1_rc15e
Windows installer changes:
* ifdefed out the check Windows version code which is causing
problems on Windows 7
* don't define SF_SELECTED if it is already defined
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3855 e7ae566f-a301-0410-adde-c780ea21d3b5
| -rwxr-xr-x | install-win32/openvpn.nsi | 5 | ||||
| -rw-r--r-- | version.m4 | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi index c1a1710..10e5291 100755 --- a/install-win32/openvpn.nsi +++ b/install-win32/openvpn.nsi @@ -234,6 +234,7 @@ Function .onInit # Delete previous start menu RMDir /r $SMPROGRAMS\${PRODUCT_NAME} +!ifdef CHECK_WINDOWS_VERSION # Check windows version Call GetWindowsVersion Pop $1 @@ -263,9 +264,13 @@ vista64bummer: init32bits: +!endif + FunctionEnd +!ifndef SF_SELECTED !define SF_SELECTED 1 +!endif ;-------------------- ;Pre-install section @@ -1,5 +1,5 @@ dnl define the OpenVPN version -define(PRODUCT_VERSION,[2.1_rc15d]) +define(PRODUCT_VERSION,[2.1_rc15e]) dnl define the TAP version define(PRODUCT_TAP_ID,[tap0901]) define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9]) |