Make bundling Microsoft_VC100_CRT_x86.msm truly optional

Change-Id: I4fa998f33059a6ebc9afe0a9ce65443a115b6db2

1 files changed, 11 insertions, 0 deletions

diff --git a/oowintool b/oowintool
index 087d478d3bff..9afc1cd40e93 100755
--- a/oowintool
+++ b/oowintool
@@ -47,6 +47,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-find-msms-vc100  - exit with 0 if Microsoft_VC100_CRT_x86.msm\n";
+    print "                             is available\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";
@@ -271,6 +273,13 @@ sub msvc_copy_dlls($)
     }
 }
 
+sub msvc_find_msms_vc100()
+{
+    my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format);
+    defined $msm_path || die "MSMDir not found";
+    return -e "$msm_path/Microsoft_VC100_CRT_x86.msm" ? 0 : 1;
+}
+
 sub msvc_copy_msms($$)
 {
     # $postfix is empty for x86, and '_x64' for x64
@@ -318,6 +327,8 @@ while (@commands) {
         my $dest = shift @commands;
         defined $dest || die "copy-dlls requires a destination directory";
         msvc_copy_dlls( $dest );
+    } elsif ($opt eq '--msvc-find-msms-vc100') {
+        exit msvc_find_msms_vc100();
     } elsif ($opt eq '--msvc-copy-msms') {
         my $dest = shift @commands;
         defined $dest || die "copy-msms requires a destination directory";