summaryrefslogtreecommitdiffstats
path: root/install-win32/winconfig
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-04-25 21:37:49 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-04-25 21:37:49 +0000
commit657ecf14acc58a6d345341a5e36411bde5be9cd9 (patch)
tree4f5a53feb9c26991d822e2e606de511f57e32be6 /install-win32/winconfig
parent8edd43829bd7c47f5c5fa809b26a7de7ac4ded08 (diff)
downloadopenvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.tar.gz
openvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.tar.xz
openvpn-657ecf14acc58a6d345341a5e36411bde5be9cd9.zip
TAP driver now passes signing tests on Vista x64.
Added new settings to settings.in to better control build process. Removed some unneeded JYFIXMEs from source code. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1874 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'install-win32/winconfig')
-rw-r--r--install-win32/winconfig19
1 files changed, 11 insertions, 8 deletions
diff --git a/install-win32/winconfig b/install-win32/winconfig
index 7fd49cd..5f823a2 100644
--- a/install-win32/winconfig
+++ b/install-win32/winconfig
@@ -9,6 +9,7 @@ rm -rf autodefs
mkdir autodefs
MACRO="perl install-win32/macro.pl autodefs/defs.in"
+IFDEF="perl install-win32/ifdef.pl"
# silly vista security theatre
PATCH="/tmp/p.exe"
@@ -24,13 +25,11 @@ done
. autodefs/defs.sh
# configure tap driver sources
-$MACRO <tap-win32/SOURCES.in >tap-win32/SOURCES
-$MACRO <tap-win32/i386/OemWin2k.inf.in >tap-win32/i386/OemWin2k.inf
rm -rf tap-win32/amd64
mkdir tap-win32/amd64
-cp tap-win32/i386/OemWin2k.inf tap-win32/amd64
-cd tap-win32/amd64
-$PATCH <../inf64.patch
+$MACRO <tap-win32/SOURCES.in >tap-win32/SOURCES
+$MACRO <tap-win32/i386/OemWin2k.inf.in | $IFDEF >tap-win32/i386/OemWin2k.inf
+$MACRO <tap-win32/i386/OemWin2k.inf.in | $IFDEF -DAMD64 >tap-win32/amd64/OemWin2k.inf
# configure service
if [ -n "$SVC_TEMPLATE" ] ; then
@@ -47,7 +46,11 @@ cd $c
cat COPYING COPYRIGHT.GPL >install-win32/license.txt
# copy sample configuration files and docs
-cp sample-config-files/client.conf install-win32/client.ovpn
-cp sample-config-files/server.conf install-win32/server.ovpn
-cp easy-rsa/1.0/openssl.cnf install-win32/openssl.cnf.sample
+s=samples
+rm -rf $s
+mkdir $s
+cp sample-config-files/client.conf $s/client.$PRODUCT_FILE_EXT
+cp sample-config-files/server.conf $s/server.$PRODUCT_FILE_EXT
+cp install-win32/sample.ovpn $s/sample.$PRODUCT_FILE_EXT
+cp easy-rsa/1.0/openssl.cnf $s/openssl.cnf.sample
cp INSTALL-win32.txt install-win32