Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e6e7818

Browse files
committed
msvc build actually needs Bison 2.2 or later, not 2.1. Or 1.875 as before.
1 parent 15f4842 commit e6e7818

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

doc/src/sgml/install-win32.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.33 2007/03/17 14:30:00 mha Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.34 2007/03/17 17:11:41 mha Exp $ -->
22

33
<chapter id="install-win32">
44
<title>Installation on <productname>Windows</productname></title>
@@ -100,8 +100,8 @@
100100
<productname>Flex</productname></term>
101101
<listitem><para>
102102
Bison and Flex are required to build from CVS, but not required when
103-
building from a release file. Note that Bison version 2.0 will not
104-
work, but both earlier and later versions do. Bison and Flex can be
103+
building from a release file. Note that only Bison 1.875 or versions
104+
2.2 and later will work. Bison and Flex can be
105105
downloaded from <ulink url="http://gnuwin32.sourceforge.net"></>.
106106
</para></listitem>
107107
</varlistentry>

src/tools/msvc/pgbison.bat

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
@echo off
2-
REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.5 2007/03/17 14:01:01 mha Exp $
2+
REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.6 2007/03/17 17:11:41 mha Exp $
33

44
if exist src\tools\msvc\buildenv.bat call src\tools\msvc\buildenv.bat
55

66
SET BV=
77
for /F "tokens=4 usebackq" %%f in (`bison -V`) do if "!BV!"=="" SET BV=%%f
88
if "%BV%"=="" goto novarexp
9-
if %BV% LSS 1.875 goto nobison
10-
if %BV% EQU 2.1 goto nobison
9+
if %BV% EQU 1.875 goto bisonok
10+
if %BV% GEQ 2.2 goto bisonok
11+
goto nobison
12+
:bisonok
1113

1214
if "%1" == "src\backend\parser\gram.y" call :generate %1 src\backend\parser\gram.c src\include\parser\parse.h
1315
if "%1" == "src\backend\bootstrap\bootparse.y" call :generate %1 src\backend\bootstrap\bootparse.c src\backend\bootstrap\bootstrap_tokens.h

0 commit comments

Comments
 (0)