Read nls.nk files to determine the proper name of NLS catalogs to install.

mhagander · mhagander · commit 02dec25003c7 · 2009-04-20T08:38:00.000Z
Hiroshi Inoue, with minor modifications by me
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -3,7 +3,7 @@ package Install;
 #
 # Package that provides 'make install' functionality for msvc builds
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.32 2009/01/21 09:25:11 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.33 2009/04/20 08:38:00 mha Exp $
 #
 use strict;
 use warnings;
@@ -470,11 +470,10 @@ sub GenerateNLSFiles
 				  }, "src");
     foreach (@flist)
     {
+        my $prgm = DetermineCatalogName($_);
         s/nls.mk/po/;
         my $dir = $_;
         next unless ($dir =~ /([^\/]+)\/po$/);
-        my $prgm = $1;
-        $prgm = 'postgres' if ($prgm eq 'backend');
         foreach (glob("$dir/*.po"))
         {
             my $lang;
@@ -499,6 +498,15 @@ sub DetermineMajorVersion
     return $1;
 }
 
+sub DetermineCatalogName
+{
+    my $filename = shift;
+
+    my $f = read_file($filename) || croak "Could not open $filename";
+    $f =~ /CATALOG_NAME\s*\:?=\s*(\S+)/m || croak "Could not determine catalog name in $filename";
+    return $1;
+}
+
 sub read_file
 {
     my $filename = shift;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Install;`
`3`	`3`	`#`
`4`	`4`	`# Package that provides 'make install' functionality for msvc builds`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.32 2009/01/21 09:25:11 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.33 2009/04/20 08:38:00 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use strict;`
`9`	`9`	`use warnings;`
`@@ -470,11 +470,10 @@ sub GenerateNLSFiles`
`470`	`470`	`}, "src");`
`471`	`471`	`foreach (@flist)`
`472`	`472`	`{`
	`473`	`+ my $prgm = DetermineCatalogName($_);`
`473`	`474`	`s/nls.mk/po/;`
`474`	`475`	`my $dir = $_;`
`475`	`476`	`next unless ($dir =~ /([^\/]+)\/po$/);`
`476`		`- my $prgm = $1;`
`477`		`- $prgm = 'postgres' if ($prgm eq 'backend');`
`478`	`477`	`foreach (glob("$dir/*.po"))`
`479`	`478`	`{`
`480`	`479`	`my $lang;`
`@@ -499,6 +498,15 @@ sub DetermineMajorVersion`
`499`	`498`	`return $1;`
`500`	`499`	`}`
`501`	`500`
	`501`	`+sub DetermineCatalogName`
	`502`	`+{`
	`503`	`+ my $filename = shift;`
	`504`	`+`
	`505`	`+ my $f = read_file($filename) \|\| croak "Could not open $filename";`
	`506`	`+ $f =~ /CATALOG_NAME\s\:?=\s(\S+)/m \|\| croak "Could not determine catalog name in $filename";`
	`507`	`+ return $1;`
	`508`	`+}`
	`509`	`+`
`502`	`510`	`sub read_file`
`503`	`511`	`{`
`504`	`512`	`my $filename = shift;`