database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Properly install dynloader.h on MSVC builds

Browse Source 
This will enable PL/Java to be cleanly compiled, as dynloader.h is a
requirement.

Report by Chapman Flack

Patch by Michael Paquier

Backpatch through 9.1
This commit is contained in:
Bruce Momjian 2016-01-19 23:30:28 -05:00
parent f744f395a5
commit 49d65e857c
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/fmgr/dfmgr.c
View File

@ -16,11 +16,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#ifndef WIN32_ONLY_COMPILER
#include "dynloader.h" #include "dynloader.h"
#else
#include "port/dynloader/win32.h"
#endif
#include "lib/stringinfo.h" #include "lib/stringinfo.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/dynamic_loader.h" #include "utils/dynamic_loader.h"

4
src/tools/msvc/Install.pm
View File

@ -492,7 +492,7 @@ sub CopyIncludeFiles
'Public headers', 'Public headers',
$target . '/include/', $target . '/include/',
'src/include/', 'postgres_ext.h', 'pg_config.h', 'pg_config_os.h', 'src/include/', 'postgres_ext.h', 'pg_config.h', 'pg_config_os.h',
'pg_config_manual.h'); 'dynloader.h', 'pg_config_manual.h');
lcopy('src/include/libpq/libpq-fs.h', $target . '/include/libpq/') lcopy('src/include/libpq/libpq-fs.h', $target . '/include/libpq/')
|| croak 'Could not copy libpq-fs.h'; || croak 'Could not copy libpq-fs.h';
@ -515,7 +515,7 @@ sub CopyIncludeFiles
CopyFiles( CopyFiles(
'Server headers', 'Server headers',
$target . '/include/server/', $target . '/include/server/',
'src/include/', 'pg_config.h', 'pg_config_os.h'); 'src/include/', 'pg_config.h', 'pg_config_os.h', 'dynloader.h');
CopyFiles( CopyFiles(
'Grammar header', 'Grammar header',
$target . '/include/server/parser/', $target . '/include/server/parser/',

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

@ -273,6 +273,14 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
'src\include\utils\fmgroids.h'); 'src\include\utils\fmgroids.h');
} }
if (IsNewer(
'src/include/dynloader.h',
'src/backend/port/dynloader/win32.h'))
{
copyFile('src/backend/port/dynloader/win32.h',
'src/include/dynloader.h');
}
if (IsNewer('src\include\utils\probes.h', 'src\backend\utils\probes.d')) if (IsNewer('src\include\utils\probes.h', 'src\backend\utils\probes.d'))
{ {
print "Generating probes.h...\n"; print "Generating probes.h...\n";

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

@ -24,6 +24,7 @@ REM Delete files created with GenerateFiles() in Solution.pm
if exist src\include\pg_config.h del /q src\include\pg_config.h if exist src\include\pg_config.h del /q src\include\pg_config.h
if exist src\include\pg_config_os.h del /q src\include\pg_config_os.h if exist src\include\pg_config_os.h del /q src\include\pg_config_os.h
if %DIST%==1 if exist src\backend\parser\gram.h del /q src\backend\parser\gram.h if %DIST%==1 if exist src\backend\parser\gram.h del /q src\backend\parser\gram.h
if exist src\include\dynloader.h del /q src\include\dynloader.h
if exist src\include\utils\errcodes.h del /q src\include\utils\errcodes.h if exist src\include\utils\errcodes.h del /q src\include\utils\errcodes.h
if exist src\include\utils\fmgroids.h del /q src\include\utils\fmgroids.h if exist src\include\utils\fmgroids.h del /q src\include\utils\fmgroids.h
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