diff options
author | Magnus Hagander | 2009-01-21 09:25:11 +0000 |
---|---|---|
committer | Magnus Hagander | 2009-01-21 09:25:11 +0000 |
commit | 64b73853cf30f5a2cd1d3e0c705f222bf550b70f (patch) | |
tree | c1738a93e803f71132390b263bd56afab87dfba5 | |
parent | 5403a7851823fd2686a3f29d12208414eb6dd1b0 (diff) |
Install .mo files for NLS as <program>-<version>.mo when building with MSVC
as well. Same change as made earlier for autoconf builds.
Per Hiroshi Inoue.
-rw-r--r-- | src/tools/msvc/Install.pm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 56c2e044a9..9f59d6ca6c 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -52,7 +52,8 @@ sub Install $conf = "release"; } die "Could not find debug or release binaries" if ($conf eq ""); - print "Installing for $conf in $target\n"; + my $majorver = DetermineMajorVersion(); + print "Installing version $majorver for $conf in $target\n"; EnsureDirectories($target, 'bin','lib','share','share/timezonesets','share/contrib','doc', 'doc/contrib', 'symbols', 'share/tsearch_data'); @@ -101,7 +102,7 @@ sub Install CopyContribFiles($config,$target); CopyIncludeFiles($target); - GenerateNLSFiles($target,$config->{nls}) if ($config->{nls}); + GenerateNLSFiles($target,$config->{nls},$majorver) if ($config->{nls}); print "Installation complete.\n"; } @@ -457,6 +458,7 @@ sub GenerateNLSFiles { my $target = shift; my $nlspath = shift; + my $majorver = shift; print "Installing NLS files..."; EnsureDirectories($target, "share/locale"); @@ -481,7 +483,7 @@ sub GenerateNLSFiles EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES"); system( -"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm.mo\" $_" +"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\" $_" ) && croak("Could not run msgfmt on $dir\\$_"); print "."; @@ -490,6 +492,13 @@ sub GenerateNLSFiles print "\n"; } +sub DetermineMajorVersion +{ + my $f = read_file('src/include/pg_config.h') || croak 'Could not open pg_config.h'; + $f =~ /^#define\s+PG_MAJORVERSION\s+"([^"]+)"/m || croak 'Could not determine major version'; + return $1; +} + sub read_file { my $filename = shift; |