aboutsummaryrefslogtreecommitdiff
path: root/install-win32
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2006-09-14 02:18:40 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2006-09-14 02:18:40 +0000
commitd1270d07b24fb379f599543ef7807dafa4dbeaec (patch)
treea92648c25d7e7a1f19d597385ac313dbab26ad8e /install-win32
parentVersion 2.1_beta15 released (diff)
downloadopenvpn-d1270d07b24fb379f599543ef7807dafa4dbeaec.tar.xz
TAP-Win32 fixes to run on Windows Vista.
Modified installer to detect 32-bit vs. 64 bit Windows and install the correct TAP driver. TAP-Win32 version number is at 8.4. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1229 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32')
-rwxr-xr-xinstall-win32/openvpn.nsi.in29
-rwxr-xr-xinstall-win32/prebuild17
2 files changed, 39 insertions, 7 deletions
diff --git a/install-win32/openvpn.nsi.in b/install-win32/openvpn.nsi.in
index 5813420..9a5b47a 100755
--- a/install-win32/openvpn.nsi.in
+++ b/install-win32/openvpn.nsi.in
@@ -266,8 +266,6 @@ SectionEnd
Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
SetOverwrite on
- SetOutPath "$INSTDIR\bin"
- File "${BIN}\ti3790\tapinstall.exe"
FileOpen $R0 "$INSTDIR\bin\addtap.bat" w
FileWrite $R0 "rem Add a new TAP-Win32 virtual ethernet adapter$\r$\n"
@@ -282,10 +280,37 @@ Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
FileWrite $R0 "pause$\r$\n"
FileClose $R0
+ ; Check if we are running on a 64 bit system.
+ System::Call "kernel32::GetCurrentProcess() i .s"
+ System::Call "kernel32::IsWow64Process(i s, *i .r0)"
+ IntCmp $0 0 tap-32bit
+
+; tap-64bit:
+
+ DetailPrint "We are running on a 64-bit system."
+
+ SetOutPath "$INSTDIR\bin"
+ File "${BIN}\ti3790-amd64\tapinstall.exe"
+
+ SetOutPath "$INSTDIR\driver"
+ File "${HOME}\tap-win32\amd64\OemWin2k.inf"
+ File "${HOME}\tap-win32\amd64\${TAPDRV}"
+
+ goto tapend
+
+tap-32bit:
+
+ DetailPrint "We are running on a 32-bit system."
+
+ SetOutPath "$INSTDIR\bin"
+ File "${BIN}\ti3790-i386\tapinstall.exe"
+
SetOutPath "$INSTDIR\driver"
File "${HOME}\tap-win32\i386\OemWin2k.inf"
File "${HOME}\tap-win32\i386\${TAPDRV}"
+ tapend:
+
SectionEnd
Section "Add OpenVPN to PATH" SecAddPath
diff --git a/install-win32/prebuild b/install-win32/prebuild
index 2c0c172..6ee2c8a 100755
--- a/install-win32/prebuild
+++ b/install-win32/prebuild
@@ -30,7 +30,8 @@ DMALLOC=$H/dmalloc-5.4.2
# TAP binaries should be here: tap0801.sys and tapinstall.exe
# These must be built with MS DDK.
-TAPBIN=$H/tapbin-21
+TAPBIN=$H/tapbin-0804
+TAPBIN64=$H/tapbin64-0804
# u2d.c should exist here.
SCRIPTS=$IN/install-win32
@@ -94,7 +95,7 @@ $U2D <$IN/sample-config-files/server.conf >$OUT/install-win32/server.ovpn
cp $IN/install-win32/sample.ovpn $OUT/install-win32
$U2D <$IN/easy-rsa/1.0/openssl.cnf >$OUT/install-win32/openssl.cnf.sample
-echo BUILD tap-win32
+echo BUILD tap-win32 for x86 and amd64
mkdir $OUT/tap-win32
cp $IN/tap-win32/*.[ch] $OUT/tap-win32
@@ -105,11 +106,17 @@ cp $IN/tap-win32/SOURCES $OUT/tap-win32
mkdir $OUT/tap-win32/i386
cp $IN/tap-win32/i386/OemWin2k.inf $OUT/tap-win32/i386
cp $IN/tap-win32/i386/tap.cat $OUT/tap-win32/i386
-
cp $TAPBIN/tap0801.sys $OUT/tap-win32/i386
-mkdir $OUT/bin/ti3790
-cp $TAPBIN/tapinstall.exe $OUT/bin/ti3790
+mkdir $OUT/tap-win32/amd64
+cp $IN/tap-win32/amd64/OemWin2k.inf $OUT/tap-win32/amd64
+cp $IN/tap-win32/amd64/tap.cat $OUT/tap-win32/amd64
+cp $TAPBIN64/tap0801.sys $OUT/tap-win32/amd64
+
+mkdir $OUT/bin/ti3790-i386
+cp $TAPBIN/tapinstall.exe $OUT/bin/ti3790-i386
+mkdir $OUT/bin/ti3790-amd64
+cp $TAPBIN64/tapinstall.exe $OUT/bin/ti3790-amd64
echo BUILD service-win32