Fix passing of PRODUCT_NAME to create_help.pl in windows build

vbwagner · vbwagner · commit dc6f98e0f760 · 2018-02-28T16:55:22.000+03:00
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -137,6 +137,9 @@ sub GenerateFiles
 		if ( /^PGPRO_VERSION="\$PACKAGE_VERSION\.(\d+)"/) {
 			$self->{pgprover} = $1;
 		}
+		if ( /^PRODUCT_NAME="([^"]+)"/ ) {
+			$self->{productname} = $1;
+		}
 	}
 	close($c);
 	confess "Unable to parse configure.in for all variables!"
@@ -426,6 +429,7 @@ sub GenerateFiles
 	{
 		print "Generating sql_help.h...\n";
 		chdir('src/bin/psql');
+		$ENV{"PRODUCT_NAME"} = $self->{productname};
 		system("perl create_help.pl ../../../doc/src/sgml/ref sql_help");
 		chdir('../../..');
 	}

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ sub GenerateFiles`
`137`	`137`	`if ( /^PGPRO_VERSION="\$PACKAGE_VERSION\.(\d+)"/) {`
`138`	`138`	`$self->{pgprover} = $1;`
`139`	`139`	`}`
	`140`	`+ if ( /^PRODUCT_NAME="([^"]+)"/ ) {`
	`141`	`+ $self->{productname} = $1;`
	`142`	`+ }`
`140`	`143`	`}`
`141`	`144`	`close($c);`
`142`	`145`	`confess "Unable to parse configure.in for all variables!"`
`@@ -426,6 +429,7 @@ sub GenerateFiles`
`426`	`429`	`{`
`427`	`430`	`print "Generating sql_help.h...\n";`
`428`	`431`	`chdir('src/bin/psql');`
	`432`	`+ $ENV{"PRODUCT_NAME"} = $self->{productname};`
`429`	`433`	`system("perl create_help.pl ../../../doc/src/sgml/ref sql_help");`
`430`	`434`	`chdir('../../..');`
`431`	`435`	`}`