Added maketapinstall.

Added makebin to build bin directory.

Modified openvpn.nsi to read distribution
files from the new locations.


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

6 files changed, 83 insertions, 15 deletions

diff --git a/install-win32/makebin b/install-win32/makebin
new file mode 100644
index 0000000..6c8cc31
--- /dev/null
+++ b/install-win32/makebin
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Assemble binaries into bin
+
+# get version.nsi definitions
+. autodefs/nsidefs.sh
+
+rm -rf bin
+mkdir bin
+
+# Get OpenVPN executable
+cp openvpn.exe bin
+strip bin/openvpn.exe
+
+# Get OpenVPN service
+cp service-win32/openvpnserv.exe bin
+strip bin/openvpnserv.exe
+
+# Get OpenSSL binaries
+for f in libeay32.dll libssl32.dll openssl.exe ; do
+  cp ../openssl-${OPENSSL_VERSION}/$f bin
+  strip bin/$f
+done
+
+# Get TAP drivers
+cp -a tap-win32/dist bin/driver
+
+# Get tapinstall
+mkdir bin/tapinstall
+mkdir bin/tapinstall/i386
+mkdir bin/tapinstall/amd64
+cp tapinstall/objfre_wnet_x86/i386/tapinstall.exe bin/tapinstall/i386
+cp tapinstall/objfre_wnet_amd64/amd64/tapinstall.exe bin/tapinstall/amd64
diff --git a/install-win32/maketap b/install-win32/maketap
index 583c5e0..0d72fff 100644
--- a/install-win32/maketap
+++ b/install-win32/maketap
@@ -3,7 +3,8 @@
 # Build the x86 and x64 versions of the TAP driver
 # Requires the Windows DDK
 
-DDKVER=3790
+# get version.nsi definitions
+. autodefs/nsidefs.sh
 
 cd tap-win32
 t=`pwd`
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
new file mode 100644
index 0000000..dff2f21
--- /dev/null
+++ b/install-win32/maketapinstall
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Build the x86 and x64 versions of the tapinstall tool
+# Requires the Windows DDK
+
+TISRC=../tapinstall
+
+# get version.nsi definitions
+. autodefs/nsidefs.sh
+
+rm -rf tapinstall
+cp -a $TISRC tapinstall
+
+cd tapinstall
+t=`pwd`
+cd ..
+
+for mode in "fre WNET" "fre AMD64 WNET"; do
+  echo '**********' build TAPINSTALL $mode
+  cmd //c "C:\\WINDDK\\$DDKVER\\bin\\setenv.bat C:\\WINDDK\\$DDKVER $mode && cd `perl install-win32/dosname.pl $t` && build -cef"
+done
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index 2ab2f54..fc059df 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -67,10 +67,10 @@
   !define MUI_FINISHPAGE_NOAUTOCLOSE
   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
   !define MUI_ABORTWARNING
-  !define MUI_ICON "${HOME}\install-win32\openvpn.ico"
-  !define MUI_UNICON "${HOME}\install-win32\openvpn.ico"
+  !define MUI_ICON "${HOME}\images\openvpn.ico"
+  !define MUI_UNICON "${HOME}\images\openvpn.ico"
   !define MUI_HEADERIMAGE
-  !define MUI_HEADERIMAGE_BITMAP "${HOME}\install-win32\install-whirl.bmp"
+  !define MUI_HEADERIMAGE_BITMAP "${HOME}\images\install-whirl.bmp"
   !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
   !insertmacro MUI_PAGE_WELCOME
@@ -117,7 +117,7 @@
   ;Things that need to be extracted on first (keep these lines before any File command!)
   ;Only useful for BZIP2 compression
   
-  ReserveFile "${HOME}\install-win32\install-whirl.bmp"
+  ReserveFile "${HOME}\images\install-whirl.bmp"
 
 ;--------------------------------
 ;Macros
@@ -219,7 +219,7 @@ Section "OpenVPN User-Space Components" SecOpenVPNUserSpace
   SetOverwrite on
   SetOutPath "$INSTDIR\bin"
 
-  File "${HOME}\openvpn.exe"
+  File "${BIN}\openvpn.exe"
 
 SectionEnd
 
@@ -251,7 +251,7 @@ Section "OpenVPN Service" SecService
   SetOverwrite on
 
   SetOutPath "$INSTDIR\bin"
-  File "${HOME}\service-win32\openvpnserv.exe"
+  File "${BIN}\openvpnserv.exe"
 
   SetOutPath "$INSTDIR\config"
 
@@ -324,12 +324,12 @@ Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
 
   SetOutPath "$INSTDIR\bin"
 
-  File "${BIN}\ti3790-amd64\tapinstall.exe"
+  File "${BIN}\tapinstall\amd64\tapinstall.exe"
 
   SetOutPath "$INSTDIR\driver"
 
-  File "${HOME}\tap-win32\amd64\OemWin2k.inf"
-  File "${HOME}\tap-win32\amd64\${TAPDRV}"
+  File "${BIN}\driver\amd64\OemWin2k.inf"
+  File "${BIN}\driver\amd64\${TAPDRV}"
 
 goto tapend
 
@@ -338,12 +338,12 @@ tap-32bit:
   DetailPrint "We are running on a 32-bit system."
 
   SetOutPath "$INSTDIR\bin"
-  File "${BIN}\ti3790-i386\tapinstall.exe"
+  File "${BIN}\tapinstall\i386\tapinstall.exe"
 
   SetOutPath "$INSTDIR\driver"
-  File "${HOME}\tap-win32\i386\OemWin2k.inf"
-  File "${HOME}\tap-win32\i386\tap.cat"
-  File "${HOME}\tap-win32\i386\${TAPDRV}"
+  File "${BIN}\driver\i386\OemWin2k.inf"
+  File "${BIN}\driver\i386\tap.cat"
+  File "${BIN}\driver\i386\${TAPDRV}"
 
   tapend:
 
@@ -467,7 +467,7 @@ Section -post
   SetOutPath $INSTDIR
   File "${HOME}\install-win32\INSTALL-win32.txt"
   File "${HOME}\install-win32\license.txt"
-  File "${HOME}\install-win32\openvpn.ico"
+  File "${HOME}\images\openvpn.ico"
 
   ; Create file association if requested
   SectionGetFlags ${SecFileAssociation} $R0
diff --git a/install-win32/version.nsi b/install-win32/version.nsi
index dad8a17..b371c29 100644
--- a/install-win32/version.nsi
+++ b/install-win32/version.nsi
@@ -10,3 +10,6 @@
 
 ; Service template files service.[ch] (get from Platform SDK)
 !define SVC_TEMPLATE "../svc-template"
+
+; DDK Version
+!define DDKVER 3790
diff --git a/install-win32/winconfig b/install-win32/winconfig
index bd2632f..583bd89 100644
--- a/install-win32/winconfig
+++ b/install-win32/winconfig
@@ -39,3 +39,13 @@ cd service-win32
 cp service.c service.c.orig
 cp service.h service.h.orig
 $PATCH <service.patch
+
+# build license file
+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
+cp INSTALL-win32.txt install-win32