From 0183dc88e25b30725c118fd5b515e739d717b6be Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 28 Oct 2014 21:36:11 +0100
Subject: scp2: move crashrep executables to AutoInstall

Change-Id: Ib9fba534491ce67d329a375a359eef4520c0a3a1
---
 scp2/AutoInstall.mk                    |  1 +
 scp2/InstallModule_crashrep.mk         |  4 ++++
 scp2/source/crashrep/file_crashrep.scp | 18 ------------------
 scp2/source/ooo/common_brand.scp       |  5 +++--
 4 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'scp2')

diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 5c55a3e6595e..1a61765ef4de 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
 $(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
 $(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,crashrep,,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE))
diff --git a/scp2/InstallModule_crashrep.mk b/scp2/InstallModule_crashrep.mk
index f8d90c4f0fe5..1a72e1415708 100644
--- a/scp2/InstallModule_crashrep.mk
+++ b/scp2/InstallModule_crashrep.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/crashrep))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/crashrep,\
+	crashrep \
+))
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/crashrep,\
     scp2/source/crashrep/file_crashrep \
 ))
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,
-- 
cgit