Second attempt at fixing MSVC build for 68ab8e8.

anarazel · anarazel · commit 326d73c86fda · 2016-03-21T10:49:45.000+01:00
After the previous fix in 6f1f34c 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
@@ -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};
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ my $frontend_extrasource = {`
`71`	`71`	`'src/bin/psql/psqlscan.l' ] };`
`72`	`72`	`my @frontend_excludes = (`
`73`	`73`	`'pgevent', 'pg_basebackup', 'pg_rewind', 'pg_dump',`
`74`		`- 'pg_xlogdump', 'scripts');`
	`74`	`+ 'pg_xlogdump', 'scripts', 'pgbench');`
`75`	`75`
`76`	`76`	`sub mkvcbuild`
`77`	`77`	`{`
`@@ -674,6 +674,11 @@ sub mkvcbuild`
`674`	`674`	`}`
`675`	`675`	`$pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c');`
`676`	`676`
	`677`	`+ # fix up pgbench once it's been set up`
	`678`	`+ # we're borrowing psqlscan.c from psql, so grab it from the correct place`
	`679`	`+ my $pgbench = AddSimpleFrontend('pgbench');`
	`680`	`+ $pgbench->ReplaceFile('src/bin/pgbench/psqlscan.c', 'src/bin/psql/psqlscan.c');`
	`681`	`+`
`677`	`682`	`$solution->Save();`
`678`	`683`	`return $solution->{vcver};`
`679`	`684`	`}`