aboutsummaryrefslogtreecommitdiff
path: root/install-win32
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-10-08 04:53:19 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-10-08 04:53:19 +0000
commit9ff2821b57c72cb5aa2916e9bbde5b2fd1f517d6 (patch)
treebd1396ab6a36c12b54777f908b225c832124a9e6 /install-win32
parentCopyright notice changed to reflect change in name of (diff)
downloadopenvpn-9ff2821b57c72cb5aa2916e9bbde5b2fd1f517d6.tar.xz
Version 2.1_rc13v2.1_rc13
Minor fixes to Windows build scripts. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3417 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32')
-rw-r--r--install-win32/doclean2
-rw-r--r--install-win32/getopenssl2
-rw-r--r--install-win32/maketap2
-rw-r--r--install-win32/maketapinstall2
-rw-r--r--install-win32/openssl/README.txt13
-rw-r--r--install-win32/settings.in9
6 files changed, 15 insertions, 15 deletions
diff --git a/install-win32/doclean b/install-win32/doclean
index c3a5c56..3f39543 100644
--- a/install-win32/doclean
+++ b/install-win32/doclean
@@ -3,4 +3,4 @@
# get version.nsi definitions
. autodefs/defs.sh
-[ "$CLEAN" = "yes" ] && rm -rf $GENOUT
+[ "$CLEAN" = "yes" ] && rm -rf $GENOUT && KEEPAUTODEFS="yes" ./doclean
diff --git a/install-win32/getopenssl b/install-win32/getopenssl
index 8c78f54..b772741 100644
--- a/install-win32/getopenssl
+++ b/install-win32/getopenssl
@@ -10,7 +10,7 @@ if [ -d "$OPENSSL_DIR" ] ; then
for f in libeay32.dll libssl32.dll out/openssl.exe ; do
cp $OPENSSL_DIR/$f $GENOUT/lib
if [ -z "$NO_STRIP" ]; then
- strip $GENOUT/lib/$f
+ strip $GENOUT/lib/`basename $f`
fi
done
mv $GENOUT/lib/openssl.exe $GENOUT/bin
diff --git a/install-win32/maketap b/install-win32/maketap
index 9263f68..94ee4d5 100644
--- a/install-win32/maketap
+++ b/install-win32/maketap
@@ -6,7 +6,7 @@
# get version.nsi definitions
. autodefs/defs.sh
-if [ -d "/c/WINDDK/$DDKVER" ] ; then
+if [ -n "$DDKVER" ] && [ -d "/c/WINDDK/$DDKVER" ] ; then
# common declarations for all DDK build targets
. install-win32/ddk-common
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index 11cb915..eae4471 100644
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -8,7 +8,7 @@
# get version.nsi definitions
. autodefs/defs.sh
-if [ -d "/c/WINDDK/$DDKVER" ] ; then
+if [ -n "$DDKVER" ] && [ -d "/c/WINDDK/$DDKVER" ] ; then
if ! [ -d "$TISRC" ] ; then
echo "$TISRC" NOT INSTALLED
diff --git a/install-win32/openssl/README.txt b/install-win32/openssl/README.txt
index cebd6ae..3afb0d4 100644
--- a/install-win32/openssl/README.txt
+++ b/install-win32/openssl/README.txt
@@ -2,21 +2,20 @@ Rebuild OpenSSL tarball without symbolic links, so
it can be extracted on Windows (run on Unix):
[download tarball and .asc sig]
- gpg --verify openssl-0.9.8h.tar.gz.asc
- tar xfz openssl-0.9.8h.tar.gz
- rm openssl-0.9.8h.tar.gz
- tar cfzh openssl-0.9.8h.tar.gz openssl-0.9.8h
+ gpg --verify openssl-0.9.8i.tar.gz.asc
+ tar xfz openssl-0.9.8i.tar.gz
+ tar cfzh openssl-0.9.8i-nolinks.tar.gz openssl-0.9.8i
To apply patch (in MSYS shell):
- cd /c/src/openssl-0.9.8h
+ cd /c/src/openssl-0.9.8i
patch -p1 <../21/install-win32/openssl/openssl098.patch
To build OpenSSL, open a command prompt window, then:
- cd \src\openssl-0.9.8h
+ cd \src\openssl-0.9.8i
ms\mw
To build a new patch (optional):
- diff -urw openssl-0.9.8h.orig openssl-0.9.8h | grep -v '^Only in' >openssl098.patch
+ diff -urw openssl-0.9.8i.orig openssl-0.9.8i | grep -v '^Only in' >openssl098.patch
diff --git a/install-win32/settings.in b/install-win32/settings.in
index 0e23226..f946ba9 100644
--- a/install-win32/settings.in
+++ b/install-win32/settings.in
@@ -22,10 +22,10 @@
;!define OPENVPN_XGUI_DIR "../ovpnxml"
# Prebuilt libraries. DMALLOC is optional.
-!define OPENSSL_DIR "../openssl-0.9.8h"
+!define OPENSSL_DIR "../openssl-0.9.8i"
!define LZO_DIR "../lzo-2.02"
!define PKCS11_HELPER_DIR "../pkcs11-helper"
-!define DMALLOC_DIR "../dmalloc-5.4.2"
+;!define DMALLOC_DIR "../dmalloc-5.4.2"
# Optional directory of prebuilt OpenVPN binary components,
# to be used as a source when build-from-scratch prerequisites
@@ -33,7 +33,8 @@
!define GENOUT_PREBUILT "../gen-prebuilt"
# tapinstall.exe source code.
-# Not needed if DRVBINSRC is defined.
+# Not needed if DRVBINSRC is defined
+# (or if using pre-built mode).
!define TISRC "../tapinstall"
# TAP Adapter parameters. Note that PRODUCT_TAP_ID is
@@ -44,7 +45,7 @@
!define PRODUCT_TAP_MINOR_VER 4
!define PRODUCT_TAP_RELDATE "01/22/2008"
-; visible=0x81 hidden=0x89
+# TAP adapter icon -- visible=0x81 or hidden=0x89
!define PRODUCT_TAP_CHARACTERISTICS 0x81
# Build debugging version of TAP driver