From 0fc372a3f6b3d4aa37efb23557a7ff362bd370f5 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Mon, 20 Apr 2009 08:38:00 +0000 Subject: [PATCH] Read nls.nk files to determine the proper name of NLS catalogs to install. Hiroshi Inoue, with minor modifications by me --- src/tools/msvc/Install.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 9f59d6ca6c..c9023760a5 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -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; -- 2.39.5