diff options
Diffstat (limited to 'src/tools/msvc/Install.pm')
| -rw-r--r-- | src/tools/msvc/Install.pm | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 0d0c46e18b..a11c59b89d 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -37,13 +37,15 @@ sub Install $| = 1; my $target = shift; + # if called from vcregress, the config will be passed to us # so no need to re-include these our $config = shift; unless ($config) { + # suppress warning about harmless redeclaration of $config - no warnings 'misc'; + no warnings 'misc'; require "config_default.pl"; require "config.pl" if (-f "config.pl"); } @@ -83,11 +85,15 @@ sub Install "src"); CopySetOfFiles('config files', $sample_files, $target . '/share/'); CopyFiles( - 'Import libraries', $target . '/lib/', - "$conf\\", "postgres\\postgres.lib", - "libpq\\libpq.lib", "libecpg\\libecpg.lib", + 'Import libraries', + $target . '/lib/', + "$conf\\", + "postgres\\postgres.lib", + "libpq\\libpq.lib", + "libecpg\\libecpg.lib", "libpgcommon\\libpgcommon.lib", - "libpgport\\libpgport.lib", "libpgtypes\\libpgtypes.lib", + "libpgport\\libpgport.lib", + "libpgtypes\\libpgtypes.lib", "libecpg_compat\\libecpg_compat.lib"); CopySetOfFiles( 'timezone names', @@ -490,11 +496,10 @@ sub CopyIncludeFiles 'include/internal/libpq', 'include/server', 'include/server/parser'); CopyFiles( - 'Public headers', - $target . '/include/', - 'src/include/', 'postgres_ext.h', - 'pg_config.h', 'pg_config_ext.h', 'pg_config_os.h', - 'pg_config_manual.h'); + 'Public headers', $target . '/include/', + 'src/include/', 'postgres_ext.h', + 'pg_config.h', 'pg_config_ext.h', + 'pg_config_os.h', 'pg_config_manual.h'); lcopy('src/include/libpq/libpq-fs.h', $target . '/include/libpq/') || croak 'Could not copy libpq-fs.h'; |