Changed regular expressions for configure parsing in windows build to properly parse PostgresPro and four-digit version

vbwagner · vbwagner · commit a1e70722459a · 2016-01-22T15:57:33.000+03:00
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -128,10 +128,10 @@ sub GenerateFiles
 	  || confess("Could not open configure.in for reading\n");
 	while (<C>)
 	{
-		if (/^AC_INIT\(\[PostgreSQL\], \[([^\]]+)\]/)
+		if (/^AC_INIT\(\[PostgresPro\], \[([^\]]+)\]/)
 		{
 			$self->{strver} = $1;
-			if ($self->{strver} !~ /^(\d+)\.(\d+)(?:\.(\d+))?/)
+			if ($self->{strver} !~ /^(\d+)\.(\d+)(?:\.(\d+))*/)
 			{
 				confess "Bad format of version: $self->{strver}\n";
 			}

Original file line number	Diff line number	Diff line change
`@@ -128,10 +128,10 @@ sub GenerateFiles`
`128`	`128`	`\|\| confess("Could not open configure.in for reading\n");`
`129`	`129`	`while (<C>)`
`130`	`130`	`{`
`131`		`- if (/^AC_INIT\(\[PostgreSQL\], \[([^\]]+)\]/)`
	`131`	`+ if (/^AC_INIT\(\[PostgresPro\], \[([^\]]+)\]/)`
`132`	`132`	`{`
`133`	`133`	`$self->{strver} = $1;`
`134`		`- if ($self->{strver} !~ /^(\d+)\.(\d+)(?:\.(\d+))?/)`
	`134`	`+ if ($self->{strver} !~ /^(\d+)\.(\d+)(?:\.(\d+))*/)`
`135`	`135`	`{`
`136`	`136`	`confess "Bad format of version: $self->{strver}\n";`
`137`	`137`	`}`