From ee313a978f7aa9eff8163e3f6be3a59b12e03fe0 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Tue, 27 Feb 2007 23:29:17 +0000
Subject: Renamed TAP-Win32 driver from tap0801.sys to tap0901.sys to reflect
 the fact that Vista has blacklisted the tap0801.sys file name due to previous
 compatibility issues which have now been resolved.  TAP-Win32 major/minor
 version number is now 9/1.

Windows installer will delete a previously installed
tap0801.sys TAP driver before installing tap0901.sys.

Added code to Windows installer to fail gracefully on 64 bit
installs until 64-bit TAP driver issues can be resolved.

Added code to Windows installer to fail gracefully on
versions of Windows which are not explicitly supported.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1746 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 install-win32/prebuild | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'install-win32/prebuild')

diff --git a/install-win32/prebuild b/install-win32/prebuild
index b4cb00b..95b93de 100755
--- a/install-win32/prebuild
+++ b/install-win32/prebuild
@@ -28,11 +28,10 @@ LZO=$H/lzo-2.02
 # dmalloc.
 DMALLOC=$H/dmalloc-5.4.2
 
-# TAP binaries should be here: tap0801.sys and tapinstall.exe
+# TAP binaries should be here: tap0901.sys and tapinstall.exe
 # These must be built with MS DDK.
-TAPBIN=$H/tapbin-0804
-TAPBIN64=$H/tapbin64-0801
-#TAPBIN64=$H/tapbin64-0804
+TAPBIN=$H/tapbin-0901
+#TAPBIN64=$H/tapbin64-0901
 
 # u2d.c should exist here.
 SCRIPTS=$IN/install-win32
@@ -86,6 +85,7 @@ mkdir $OUT/install-win32
 
 cp $IN/install-win32/openvpn.nsi $OUT/install-win32
 cp $IN/install-win32/setpath.nsi $OUT/install-win32
+cp $IN/install-win32/GetWindowsVersion.nsi $OUT/install-win32
 cp $IN/images/install-whirl.bmp $OUT/install-win32
 cp $IN/images/openvpn.ico $OUT/install-win32
 cp $IN/INSTALL-win32.txt $OUT/install-win32
@@ -107,18 +107,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
+cp $TAPBIN/tap0901.sys $OUT/tap-win32/i386
 
-mkdir $OUT/tap-win32/amd64
-cp $TAPBIN64/OemWin2k.inf $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/tap-win32/amd64
+#cp $TAPBIN64/OemWin2k.inf $OUT/tap-win32/amd64
+#cp $IN/tap-win32/amd64/tap.cat $OUT/tap-win32/amd64
+#cp $TAPBIN64/tap0901.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
+#mkdir $OUT/bin/ti3790-amd64
+#cp $TAPBIN64/tapinstall.exe $OUT/bin/ti3790-amd64
 
 echo BUILD service-win32
 
@@ -133,7 +132,11 @@ cp $OUT/service-win32/service.h $OUT/service-win32/service.h.orig
 cp $OUT/service-win32/service.c $OUT/service-win32/service.c.orig
 
 pushd $OUT/service-win32
-patch <service.patch
+
+# Vista security theatre
+cp `which patch` p.exe
+
+./p <service.patch
 popd
 
 echo BUILD easy-rsa
-- 
cgit v1.2.3