diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 22:47:23 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-06 13:05:42 +0200 |
| commit | 9b50c4f63c2ecb95245511940dacb3e91027499f (patch) | |
| tree | 12e8c2e3a2187e5d2667af8b1c1b4765b7f145be /scp2 | |
| parent | 2a39dc74724d3648ff76aa900edfebe0dd19b296 (diff) | |
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>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 4 | ||||
| -rw-r--r-- | scp2/inc/macros.inc | 8 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 15 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 6 |
4 files changed, 11 insertions, 22 deletions
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 |