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/activex | |
| 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/activex')
| -rw-r--r-- | scp2/source/activex/file_activex.scp | 7 | ||||
| -rw-r--r-- | scp2/source/activex/module_activex.scp | 6 |
2 files changed, 5 insertions, 8 deletions
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 |