[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download

[Michael Stahl]

 download |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit fb591d1b46d074b3c7cb02ef14ab47765246cdf5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu May 30 17:45:32 2013 +0200

    fix copying of MSVC2008 runtime DLLs
    
    (regression from d7b428453b07f48b56e7d83f05d81fae91b921c8)
    
    Change-Id: Id3ba5bdb1f28b619add7d2e255cd9e1edc0d1bd1
    Reviewed-on: https://gerrit.libreoffice.org/4110
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/download b/download
index a04d1f4..469fed6 100755
--- a/download
+++ b/download
@@ -51,9 +51,23 @@ fi
 
 if [ "$COM" = "MSC" ]; then
     # use oowintool to copy CRT dlls and manifest
-    if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
-       echo "oowintool failed to copy 64-bit CRT"
-       exit 1
+    if [ "$VCVER" = "90" ]; then
+        # need only 32 bit DLLs in solver for MSVC 2008
+        if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then
+           echo "oowintool failed to copy CRT"
+           exit 1
+        fi
+        # 64 bit DLLs handled via MSM
+        if [ "$CPUNAME" = "INTEL" ]; then
+            if ! ./oowintool --msvc-copy-msms-64 ./external/msm"$VCVER" ; then
+               echo "WARNING: oowintool failed to copy x64 merge modules, installation will lack the 64-bit Explorer extension"
+            fi
+        fi
+    else
+        if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
+           echo "oowintool failed to copy 64-bit CRT"
+           exit 1
+        fi
     fi
 
     # use oowintool to copy VC redist merge modules