diff options
| -rw-r--r-- | Repository.mk | 30 | ||||
| -rw-r--r-- | scp2/AutoInstall.mk | 3 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 7 | ||||
| -rw-r--r-- | scp2/source/activex/file_activex.scp | 7 | ||||
| -rw-r--r-- | scp2/source/activex/module_activex.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 45 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 7 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 7 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 5 |
9 files changed, 42 insertions, 75 deletions
diff --git a/Repository.mk b/Repository.mk index 00e29b5a9150..d1f2db0b1b95 100644 --- a/Repository.mk +++ b/Repository.mk @@ -569,24 +569,38 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \ + $(if $(DISABLE_ACTIVEX),,\ + regactivex \ + ) \ +)) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \ + $(if $(WINDOWS_SDK_HOME),\ + instooofiltmsi \ + qslnkmsi \ + reg4allmsdoc \ + sdqsmsi \ + sellangmsi \ + sn_tools \ + ) \ +)) + + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,winexplorerextbinarytable, \ + shlxtmsi \ +)) + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ fop \ - instooofiltmsi \ jfregca \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ - qslnkmsi \ - reg4allmsdoc \ - regactivex \ regpatchactivex \ - sdqsmsi \ - sellangmsi \ shlxthdl \ shlxthdl_x64 \ - shlxtmsi \ - sn_tools \ so_activex \ so_activex_x64 \ sysdtrans \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 66edd78ecf5a..415279347e07 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -9,6 +9,7 @@ $(eval $(call gb_AutoInstall_AutoInstall)) +$(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE)) @@ -18,8 +19,10 @@ $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) +$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) # vim: set noet sw=4 ts=4: diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index cb4924b34b75..10805403c586 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -151,6 +151,13 @@ PACKED_LIB_FILE_BODY; \ End +#define LIBO_LIB_FILE_BINARYTABLE(id,name) \ + File id \ + Name = name; \ + PACKED_LIB_FILE_BODY; \ + Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); \ + End + #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp index 9881f76a1032..c710aba67eb4 100644 --- a/scp2/source/activex/file_activex.scp +++ b/scp2/source/activex/file_activex.scp @@ -37,11 +37,4 @@ End End #endif -File gid_File_Lib_Regactivex_Msi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "regactivex.dll"; -End - #endif // WITH_ACTIVEX_COMPONENT diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp index e23462d73abf..78b8954bb694 100644 --- a/scp2/source/activex/module_activex.scp +++ b/scp2/source/activex/module_activex.scp @@ -17,6 +17,7 @@ */ #include "macros.inc" +#include "AutoInstall/activexbinarytable" #ifdef WITH_ACTIVEX_COMPONENT @@ -27,7 +28,10 @@ Module gid_Module_Optional_Activexcontrol Default = NO; Minimal = NO; ParentID = gid_Module_Optional; - Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi); + Files = (auto_activexbinarytable_ALL + gid_File_Lib_Soactivex, + gid_File_Lib_Soactivex64, + gid_File_Lib_Regpatchactivex_Msi); End #endif // WITH_ACTIVEX_COMPONENT diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 39dc1cc166d3..417846ca8e9f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -505,48 +505,3 @@ File gid_File_Lib_Rdf End #endif // SYSTEM_REDLAND -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_sn_tools - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_LIB_DIR; - Name = "sn_tools.dll"; -End - -File gid_File_Lib_Reg4allmsdoc - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "reg4allmsdoc.dll"; -End - -File gid_File_Lib_Qslnkmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "qslnkmsi.dll"; -End - -File gid_File_Lib_Sdqsmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "sdqsmsi.dll"; -End - -File gid_File_Lib_Instooofiltmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "instooofiltmsi.dll"; -End - -File gid_File_Lib_sellangmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Brand_Dir_Program; - Name = "sellangmsi.dll"; -End - -#endif /* WNT && HAVE_WINDOWS_SDK */ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 8d90f12d843f..ec422bac3038 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -18,6 +18,7 @@ #include "macros.inc" #include "AutoInstall/ooo" +#include "AutoInstall/ooobinarytable" #ifdef AIX #ifndef SYSTEM_CURL @@ -140,6 +141,7 @@ Module gid_Module_Root_Files_4 Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root4, auto_ooo_ALL, + auto_ooobinarytable_ALL, gid_File_Lib_Bib, gid_File_Lib_J, gid_File_Lib_Oox, @@ -207,12 +209,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_I18n, gid_File_Lib_Accessbridge, gid_File_Lib_Dl, - gid_File_Lib_sn_tools, GID_FILE_LIB_WPD, - gid_File_Lib_Reg4allmsdoc, - gid_File_Lib_Qslnkmsi, - gid_File_Lib_Sdqsmsi, - gid_File_Lib_Instooofiltmsi, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Config); diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index badcbc83422d..65ebc524414f 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -80,13 +80,6 @@ End #endif -File gid_File_Lib_Shlxtmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "shlxtmsi.dll"; -End - #ifdef BUILD_X64 #if defined(WITH_VC100_REDIST) diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index e6df9c4085bd..dbed4cfdb2dd 100644 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp @@ -17,6 +17,7 @@ */ #include "macros.inc" +#include "AutoInstall/winexplorerextbinarytable" Module gid_Module_Optional_Winexplorerext MOD_NAME_DESC ( MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS ); @@ -25,10 +26,10 @@ Module gid_Module_Optional_Winexplorerext Minimal = YES; ParentID = gid_Module_Optional; Dirs = (gid_Dir_Shlxthdl); - Files = (gid_File_Lib_Shlxthdl, + Files = (auto_winexplorerextbinarytable_ALL + gid_File_Lib_Shlxthdl, gid_File_Lib_OOoFilt, gid_File_Lib_PropertyHdl, - gid_File_Lib_Shlxtmsi, gid_File_Tmp_Userinstall_Winexplorerext_Inf); End |