Don't build special x64 version of tapinstall.exe

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

diff --git a/install-win32/makebin b/install-win32/makebin
index 671fb3bdab6baecb2c0fea349e0cbee59d2d762c..308ec5ce6ec0ed50f7c2501c473c1313851c6d8a 100644 (file)
--- a/install-win32/makebin
+++ b/install-win32/makebin
@@ -31,9 +31,9 @@ if [ -z "$DRVBINSRC" ] ; then
     # 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
+    #mkdir bin/tapinstall/amd64
+    #cp tapinstall/objfre_wnet_amd64/amd64/tapinstall.exe bin/tapinstall/amd64
 else
     cp -a $DRVBINSRC/driver bin/driver
     cp -a $DRVBINSRC/tapinstall bin/tapinstall

diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall
index e10f25c9efdab79c359381ed64a5a041d56c0d4f..cbbfeaa2b5d0d08d52770658b4595dc4bf2adb5b 100644 (file)
--- a/install-win32/maketapinstall
+++ b/install-win32/maketapinstall
@@ -16,7 +16,8 @@ if [ -z "$DRVBINSRC" ] ; then
     t=`pwd`
     cd ..
 
-    for mode in "fre WNET" "fre AMD64 WNET"; do
+    # Add "fre AMD64 WNET" to below line to also build X64 version
+    for mode in "fre 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 fc059df4ae22031146878b3a8c6bb809d03c0e34..2926ca3920747389f5b71f3cf1ce84d21360808f 100755 (executable)
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -322,13 +322,9 @@ Section "TAP-Win32 Virtual Ethernet Adapter" SecTAP
 
   DetailPrint "We are running on a 64-bit system."
 
-  SetOutPath "$INSTDIR\bin"
-
-  File "${BIN}\tapinstall\amd64\tapinstall.exe"
-
   SetOutPath "$INSTDIR\driver"
-
   File "${BIN}\driver\amd64\OemWin2k.inf"
+  File "${BIN}\driver\amd64\tap.cat"
   File "${BIN}\driver\amd64\${TAPDRV}"
 
 goto tapend
@@ -337,15 +333,16 @@ tap-32bit:
 
   DetailPrint "We are running on a 32-bit system."
 
-  SetOutPath "$INSTDIR\bin"
-  File "${BIN}\tapinstall\i386\tapinstall.exe"
-
   SetOutPath "$INSTDIR\driver"
   File "${BIN}\driver\i386\OemWin2k.inf"
   File "${BIN}\driver\i386\tap.cat"
   File "${BIN}\driver\i386\${TAPDRV}"
 
-  tapend:
+tapend:
+
+  ; Use x86 tapinstall for both x86 and x64
+  SetOutPath "$INSTDIR\bin"
+  File "${BIN}\tapinstall\i386\tapinstall.exe"
 
 SectionEnd
 

diff --git a/install-win32/version.nsi b/install-win32/version.nsi
index 164dc195eef889636736d0f147cc458c725b5e00..9976ad7b50298b97a4ccf2c2ff389a2198a75bfa 100644 (file)
--- a/install-win32/version.nsi
+++ b/install-win32/version.nsi
@@ -1,7 +1,7 @@
 # Version numbers, settings, and dependencies
 # for Windows OpenVPN installer.
 
-!define PRODUCT_VERSION "2.1_rc2c"
+!define PRODUCT_VERSION "2.1_rc2e"
 
 # Copy installer to this directory when finished.
 # If undefined, don't copy installer after generation.