aboutsummaryrefslogtreecommitdiff
path: root/install-win32/openvpn.nsi
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-12-01 22:32:06 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-12-01 22:32:06 +0000
commit63c5d785523a4885a6226de9bbddb3e11f2abff7 (patch)
tree5426dca1f367c81104a6eb1c5f17efc50f52a26c /install-win32/openvpn.nsi
parentAdded ExtractAuxFile capability to Windows Installer. (diff)
downloadopenvpn-63c5d785523a4885a6226de9bbddb3e11f2abff7.tar.xz
Added MultiFileExtract capability to Windows Installer.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3620 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rwxr-xr-xinstall-win32/openvpn.nsi17
1 files changed, 10 insertions, 7 deletions
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index ae86475..c1a1710 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -16,7 +16,10 @@ SetCompressor lzma
!include "xguidefs.nsi"
!include "setpath.nsi"
!include "GetWindowsVersion.nsi"
-!include "ExtractAuxFile.nsi"
+
+!ifdef EXTRACT_FILES
+!include "MultiFileExtract.nsi"
+!endif
!define GEN ".."
!define BIN "${GEN}\bin"
@@ -529,15 +532,15 @@ Section -post
!endif
!endif
- ; Try to extract AUX_FILE, if present
- !ifdef AUX_FILE
- Push "$INSTDIR\config\${AUX_FILE}"
- Call ExtractAuxFile
+ ; Try to extract files if present
+ !ifdef EXTRACT_FILES
+ Push "$INSTDIR"
+ Call MultiFileExtract
Pop $R0
IntCmp $R0 0 +3 +1 +1
- DetailPrint "ExtractAuxFile Failed status=$R0"
+ DetailPrint "MultiFileExtract Failed status=$R0"
goto +2
- DetailPrint "ExtractAuxFile Succeeded"
+ DetailPrint "MultiFileExtract Succeeded"
!endif
;