msvc build actually needs Bison 2.2 or later, not 2.1. Or 1.875 as before.

diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index 64df05f5220222a977bc32d3e99fcce5db17c09e..898f833b4b03085d1313750a693076c46fa30091 100644 (file)
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -100,8 +100,8 @@
       <productname>Flex</productname></term>
      <listitem><para>
       Bison and Flex are required to build from CVS, but not required when
-      building from a release file. Note that Bison version 2.0 will not
-      work, but both earlier and later versions do. Bison and Flex can be
+      building from a release file. Note that only Bison 1.875 or versions
+      2.2 and later will work. Bison and Flex can be
       downloaded from <ulink url="http://gnuwin32.sourceforge.net"></>.
      </para></listitem>
     </varlistentry>

diff --git a/src/tools/msvc/pgbison.bat b/src/tools/msvc/pgbison.bat
index ca3580997f7dab6ecc2e10695a3c960a8e44cb3a..f6640d9612cbdf00fef5196c434affca7c67de00 100755 (executable)
--- a/src/tools/msvc/pgbison.bat
+++ b/src/tools/msvc/pgbison.bat
@@ -6,8 +6,10 @@ if exist src\tools\msvc\buildenv.bat call src\tools\msvc\buildenv.bat
 SET BV=
 for /F "tokens=4 usebackq" %%f in (`bison -V`) do if "!BV!"=="" SET BV=%%f
 if "%BV%"=="" goto novarexp
-if %BV% LSS 1.875 goto nobison
-if %BV% EQU 2.1 goto nobison
+if %BV% EQU 1.875 goto bisonok
+if %BV% GEQ 2.2 goto bisonok
+goto nobison
+:bisonok
 
 if "%1" == "src\backend\parser\gram.y" call :generate %1 src\backend\parser\gram.c src\include\parser\parse.h
 if "%1" == "src\backend\bootstrap\bootparse.y" call :generate %1 src\backend\bootstrap\bootparse.c src\backend\bootstrap\bootstrap_tokens.h