Added options to version.nsi that allow prebuilt

amd64 tap/tapinstall to be specified.

Verify that tapinstall directory exists before trying
to build it.


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

3 files changed, 35 insertions, 4 deletions

diff --git a/install-win32/maketap b/install-win32/maketap
index 7d811f9..cd89eea 100644
--- a/install-win32/maketap
+++ b/install-win32/maketap
@@ -6,13 +6,23 @@
 # get version.nsi definitions
 . autodefs/nsidefs.sh
 
+amdtarget=""
+if [ -z "$TAP_BIN_AMD64" ]; then
+    amdtarget="fre AMD64 WNET"
+fi
+
 if [ -z "$DRVBINSRC" ] ; then
     cd tap-win32
     t=`pwd`
     cd ..
 
-    for mode in "fre WNET" "fre AMD64 WNET"; do
+    for mode in "fre WNET" "$amdtarget"; do
 	echo '**********' build TAP $mode
 	cmd //c "C:\\WINDDK\\$DDKVER\\bin\\setenv.bat C:\\WINDDK\\$DDKVER $mode && cd `perl install-win32/dosname.pl $t` && build -cef"
     done
 fi
+
+if [ -n "$TAP_BIN_AMD64" ]; then
+    mkdir -p $t/amd64
+    cp "$TAP_BIN_AMD64" $t/amd64
+fi
diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index e10f25c..5229a89 100644
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -8,6 +8,16 @@
 # get version.nsi definitions
 . autodefs/nsidefs.sh
 
+if ! [ -d "$TISRC" ] ; then
+    echo "$TISRC" NOT INSTALLED
+    exit 1
+fi
+
+amdtarget=""
+if [ -z "$TI_BIN_AMD64" ]; then
+    amdtarget="fre AMD64 WNET"
+fi
+
 if [ -z "$DRVBINSRC" ] ; then
     rm -rf tapinstall
     cp -a "$TISRC" tapinstall
@@ -16,8 +26,15 @@ if [ -z "$DRVBINSRC" ] ; then
     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"
+    for mode in "fre WNET" "$amdtarget"; do
+	if [ -n "$mode" ]; then
+	    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"
+	fi
     done
 fi
+
+if [ -n "$TI_BIN_AMD64" ]; then
+    mkdir -p $t/objfre_wnet_amd64/amd64
+    cp "$TI_BIN_AMD64" $t/objfre_wnet_amd64/amd64
+fi
diff --git a/install-win32/version.nsi b/install-win32/version.nsi
index 164dc19..3004aa4 100644
--- a/install-win32/version.nsi
+++ b/install-win32/version.nsi
@@ -3,6 +3,10 @@
 
 !define PRODUCT_VERSION "2.1_rc2c"
 
+# For now, use prebuilt AMD64 tap/tapinstall
+!define TAP_BIN_AMD64 "../amd64/tap/tap0901.sys"
+!define TI_BIN_AMD64  "../amd64/tapinstall/tapinstall.exe"
+
 # Copy installer to this directory when finished.
 # If undefined, don't copy installer after generation.
 !define INSTALLER_DEST	"/y"