MSVC: Rebuild spiexceptions.h when out of date.

nmisch · nmisch · commit ad083e4ede52 · 2017-11-12T18:43:45.000-08:00
Also, add a warning to catch future instances of naming a nonexistent
file as a prerequisite.  Back-patch to 9.3 (all supported versions).
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -87,6 +87,7 @@ sub DeterminePlatform
 sub IsNewer
 {
 	my ($newfile, $oldfile) = @_;
+	-e $oldfile or warn "source file \"$oldfile\" does not exist";
 	if (   $oldfile ne 'src/tools/msvc/config.pl'
 		&& $oldfile ne 'src/tools/msvc/config_default.pl')
 	{
@@ -321,7 +322,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
 	if ($self->{options}->{python}
 		&& IsNewer(
 			'src/pl/plpython/spiexceptions.h',
-			'src/include/backend/errcodes.txt'))
+			'src/backend/utils/errcodes.txt'))
 	{
 		print "Generating spiexceptions.h...\n";
 		system(

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ sub DeterminePlatform`
`87`	`87`	`sub IsNewer`
`88`	`88`	`{`
`89`	`89`	`my ($newfile, $oldfile) = @_;`
	`90`	`+ -e $oldfile or warn "source file \"$oldfile\" does not exist";`
`90`	`91`	`if ( $oldfile ne 'src/tools/msvc/config.pl'`
`91`	`92`	`&& $oldfile ne 'src/tools/msvc/config_default.pl')`
`92`	`93`	`{`
`@@ -321,7 +322,7 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`321`	`322`	`if ($self->{options}->{python}`
`322`	`323`	`&& IsNewer(`
`323`	`324`	`'src/pl/plpython/spiexceptions.h',`
`324`		`- 'src/include/backend/errcodes.txt'))`
	`325`	`+ 'src/backend/utils/errcodes.txt'))`
`325`	`326`	`{`
`326`	`327`	`print "Generating spiexceptions.h...\n";`
`327`	`328`	`system(`