Install .mo files for NLS as <program>-<version>.mo when building with MSVC

mhagander · mhagander · commit 477c5d3b0de1 · 2009-01-21T09:25:11.000Z
as well. Same change as made earlier for autoconf builds.

Per Hiroshi Inoue.
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.31 2008/09/17 04:31:08 tgl Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.32 2009/01/21 09:25:11 mha Exp $
 #
 use strict;
 use warnings;
@@ -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;

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.31 2008/09/17 04:31:08 tgl Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.32 2009/01/21 09:25:11 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use strict;`
`9`	`9`	`use warnings;`
`@@ -52,7 +52,8 @@ sub Install`
`52`	`52`	`$conf = "release";`
`53`	`53`	`}`
`54`	`54`	`die "Could not find debug or release binaries" if ($conf eq "");`
`55`		`- print "Installing for $conf in $target\n";`
	`55`	`+ my $majorver = DetermineMajorVersion();`
	`56`	`+ print "Installing version $majorver for $conf in $target\n";`
`56`	`57`
`57`	`58`	`EnsureDirectories($target, 'bin','lib','share','share/timezonesets','share/contrib','doc',`
`58`	`59`	`'doc/contrib', 'symbols', 'share/tsearch_data');`
`@@ -101,7 +102,7 @@ sub Install`
`101`	`102`	`CopyContribFiles($config,$target);`
`102`	`103`	`CopyIncludeFiles($target);`
`103`	`104`
`104`		`- GenerateNLSFiles($target,$config->{nls}) if ($config->{nls});`
	`105`	`+ GenerateNLSFiles($target,$config->{nls},$majorver) if ($config->{nls});`
`105`	`106`
`106`	`107`	`print "Installation complete.\n";`
`107`	`108`	`}`
`@@ -457,6 +458,7 @@ sub GenerateNLSFiles`
`457`	`458`	`{`
`458`	`459`	`my $target = shift;`
`459`	`460`	`my $nlspath = shift;`
	`461`	`+ my $majorver = shift;`
`460`	`462`
`461`	`463`	`print "Installing NLS files...";`
`462`	`464`	`EnsureDirectories($target, "share/locale");`
`@@ -481,7 +483,7 @@ sub GenerateNLSFiles`
`481`	`483`
`482`	`484`	`EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES");`
`483`	`485`	`system(`
`484`		`-"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm.mo\" $_"`
	`486`	`+"\"$nlspath\\bin\\msgfmt\" -o \"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo\" $_"`
`485`	`487`	`)`
`486`	`488`	`&& croak("Could not run msgfmt on $dir\\$_");`
`487`	`489`	`print ".";`
`@@ -490,6 +492,13 @@ sub GenerateNLSFiles`
`490`	`492`	`print "\n";`
`491`	`493`	`}`
`492`	`494`
	`495`	`+sub DetermineMajorVersion`
	`496`	`+{`
	`497`	`+ my $f = read_file('src/include/pg_config.h') \|\| croak 'Could not open pg_config.h';`
	`498`	`+ $f =~ /^#define\s+PG_MAJORVERSION\s+"([^"]+)"/m \|\| croak 'Could not determine major version';`
	`499`	`+ return $1;`
	`500`	`+}`
	`501`	`+`
`493`	`502`	`sub read_file`
`494`	`503`	`{`
`495`	`504`	`my $filename = shift;`