diff options
| author | Andras Timar <atimar@suse.com> | 2013-08-29 12:54:45 -0700 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-08-29 13:39:39 -0700 |
| commit | 4b600518e061436fa0384578a1e7b25f44788297 (patch) | |
| tree | 9f9d932604706a2a3646d2dbfe7183eb4fc2cc08 | |
| parent | f5bafb295559bc3e673ab2aa35e84cb42b9e5f1e (diff) | |
take out MSI CustomAction dlls from AutoInstall
BINARYTABLE, BINARYTABLE_ONLY flags were not handled
Change-Id: Ic6a0233e4f4213b9ea83a491949ab05c299a9201
| -rw-r--r-- | Repository.mk | 14 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 46 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 5 |
3 files changed, 57 insertions, 8 deletions
diff --git a/Repository.mk b/Repository.mk index 8c627637e913..3c5239971e51 100644 --- a/Repository.mk +++ b/Repository.mk @@ -550,14 +550,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(DISABLE_ATL),,\ inprocserv \ ) \ - $(if $(WINDOWS_SDK_HOME),\ - instooofiltmsi \ - qslnkmsi \ - reg4allmsdoc \ - sdqsmsi \ - sellangmsi \ - sn_tools \ - ) \ ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ @@ -579,16 +571,22 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ifeq ($(OS),WNT) $(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/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a86e8d70a9fa..583e458a1a9e 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -504,3 +504,49 @@ File gid_File_Lib_Rdf #endif 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, DONTRENAMEINPATCH); + 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 f05cc5babb8e..8d90f12d843f 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -207,7 +207,12 @@ 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); |