Commit34bda20

committed

Properly install dynloader.h on MSVC builds

This will enable PL/Java to be cleanly compiled, as dynloader.h is arequirement.Report by Chapman FlackPatch by Michael PaquierBackpatch through 9.1

1 parent77a1863 commit34bda20Copy full SHA for 34bda20

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 0 additions & 4 deletions

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ sub CopyIncludeFiles`
`582`	`582`	`'Public headers',$target .'/include/',`
`583`	`583`	`'src/include/','postgres_ext.h',`
`584`	`584`	`'pg_config.h','pg_config_ext.h',`
`585`		`-'pg_config_os.h','pg_config_manual.h');`
	`585`	`+'pg_config_os.h','dynloader.h','pg_config_manual.h');`
`586`	`586`	`lcopy('src/include/libpq/libpq-fs.h',$target .'/include/libpq/')`
`587`	`587`	`\|\| croak'Could not copy libpq-fs.h';`
`588`	`588`
`@@ -605,7 +605,8 @@ sub CopyIncludeFiles`
`605`	`605`	`CopyFiles(`
`606`	`606`	`'Server headers',`
`607`	`607`	`$target .'/include/server/',`
`608`		`-'src/include/','pg_config.h','pg_config_ext.h','pg_config_os.h');`
	`608`	`+'src/include/','pg_config.h','pg_config_ext.h','pg_config_os.h',`
	`609`	`+'dynloader.h');`
`609`	`610`	`CopyFiles(`
`610`	`611`	`'Grammar header',`
`611`	`612`	`$target .'/include/server/parser/',`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,14 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`285`	`285`	`'src/include/utils/fmgroids.h');`
`286`	`286`	`}`
`287`	`287`
	`288`	`+if (IsNewer(`
	`289`	`+'src/include/dynloader.h',`
	`290`	`+'src/backend/port/dynloader/win32.h'))`
	`291`	`+{`
	`292`	`+copyFile('src/backend/port/dynloader/win32.h',`
	`293`	`+'src/include/dynloader.h');`
	`294`	`+}`
	`295`	`+`
`288`	`296`	`if (IsNewer('src/include/utils/probes.h','src/backend/utils/probes.d'))`
`289`	`297`	`{`
`290`	`298`	`print"Generating probes.h...\n";`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ REM Delete files created with GenerateFiles() in Solution.pm`
`38`	`38`	`ifexist src\include\pg_config.hdel /q src\include\pg_config.h`
`39`	`39`	`ifexist src\include\pg_config_ext.hdel /q src\include\pg_config_ext.h`
`40`	`40`	`ifexist src\include\pg_config_os.hdel /q src\include\pg_config_os.h`
	`41`	`+ifexist src\include\dynloader.hdel /q src\include\dynloader.h`
`41`	`42`	`if%DIST%==1ifexist src\backend\parser\gram.hdel /q src\backend\parser\gram.h`
`42`	`43`	`ifexist src\include\utils\errcodes.hdel /q src\include\utils\errcodes.h`
`43`	`44`	`ifexist src\include\utils\fmgroids.hdel /q src\include\utils\fmgroids.h`

Comments

(0)