[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oowintool scp2/source

[Libreoffice Gerrit user]

 oowintool                     |   10 +++++++---
 scp2/source/ooo/vc_redist.scp |    7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 76876f51796cb10e3b4fbaa7cfaa209ab6b9fd2f
Author: Andras Timar <ati...@suse.com>
Date:   Wed Jul 18 21:52:10 2012 +0200

    fdo#50584 bundle MS Visual C++ 2010 Runtime so LO can work with JRE7
    
    (cherry picked from master commit 8b749cb16dde14b199a61456741b586ddd88a584 
plus
    238eba337cedda17a9ed1ce7e91755c66446195a "make the vc2010 redist optional" 
to
    libreoffice-3-6 as 6a59a378f6d492aad09ae254a024983eb9ee8060, cherry-picked 
to
    libreoffice-3-5 from there)
    Conflicts:
        oowintool
    
    Change-Id: If22bed6728121ec66ecd89ad4f869e980aeb79b7
    Signed-off-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/oowintool b/oowintool
index 28f16da..c0642c5 100755
--- a/oowintool
+++ b/oowintool
@@ -40,7 +40,7 @@ sub reg_find_key($)
 sub print_syntax()
 {
     print "oowintool [option] ...\n";
-    print " encoding options\n";  
+    print " encoding options\n";
     print "   -w   - windows form\n";
     print "   -u   - unix form (default)\n";
     print " commands:\n";
@@ -69,7 +69,7 @@ sub cygpath($$$)
        $path =~ s|\\*\s*$||;
     }
 
-    # 'Unterminated quoted string errors' from 'ash' when 
+    # 'Unterminated quoted string errors' from 'ash' when
     # forking cygpath  so - reimplement cygpath in perl [ gack ]
     if ($format eq 'u' && $input_format eq 'w') {
        $path =~ s|\\|/|g;
@@ -216,7 +216,7 @@ sub print_csc_compiler_dir()
 
 sub print_dotnetsdk_dir()
 {
-    my $dir = 
+    my $dir =
           reg_get_value 
("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
           reg_get_value 
("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
     if ($dir) {
@@ -298,6 +298,10 @@ sub msvc_copy_msms($$)
         print STDERR "Copying $msm_path/$fname to $dest\n";
         copy ("$msm_path/$fname", $dest) || die "copy failed: $!";
     }
+    foreach $fname ("Microsoft_VC100_CRT_x86$postfix.msm") {
+        print STDERR "Copying $msm_path/$fname to $dest\n";
+        copy ("$msm_path/$fname", $dest) || print "copy failed: $!";
+    }
 }
 
 if (!@ARGV) {
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 5ec433c..265a595 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";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits