mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MSVC builds must use a separate stamp file for copying generated headers.

Browse Source 
Commit bad51a49a tried to use a shortcut with just one stamp file
recording the actions of generating the pg_*_d.h headers and copying
them to the src/include/catalog/ directory.  That doesn't work in all
scenarios though, so we must use two stamp files like the Makefiles do.

John Naylor

Discussion: https://postgr.es/m/CANFyU944GdHr=puPbA78STnqr=8kgMrGF-VDHck6aO_-qNDALg@mail.gmail.com
This commit is contained in:
Tom Lane 2018-05-18 11:53:18 -04:00
parent 3dacd9bf32
commit a194106c1b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/msvc/Solution.pm
View File

@ -501,7 +501,12 @@ EOF
|| confess "Could not touch bki-stamp"; || confess "Could not touch bki-stamp";
close($f); close($f);
chdir('../../..'); chdir('../../..');
}
if (IsNewer(
'src/include/catalog/header-stamp',
'src/backend/catalog/bki-stamp'))
{
# Copy generated headers to include directory. # Copy generated headers to include directory.
opendir(my $dh, 'src/backend/catalog/') opendir(my $dh, 'src/backend/catalog/')
|| die "Can't opendir src/backend/catalog/ $!"; || die "Can't opendir src/backend/catalog/ $!";
@ -516,6 +521,9 @@ EOF
copyFile( copyFile(
'src/backend/catalog/schemapg.h', 'src/backend/catalog/schemapg.h',
'src/include/catalog/schemapg.h'); 'src/include/catalog/schemapg.h');
open(my $chs, '>', 'src/include/catalog/header-stamp')
|| confess "Could not touch header-stamp";
close($chs);
} }
open(my $o, '>', "doc/src/sgml/version.sgml") open(my $o, '>', "doc/src/sgml/version.sgml")

1
src/tools/msvc/clean.bat
View File

@ -49,6 +49,7 @@ if exist src\include\storage\lwlocknames.h del /q src\include\storage\lwlockname
if exist src\include\utils\probes.h del /q src\include\utils\probes.h if exist src\include\utils\probes.h del /q src\include\utils\probes.h
if exist src\include\catalog\schemapg.h del /q src\include\catalog\schemapg.h if exist src\include\catalog\schemapg.h del /q src\include\catalog\schemapg.h
if exist src\include\catalog\pg_*_d.h del /q src\include\catalog\pg_*_d.h if exist src\include\catalog\pg_*_d.h del /q src\include\catalog\pg_*_d.h
if exist src\include\catalog\header-stamp del /q src\include\catalog\header-stamp
if exist doc\src\sgml\version.sgml del /q doc\src\sgml\version.sgml if exist doc\src\sgml\version.sgml del /q doc\src\sgml\version.sgml
if %DIST%==1 if exist src\backend\utils\fmgroids.h del /q src\backend\utils\fmgroids.h if %DIST%==1 if exist src\backend\utils\fmgroids.h del /q src\backend\utils\fmgroids.h