diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-11-30 09:51:58 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-11-30 09:51:58 +0000 |
| commit | bb8f4780521d26291770aba3901c6052b9dcccd4 (patch) | |
| tree | 1c86996097240ed4ed48b717bf155f42c9b89a23 /install-win32/openvpn.nsi | |
| parent | Added new management interface command "pid" to show the (diff) | |
| download | openvpn-bb8f4780521d26291770aba3901c6052b9dcccd4.tar.xz | |
Added ExtractAuxFile capability to Windows Installer.
Changed Windows installer to use LZMA instead of BZIP2 compression.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3616 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32/openvpn.nsi')
| -rwxr-xr-x | install-win32/openvpn.nsi | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi index c33439e..ae86475 100755 --- a/install-win32/openvpn.nsi +++ b/install-win32/openvpn.nsi @@ -7,6 +7,8 @@ ; OpenVPN install script for Windows, using NSIS +SetCompressor lzma + !include "MUI.nsh" !include "defs.nsi" @@ -14,6 +16,7 @@ !include "xguidefs.nsi" !include "setpath.nsi" !include "GetWindowsVersion.nsi" +!include "ExtractAuxFile.nsi" !define GEN ".." !define BIN "${GEN}\bin" @@ -73,8 +76,6 @@ OutFile "${GEN}\${PRODUCT_UNIX_NAME}-${VERSION}${OUTFILE_LABEL}-install.exe" - SetCompressor bzip2 - ShowInstDetails show ShowUninstDetails show @@ -528,6 +529,17 @@ Section -post !endif !endif + ; Try to extract AUX_FILE, if present + !ifdef AUX_FILE + Push "$INSTDIR\config\${AUX_FILE}" + Call ExtractAuxFile + Pop $R0 + IntCmp $R0 0 +3 +1 +1 + DetailPrint "ExtractAuxFile Failed status=$R0" + goto +2 + DetailPrint "ExtractAuxFile Succeeded" + !endif + ; ; install/upgrade TAP driver if selected, using tapinstall.exe ; |