misc Windows build system changes

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1875 e7ae566f-a301-0410-adde-c780ea21d3b5

6 files changed, 24 insertions, 6 deletions

diff --git a/INSTALL b/INSTALL
index fa2e066..c269ac5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -267,9 +267,10 @@ TUN/TAP Driver Configuration:
   needs to be manually copied to /kernel/drv/sparcv9/ and then a 
   reconfiguration reboot. (boot -r).
 
-* Windows 2000 and XP
+* Windows 2000/XP/2003/Vista
 
-  See INSTALL-win32.txt for more info
+  See domake-win for building instructions.
+  See INSTALL-win32.txt for usage info.
 
  See the man page for more information, usage examples, and
  information on firewall configuration.
diff --git a/domake-win b/domake-win
index aa0b9e1..ebabac0 100644
--- a/domake-win
+++ b/domake-win
@@ -2,9 +2,10 @@
 
 # This is the master OpenVPN build script for Windows.
 # This script will build OpenVPN, the TAP driver, and
-# the installer from source.
+# the installer from source, targeting x86 on Windows
+# 2000 and higher, and x64 on Windows 2003 and higher.
 #
-# See top-devel build configuration in install-win32/version.nsi
+# See top-level build configuration in install-win32/settings.in
 #
 # Prerequisite installs:
 #
@@ -13,7 +14,12 @@
 # msysDTK   -- for perl
 # NSIS      -- for building installer
 # svn       -- for checking out source code (or TortoiseSVN)
-# Windows Driver Kit Vista RC1 (5600) -- for building TAP driver + tapinstall
+# Windows Driver Kit, Vista RC1 (5600) -- for building TAP driver + tapinstall
+#
+# Required libraries (must be prebuilt)
+#
+# OpenSSL   -- define OPENSSL_DIR in settings.in
+# LZO       -- define LZO_DIR in settings.in
 #
 # Required source code not included in OpenVPN SVN repository
 # because of MS licensing restrictions:
diff --git a/install-win32/dosname.pl b/install-win32/dosname.pl
index 5bfa6b9..a678e66 100644
--- a/install-win32/dosname.pl
+++ b/install-win32/dosname.pl
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+# convert a unix filename to a DOS filename
+
 while ($unixname = shift(@ARGV)) {
   $unixname =~ s#^/([a-zA-Z])(/|$)#$1:\\#g;
   $unixname =~ s#/#\\#g;
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index 1ebc220..781380e 100644
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -22,6 +22,10 @@ if [ -z "$DRVBINSRC" ] ; then
     rm -rf tapinstall
     cp -a "$TISRC" tapinstall
 
+    if [ -e tapinstall/sources.in ]; then
+	perl install-win32/ifdef.pl autodefs/defs.in <tapinstall/sources.in >tapinstall/sources
+    fi
+
     cd tapinstall
     t=`pwd`
     cd ..
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index 275cb19..5cbef9b 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -606,10 +606,12 @@ Section "Uninstall"
 
   RMDir /r $SMPROGRAMS\${PRODUCT_NAME}
 
-  Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe"
   !ifdef OPENVPN_GUI_DEFINED
     Delete "$INSTDIR\bin\${OPENVPN_GUI}"
+    Delete "$DESKTOP\${PRODUCT_NAME} GUI.lnk"
   !endif
+
+  Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}.exe"
   Delete "$INSTDIR\bin\${PRODUCT_UNIX_NAME}serv.exe"
   Delete "$INSTDIR\bin\libeay32.dll"
   Delete "$INSTDIR\bin\libssl32.dll"
diff --git a/install-win32/settings.in b/install-win32/settings.in
index f65a756..0840a56 100644
--- a/install-win32/settings.in
+++ b/install-win32/settings.in
@@ -47,6 +47,9 @@
 ; visible=0x81  hidden=0x89
 !define PRODUCT_TAP_CHARACTERISTICS     0x81
 
+# hide tap warning
+;!define PRODUCT_TAP_HIDE_WARN
+
 # Build debugging version of TAP driver
 ;!define PRODUCT_TAP_DEBUG