diff options
| author | Andras Timar <atimar@suse.com> | 2012-07-18 21:52:10 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-07-18 21:54:03 +0200 |
| commit | 8b749cb16dde14b199a61456741b586ddd88a584 (patch) | |
| tree | 75fed80cec76aedb250436bc2a099eb28a758c84 | |
| parent | 75b7d3dce610eb1d7a071d02800d5e3d0bec0898 (diff) | |
fdo#50584 bundle MS Visual C++ 2010 Runtime so LO can work with JRE7
Change-Id: If22bed6728121ec66ecd89ad4f869e980aeb79b7
| -rwxr-xr-x | oowintool | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/oowintool b/oowintool index d3117502d2ff..fbc647dcb2a8 100755 --- a/oowintool +++ b/oowintool @@ -280,7 +280,7 @@ sub msvc_copy_msms($$) 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"; - foreach $fname ("Microsoft_VC90_CRT_x86$postfix.msm", "policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm") { + foreach $fname ("Microsoft_VC90_CRT_x86$postfix.msm", "policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm", "Microsoft_VC100_CRT_x86$postfix.msm") { print STDERR "Copying $msm_path/$fname to $dest\n"; copy ("$msm_path/$fname", $dest) || die "copy failed: $!"; } diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 5ec433cf2b3d..265a59567fa1 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -36,6 +36,13 @@ MergeModule gid_MergeModule_Microsoft_VC90_CRT_x86 ComponentCondition = "VC_REDIST=1"; End +MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86 + Feature = gm_Root; + Name = "Microsoft_VC100_CRT_x86.msm"; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; +End + MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86 Feature = gm_Root; Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; |