Changed version name and tap driver ID

msvc-build.bat

@@ -1,4 +1,4 @@
-@echo off
+rem @echo off
 rem Copyright (C) 2008-2012 Alon Bar-Lev <[email protected]>
 
 @rem this stupid command needed for SetEnv.cmd to operate
@@ -10,14 +10,7 @@ call msvc-env.bat
 set PLATFORMS=Win32
 set CONFIGURATIONS=Release
 
-if exist "%VCHOME%\vcvarsall.bat" (
-	call "%VCHOME%\vcvarsall.bat"
-) else if exist "%VCHOME%\bin\vcvars32.bat" (
-	call "%VCHOME%\bin\vcvars32.bat"
-) else (
-	echo Cannot detect visual studio
-	goto error
-)
+call "%VCHOME%\bin\vcvars32.bat"
 
 msbuild /help > nul 2>&1
 if errorlevel 1 set DO_VCBUILD=1

msvc-dev.bat

@@ -4,14 +4,7 @@ setlocal
 cd /d %0\..
 call msvc-env.bat
 
-if exist "%VSHOME%\Common7\IDE\VCExpress.exe" (
-	set IDE=%VSHOME%\Common7\IDE\VCExpress.exe
-) else if exist "%VSHOME%\Common7\IDE\devenv.exe" (
-	set IDE=%VSHOME%\Common7\IDE\devenv.exe
-) else (
-	echo "Cannot detect visual studio environment"
-	goto error
-)
+set IDE=%VCHOME%\..\Common7\IDE\devenv.exe
 start "" "%IDE%" "%SOLUTION%"
 
 exit /b 0

msvc-env.bat

@@ -1,4 +1,4 @@
-@echo off
+rem @echo off
 
 rem Put your own settings at msvc-env-local.bat
 if exist msvc-env-local.bat call msvc-env-local.bat

version.m4

@@ -1,10 +1,10 @@
 dnl define the OpenVPN version
 define([PRODUCT_NAME], [OpenVPN])
 define([PRODUCT_TARNAME], [openvpn])
-define([PRODUCT_VERSION], [2.3.10])
+define([PRODUCT_VERSION], [2.3.10a_wasel])
 define([PRODUCT_BUGREPORT], [[email protected]])
-define([PRODUCT_VERSION_RESOURCE], [2,3,10,0])
+define([PRODUCT_VERSION_RESOURCE], [2,3,10a_wasel,0])
 dnl define the TAP version
-define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
+define([PRODUCT_TAP_WIN_COMPONENT_ID], [tapbvpn])
 define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])
 define([PRODUCT_TAP_WIN_MIN_MINOR], [9])