diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-09-07 16:57:12 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:18 +0200 |
| commit | c140a5fdbba098704ba800c5e4f9b3a2fef2900e (patch) | |
| tree | c2d47a88f5786ccfa60b40713922907023043e0c /oowintool | |
| parent | 5c1a93df5b3a8d7f31d9bb672d391c888418aa53 (diff) | |
fix msm_path detection
Change-Id: Id507a3483a126f4a04dcb9be287c12a3eae5429c
Diffstat (limited to 'oowintool')
| -rwxr-xr-x | oowintool | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/oowintool b/oowintool index e8f0b3b17e7a..58ea15399b84 100755 --- a/oowintool +++ b/oowintool @@ -313,7 +313,9 @@ sub msvc_copy_dlls($) sub msvc_find_msms() { my $ver = find_msvc(); - my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format); + my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/10.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/11.0/Setup/VS/MSMDir"), 'w', $output_format); defined $msm_path || die "MSMDir not found"; return -e "$msm_path/Microsoft_VC".$ver->{'dll_suffix'}."_CRT_x86.msm" ? 0 : 1; } @@ -326,7 +328,9 @@ sub msvc_copy_msms($$) my $ver = find_msvc(); defined $ver || return; - my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format); + my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/10.0/Setup/VS/MSMDir"), 'w', $output_format) || + (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/11.0/Setup/VS/MSMDir"), 'w', $output_format); defined $msm_path || die "MSMDir not found"; if ($ver->{'dll_suffix'} == 90) { if ( $postfix eq "_x86" ) { |