[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - scp2/source

[Michael Stahl]

 scp2/source/winexplorerext/file_winexplorerext.scp   |   15 +++++++--------
 scp2/source/winexplorerext/module_winexplorerext.scp |    5 +----
 2 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit ab4344c34ddf048adf9a3fad0dd1fa2970935550
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jun 2 22:38:06 2017 +0200

    scp2: package 64-bit MSVC runtimes for explorer extensions
    
    Not a backport because master is a bit too refactored now.
    
    Change-Id: I1eccb99252fb66dc1fcc9cb5af978c61717ff629
    Reviewed-on: https://gerrit.libreoffice.org/38365
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 45fc586e353e..976520971713 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -23,17 +23,16 @@ Directory gid_Dir_Shlxthdl
     DosName = "shlxthdl";
 End
 
-/*
- * TODO(davido): Probably the redists need to be included for the supported compilers
- */
-
 #ifdef BUILD_X64
 
-#if defined(WITH_VC140_REDIST)
+#if defined(WITH_VC140_REDIST) || defined(WITH_VC150_REDIST)
 
-#endif
-
-#if defined(WITH_VC150_REDIST)
+File gid_File_X64_Redist
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED);
+    Dir = FILELIST_DIR;
+    Name = "msvc_dlls.filelist";
+    ComponentCondition = "VersionNT64";
+End
 
 #endif
 
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 440945e89096..b71153cd0052 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -49,9 +49,6 @@ Module gid_Module_Optional_Winexplorerext_x64
     Dirs = (gid_Dir_Shlxthdl);
     Files = (auto_winexplorerextwin64_ALL,
              auto_winexplorerextwin64nt6_ALL,
-             gid_File_Lib_Msvcp100,
-             gid_File_Lib_Msvcr100,
-             gid_File_Lib_Msvcp110,
-             gid_File_Lib_Msvcr110);
+             gid_File_X64_Redist);
 End
 #endif