diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-31 00:25:58 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-31 23:46:24 +0200 |
| commit | b09c5286b84e712a524e3fd5ded904ba9e0f8e84 (patch) | |
| tree | ab152c735ab9e4146f45799182143eac6e98e9fd /scp2/source/winexplorerext | |
| parent | af5a380bc19f599307b3bc524a31c380d456249e (diff) | |
scp2: convert BINARYTABLE MSI CustomAction dlls to AutoInstall
Second attempt, this time using a new type LIBO_LIB_FILE_BINARYTABLE
in scp2/macros.inc; for the resulting MSI file Orca lists the same
files in "Binary" table now.
Change-Id: I550ede75f16a46da9dd7377594aa28b7c06f0348
Diffstat (limited to 'scp2/source/winexplorerext')
| -rw-r--r-- | scp2/source/winexplorerext/file_winexplorerext.scp | 7 | ||||
| -rw-r--r-- | scp2/source/winexplorerext/module_winexplorerext.scp | 5 |
2 files changed, 3 insertions, 9 deletions
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 |