diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-10-28 21:36:11 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-10-29 11:37:48 +0100 |
commit | 0183dc88e25b30725c118fd5b515e739d717b6be (patch) | |
tree | 5afdea7c196994321eb73f7126edc383ec004596 /scp2/source | |
parent | f801b7f07d73d973c2a34662626a4a0e033fa6e6 (diff) |
scp2: move crashrep executables to AutoInstall
Change-Id: Ib9fba534491ce67d329a375a359eef4520c0a3a1
Diffstat (limited to 'scp2/source')
-rw-r--r-- | scp2/source/crashrep/file_crashrep.scp | 18 | ||||
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 5 |
2 files changed, 3 insertions, 20 deletions
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp index ef6524814a10..e5021465be03 100644 --- a/scp2/source/crashrep/file_crashrep.scp +++ b/scp2/source/crashrep/file_crashrep.scp @@ -20,24 +20,6 @@ // crashreporter files -File gid_Brand_File_Bin_Crashreport - BIN_FILE_BODY; - Name = EXENAME(crashrep); - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -End - -#ifdef WNT - -File gid_Brand_File_Bin_Crashreport_Com - BIN_FILE_BODY; - Name = "crashrep.com"; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -End - -#endif - #ifdef WNT File gid_Brand_File_Lib_Dbghelp diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 8c08811ad78c..ce5dcbc03619 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#include "AutoInstall/crashrep" + #include "config_folders.h" Module gid_Module_Root_Brand @@ -51,9 +53,8 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Labels, gid_Brand_Dir_Share_Registry, gid_Brand_Dir_Share_Xdg); - Files = (gid_Brand_File_Bin_Crashreport, + Files = (auto_crashrep_ALL, gid_Brand_File_Bin_Crashreport_Script, - gid_Brand_File_Bin_Crashreport_Com, gid_Brand_File_Gdb_Trace, gid_Brand_File_Bin_Soffice, gid_Brand_File_Bin_Soffice_Bin, |