x64 merge modules are not mandatory, only warn when they are missing.

1 files changed, 11 insertions, 5 deletions

diff --git a/oowintool b/oowintool
index bf5c5d977fbc..6cb98a32b5a6 100755
--- a/oowintool
+++ b/oowintool
@@ -46,7 +46,8 @@ sub print_syntax()
     print " commands:\n";
     print "   --msvc-ver              - print version of MSVC eg. 6.0\n";
     print "   --msvc-copy-dlls <dest> - copy msvc[pr]??.dlls into <dest>/msvcp??/\n";
-    print "   --msvc-copy-msms <dest> - copy mscrt merge modules  <dest>/msm90/\n";
+    print "   --msvc-copy-msms <dest> - copy mscrt merge modules to <dest>/msm90/\n";
+    print "   --msvc-copy-msms-64 <ds>- copy the x64 mscrt merge modules to <ds>/msm90/\n";
     print "   --msvc-productdir       - print productdir\n";
     print "   --msvs-productdir       - print productdir\n";
     print "   --dotnetsdk-dir         - print .NET SDK path\n";
@@ -285,16 +286,17 @@ sub msvc_copy_dlls($)
     }
 }
 
-sub msvc_copy_msms($)
+sub msvc_copy_msms($$)
 {
-    my $dest = shift;
+    # $postfix is empty for x86, and '_x64' for x64
+    my ($dest, $postfix) = @_;
     my $common_files_path = $ENV{"CommonProgramFiles(x86)"};
     if (!defined $common_files_path) {
         $common_files_path = $ENV{CommonProgramFiles};
     }
     defined $common_files_path || return;
     my $msm_path = (cygpath $common_files_path . "\\Merge Modules", 'w', $output_format);
-    foreach $fname ('Microsoft_VC90_CRT_x86.msm', 'Microsoft_VC90_CRT_x86_x64.msm', 'policy_9_0_Microsoft_VC90_CRT_x86.msm', 'policy_9_0_Microsoft_VC90_CRT_x86_x64.msm') {
+    foreach $fname ("Microsoft_VC90_CRT_x86$postfix.msm", "policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm") {
 	print STDERR "Copying $msm_path/$fname to $dest\n";
         copy ("$msm_path/$fname", $dest) || die "copy failed: $!";
     }
@@ -330,7 +332,11 @@ while (@commands) {
     } elsif ($opt eq '--msvc-copy-msms') {
 	my $dest = shift @commands;
 	defined $dest || die "copy-msms requires a destination directory";
-	msvc_copy_msms( $dest );
+	msvc_copy_msms( $dest, '' );
+    } elsif ($opt eq '--msvc-copy-msms-64') {
+	my $dest = shift @commands;
+	defined $dest || die "copy-msms-64 requires a destination directory";
+	msvc_copy_msms( $dest, '_x64' );
     } elsif ($opt eq '--msvs-productdir') {
 	print_msvs_productdir();
     } elsif ($opt eq '--msvc-productdir') {