aboutsummaryrefslogtreecommitdiff
path: root/install-win32
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-01-22 23:52:08 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-01-22 23:52:08 +0000
commit44b3dcc8927c4bde391792a4632198cecba29f8d (patch)
tree73be6943affe1bc08a0bdff8c1befa59af463b90 /install-win32
parentIncremented version number to 2.1_rc4a. (diff)
downloadopenvpn-44b3dcc8927c4bde391792a4632198cecba29f8d.tar.xz
Upgraded TAP build scripts to use WDK 6001.17121
(Windows 2008 Server pre-RTM). Fixed typo of DESC_SecPKCS11DLLs in openvpn.nsi. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2651 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32')
-rw-r--r--install-win32/ddk-common2
-rw-r--r--install-win32/maketap7
-rw-r--r--install-win32/maketapinstall5
-rwxr-xr-xinstall-win32/openvpn.nsi2
-rw-r--r--install-win32/settings.in3
5 files changed, 14 insertions, 5 deletions
diff --git a/install-win32/ddk-common b/install-win32/ddk-common
new file mode 100644
index 0000000..b45c9e5
--- /dev/null
+++ b/install-win32/ddk-common
@@ -0,0 +1,2 @@
+# DDKs <= 5600 use "AMD64", later use "x64"
+x64_tag=x64
diff --git a/install-win32/maketap b/install-win32/maketap
index 3082db7..7fe643c 100644
--- a/install-win32/maketap
+++ b/install-win32/maketap
@@ -6,12 +6,15 @@
# get version.nsi definitions
. autodefs/defs.sh
+# common declarations for all DDK build targets
+. install-win32/ddk-common
+
if [ -n "$PRODUCT_TAP_DEBUG" ] ; then
w2ktarget="w2k c"
- amdtarget="chk AMD64 WNET"
+ amdtarget="chk $x64_tag WNET"
else
w2ktarget="w2k f"
- amdtarget="fre AMD64 WNET"
+ amdtarget="fre $x64_tag WNET"
fi
if [ -z "$DRVBINSRC" ] ; then
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index 781380e..8b06a99 100644
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -13,9 +13,12 @@ if ! [ -d "$TISRC" ] ; then
exit 1
fi
+# common declarations for all DDK build targets
+. install-win32/ddk-common
+
amdtarget=""
if [ -z "$TI_BIN_AMD64" ]; then
- amdtarget="fre AMD64 WNET"
+ amdtarget="fre $x64_tag WNET"
fi
if [ -z "$DRVBINSRC" ] ; then
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index 64d6f3a..1c0e00e 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -110,7 +110,7 @@
LangString DESC_SecOpenSSLDLLs ${LANG_ENGLISH} "Install OpenSSL DLLs locally (may be omitted if DLLs are already installed globally)."
- LangString DESC_SecPKCS11LDLLs ${LANG_ENGLISH} "Install PKCS#11 helper DLLs locally (may be omitted if DLLs are already installed globally)."
+ LangString DESC_SecPKCS11DLLs ${LANG_ENGLISH} "Install PKCS#11 helper DLLs locally (may be omitted if DLLs are already installed globally)."
LangString DESC_SecTAP ${LANG_ENGLISH} "Install/Upgrade the TAP-Win32 virtual device driver. Will not interfere with CIPE."
diff --git a/install-win32/settings.in b/install-win32/settings.in
index b233686..517236a 100644
--- a/install-win32/settings.in
+++ b/install-win32/settings.in
@@ -60,7 +60,8 @@
# DDK Version.
# DDK distribution is assumed to be in C:\WINDDK\${DDKVER}
-!define DDKVER 5600
+!define DDKVER 6001.17121
+!define DDKVER_MAJOR 6001
# Code Signing.
# If undefined, don't sign any files.