Move parse.h into src/backend on msvc, which is where it is on Unix.

Fixes builds from tarballs where the file is pre-generated.

Yoshiyuki Asaba

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 4db38dcc347b1350ccb7de0ee935b187910b4cb3..3d760f9060826571e69a84d9c57ee5b1b72a3dbd 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -185,19 +185,23 @@ sub mkvcbuild
 
     my $psql = AddSimpleFrontend('psql', 1);
     $psql->AddIncludeDir('src\bin\pg_dump');
+    $psql->AddIncludeDir('src\backend');
     $psql->AddFile('src\bin\psql\psqlscan.l');
 
     my $pgdump = AddSimpleFrontend('pg_dump', 1);
+    $pgdump->AddIncludeDir('src\backend');
     $pgdump->AddFile('src\bin\pg_dump\pg_dump.c');
     $pgdump->AddFile('src\bin\pg_dump\common.c');
     $pgdump->AddFile('src\bin\pg_dump\pg_dump_sort.c');
 
     my $pgdumpall = AddSimpleFrontend('pg_dump', 1);
     $pgdumpall->{name} = 'pg_dumpall';
+    $pgdumpall->AddIncludeDir('src\backend');
     $pgdumpall->AddFile('src\bin\pg_dump\pg_dumpall.c');
 
     my $pgrestore = AddSimpleFrontend('pg_dump', 1);
     $pgrestore->{name} = 'pg_restore';
+    $pgrestore->AddIncludeDir('src\backend');
     $pgrestore->AddFile('src\bin\pg_dump\pg_restore.c');
 
     my $zic = $solution->AddProject('zic','exe','utils');
@@ -293,6 +297,7 @@ sub mkvcbuild
             if ($f =~ /\/keywords\.o$/)
             {
                 $proj->AddFile('src\backend\parser\keywords.c');
+                $proj->AddIncludeDir('src\backend');
             }
             else
             {

diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
index 56171109d947d22c9b67a8dbf6f4af0913d2ce1f..ca42c70d50774f0ffbe107c5fef7f56feec09779 100755 (executable)
--- a/src/tools/msvc/clean.bat
+++ b/src/tools/msvc/clean.bat
@@ -16,7 +16,7 @@ call :del src\backend\win32ver.rc
 REM Delete files created with GenerateFiles() in Solution.pm
 call :del src\include\pg_config.h
 call :del src\include\pg_config_os.h
-call :del src\include\parser\parse.h
+call :del src\backend\parser\parse.h
 call :del src\include\utils\fmgroids.h
 
 call :del src\backend\utils\fmgrtab.c

diff --git a/src/tools/msvc/pgbison.bat b/src/tools/msvc/pgbison.bat
index f6640d9612cbdf00fef5196c434affca7c67de00..dcd6fd4ec480f4514ac27d16ee1d0818b882ba44 100755 (executable)
--- a/src/tools/msvc/pgbison.bat
+++ b/src/tools/msvc/pgbison.bat
@@ -11,7 +11,7 @@ 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\parser\gram.y" call :generate %1 src\backend\parser\gram.c src\backend\parser\parse.h
 if "%1" == "src\backend\bootstrap\bootparse.y" call :generate %1 src\backend\bootstrap\bootparse.c src\backend\bootstrap\bootstrap_tokens.h
 if "%1" == "src\pl\plpgsql\src\gram.y" call :generate %1 src\pl\plpgsql\src\pl_gram.c src\pl\plpgsql\src\pl.tab.h
 if "%1" == "src\interfaces\ecpg\preproc\preproc.y" call :generate %1 src\interfaces\ecpg\preproc\preproc.c src\interfaces\ecpg\preproc\preproc.h