aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-03-08 09:37:45 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2007-03-08 09:37:45 +0000
commit7f61d53b97261ed5d2d3f8472810e42176ad44b3 (patch)
treeae30adb6c063951ca6c238a3b073f9b74ac0698b
parentWindows TAP driver license text changes. (diff)
downloadopenvpn-7f61d53b97261ed5d2d3f8472810e42176ad44b3.tar.xz
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
-rw-r--r--install-win32/makebin4
-rw-r--r--install-win32/maketapinstall3
-rwxr-xr-xinstall-win32/openvpn.nsi15
-rw-r--r--install-win32/version.nsi2
4 files changed, 11 insertions, 13 deletions
diff --git a/install-win32/makebin b/install-win32/makebin
index 671fb3b..308ec5c 100644
--- 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 e10f25c..cbbfeaa 100644
--- 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 fc059df..2926ca3 100755
--- 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 164dc19..9976ad7 100644
--- 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.