Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd5eaa63

Browse files
committed
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
1 parent9fbcf66 commitd5eaa63

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Mkvcbuild;
33
#
44
# Package that generates build files for msvc build
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.13 2007/06/12 18:31:28 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.14 2007/07/07 07:43:20 mha Exp $
77
#
88
use Carp;
99
use Win32;
@@ -185,19 +185,23 @@ sub mkvcbuild
185185

186186
my$psql = AddSimpleFrontend('psql', 1);
187187
$psql->AddIncludeDir('src\bin\pg_dump');
188+
$psql->AddIncludeDir('src\backend');
188189
$psql->AddFile('src\bin\psql\psqlscan.l');
189190

190191
my$pgdump = AddSimpleFrontend('pg_dump', 1);
192+
$pgdump->AddIncludeDir('src\backend');
191193
$pgdump->AddFile('src\bin\pg_dump\pg_dump.c');
192194
$pgdump->AddFile('src\bin\pg_dump\common.c');
193195
$pgdump->AddFile('src\bin\pg_dump\pg_dump_sort.c');
194196

195197
my$pgdumpall = AddSimpleFrontend('pg_dump', 1);
196198
$pgdumpall->{name} ='pg_dumpall';
199+
$pgdumpall->AddIncludeDir('src\backend');
197200
$pgdumpall->AddFile('src\bin\pg_dump\pg_dumpall.c');
198201

199202
my$pgrestore = AddSimpleFrontend('pg_dump', 1);
200203
$pgrestore->{name} ='pg_restore';
204+
$pgrestore->AddIncludeDir('src\backend');
201205
$pgrestore->AddFile('src\bin\pg_dump\pg_restore.c');
202206

203207
my$zic =$solution->AddProject('zic','exe','utils');
@@ -293,6 +297,7 @@ sub mkvcbuild
293297
if ($f =~/\/keywords\.o$/)
294298
{
295299
$proj->AddFile('src\backend\parser\keywords.c');
300+
$proj->AddIncludeDir('src\backend');
296301
}
297302
else
298303
{

‎src/tools/msvc/clean.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echooff
2-
REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.5 2007/06/12 11:07:34 mha Exp $
2+
REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.6 2007/07/0707:43:21 mha Exp $
33

44
setD=%CD%
55
ifexist ..\msvcifexist ..\..\..\srccd ..\..\..
@@ -16,7 +16,7 @@ call :del src\backend\win32ver.rc
1616
REM Delete files created with GenerateFiles() in Solution.pm
1717
call :del src\include\pg_config.h
1818
call :del src\include\pg_config_os.h
19-
call :del src\include\parser\parse.h
19+
call :del src\backend\parser\parse.h
2020
call :del src\include\utils\fmgroids.h
2121

2222
call :del src\backend\utils\fmgrtab.c

‎src/tools/msvc/pgbison.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echooff
2-
REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.6 2007/03/17 17:11:41 mha Exp $
2+
REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.7 2007/07/07 07:43:21 mha Exp $
33

44
ifexist src\tools\msvc\buildenv.batcall src\tools\msvc\buildenv.bat
55

@@ -11,7 +11,7 @@ if %BV% GEQ 2.2 goto bisonok
1111
goto nobison
1212
:bisonok
1313

14-
if"%1"=="src\backend\parser\gram.y"call :generate%1 src\backend\parser\gram.c src\include\parser\parse.h
14+
if"%1"=="src\backend\parser\gram.y"call :generate%1 src\backend\parser\gram.c src\backend\parser\parse.h
1515
if"%1"=="src\backend\bootstrap\bootparse.y"call :generate%1 src\backend\bootstrap\bootparse.c src\backend\bootstrap\bootstrap_tokens.h
1616
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
1717
if"%1"=="src\interfaces\ecpg\preproc\preproc.y"call :generate%1 src\interfaces\ecpg\preproc\preproc.c src\interfaces\ecpg\preproc\preproc.h

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp