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

[Libreoffice Gerrit user]

 oowintool                     |   21 +++++++++++++--------
 scp2/source/ooo/vc_redist.scp |    7 +++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

New commits:
commit 6a59a378f6d492aad09ae254a024983eb9ee8060
Author: Andras Timar <atimar at 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 commit 8b749cb16dde14b199a61456741b586ddd88a584 plus
    238eba337cedda17a9ed1ce7e91755c66446195a "make the vc2010 redist optional")
    
    Change-Id: If22bed6728121ec66ecd89ad4f869e980aeb79b7
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/oowintool b/oowintool
index d311750..087d478 100755
--- a/oowintool
+++ b/oowintool
@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w # -*- tab-width: 4; cperl-indent-level: 4; indent-tabs-mode: nil -*-
+#!/usr/bin/perl -w
+# -*- tab-width: 4; cperl-indent-level: 4; indent-tabs-mode: nil -*-
 
 use File::Copy;
 
@@ -40,7 +41,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 +70,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;
@@ -206,7 +207,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) {
@@ -222,7 +223,7 @@ sub print_jdk_dir()
       reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
       reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
       reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
-    print cygpath($dir, 'w', $output_format); 
+    print cygpath($dir, 'w', $output_format);
 }
 
 sub copy_dll($$$)
@@ -241,11 +242,11 @@ sub msvc_find_version($)
 {
     my $checkpath = shift;
     my $ver = find_msvc();
-    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
+    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
           $ver->{$checkpath});
     -d $srcdir && return $ver;
     $ver = find_msvs();
-    $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
+    $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
           $ver->{$checkpath});
     -d $srcdir && return $ver;
     return undef;
@@ -256,7 +257,7 @@ sub msvc_copy_dlls($)
     my $dest = shift;
     my $ver = msvc_find_version('dll_path');
     defined $ver || return;
-    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' . 
+    my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
           $ver->{'dll_path'});
 
     copy_dll ($srcdir, "msvcp" . $ver->{'dll_suffix'} . ".dll",
@@ -284,6 +285,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";