Second attempt at fixing MSVC build for 68ab8e8ba4a471d9.

After the previous fix in 6f1f34c9 msvc ended up looking for psqlscan.c
in the wrong directory.

David's fix just forces the path to be adjusted. That's not a
particularly pretty fix, but it hopefully will make the buildfarm green
again.

Author: David Rowley
Discussion: CAKJS1f_9CCi_t+LEgV5GWoCj3wjavcMoDc5qfcf_A0UwpQoPoA@mail.gmail.com

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 3d929e6a09a58a78384c928856ce25c7b69ceba7..ab65fa3085eb01d03e9901677cc9ec623aeee898 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -71,7 +71,7 @@ my $frontend_extrasource = {
        'src/bin/psql/psqlscan.l' ] };
 my @frontend_excludes = (
    'pgevent',     'pg_basebackup', 'pg_rewind', 'pg_dump',
-   'pg_xlogdump', 'scripts');
+   'pg_xlogdump', 'scripts',       'pgbench');
 
 sub mkvcbuild
 {
@@ -674,6 +674,11 @@ sub mkvcbuild
    }
    $pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c');
 
+   # fix up pgbench once it's been set up
+   # we're borrowing psqlscan.c from psql, so grab it from the correct place
+   my $pgbench = AddSimpleFrontend('pgbench');
+   $pgbench->ReplaceFile('src/bin/pgbench/psqlscan.c', 'src/bin/psql/psqlscan.c');
+
    $solution->Save();
    return $solution->{vcver};
 }