scp2: package 64-bit MSVC runtimes for explorer extensions

... and add BUILD_X64 conditional.

Change-Id: Id512368dfd9dece583ead5aae1924db96f8a2a40
Reviewed-on: https://gerrit.libreoffice.org/38366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

7 files changed, 20 insertions, 25 deletions

diff --git a/Repository.mk b/Repository.mk
index bd1ad2c80e7a..2c2d22e443f6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -687,11 +687,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexp
 	shlxthdl \
 ))
 
+ifneq ($(BUILD_X64),)
+$(eval $(call gb_Helper_register_packages_for_install,winexplorerextwin64, \
+	$(if $(filter MSC,$(COM)),msvc_dlls) \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \
 	ooofilt_x64 \
 	propertyhdl_x64 \
 	shlxthdl_x64 \
 ))
+endif # BUILD_X64
 
 endif # WNT
 
@@ -793,7 +799,6 @@ $(eval $(call gb_Helper_register_packages, \
 	test_unittest \
 	cli_basetypes_copy \
 	extras_wordbook \
-	$(if $(filter MSC,$(COM)),msvc_dlls) \
 	instsetoo_native_setup \
 	$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
 	postprocess_registry \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 00068404da22..3c15f888584b 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_AutoInstall_add_module,libreofficekit,LIBO_LIB_FILE,LIBO_EXECUT
 $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
-$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST,"ISCHECKFORPRODUCTUPDATES=1"))
+$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST_COMPONENTCONDITION,"ISCHECKFORPRODUCTUPDATES=1"))
 $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,ooo_fonts,,,,PACKAGE_FILELIST_FONT))
 $(eval $(call gb_AutoInstall_add_module,ooo_images,,,,PACKAGE_FILELIST))
@@ -50,7 +50,7 @@ $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_J
 $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
 ifeq ($(BUILD_X64),TRUE)
-$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,,"VersionNT64"))
+$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,PACKAGE_FILELIST_COMPONENTCONDITION,"VersionNT64"))
 endif
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 41c1040edd09..7093a1c6f6b6 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -120,6 +120,14 @@ File id \
     Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
 End
 
+#define PACKAGE_FILELIST_COMPONENTCONDITION(id,name,cond) \
+File id \
+    Dir = FILELIST_DIR; \
+    Name = name; \
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
+    ComponentCondition = cond; \
+End
+
 #ifdef WNT
 #define PACKAGE_FILELIST_FONT(id,name) \
 File id \
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 45fc586e353e..50bcfc3f3901 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -23,18 +23,3 @@ 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)
-
-#endif
-
-#if defined(WITH_VC150_REDIST)
-
-#endif
-
-#endif
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index d0383b6e036c..97bfc231769a 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -44,10 +44,6 @@ Module gid_Module_Optional_Winexplorerext_x64
     Default = YES;
     Styles = (HIDDEN_ROOT);
     Dirs = (gid_Dir_Shlxthdl);
-    Files = (auto_winexplorerextwin64_ALL,
-             gid_File_Lib_Msvcp100,
-             gid_File_Lib_Msvcr100,
-             gid_File_Lib_Msvcp110,
-             gid_File_Lib_Msvcr110);
+    Files = (auto_winexplorerextwin64_ALL);
 End
 #endif
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 9799fc6ecc44..8665644bea78 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -15,6 +15,7 @@ $(dir $(call gb_AutoInstall_get_target,%)).dir :
 $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
 		$(SRCDIR)/Repository.mk $(SRCDIR)/RepositoryExternal.mk \
 		$(BUILDDIR)/config_host.mk \
+		$(GBUILDDIR)/gen-autoinstall.py \
 		$(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_Output_announce,$*,$(true),AIN,3)
 	SDKLIBFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index b331638e7f5e..2feb1a92f406 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -91,10 +91,10 @@ for (gid, jarfile) in autojars:
         raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"")
     print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")")
 
-scp2pkgtemplates = set([ "PACKAGE_FILELIST", "PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" ])
+scp2pkgtemplates = set([ "PACKAGE_FILELIST", "PACKAGE_FILELIST_COMPONENTCONDITION","PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" ])
 for (gid, pkgfilelist) in autopkgs:
     if not(scp2pkgtemplate in scp2pkgtemplates):
         raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"")
-    print(scp2pkgtemplate + "(" + gid + "," + pkgfilelist + ")")
+    print(scp2pkgtemplate + "(" + gid + "," + pkgfilelist + scp2componentcondition + ")")
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab: