scp2: move crashrep executables to AutoInstall

Change-Id: Ib9fba534491ce67d329a375a359eef4520c0a3a1

Repository.mk

@@ -84,9 +84,15 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
 	gengal \
 ))
 
+ifneq ($(ENABLE_CRASHDUMP),)
+$(eval $(call gb_Helper_register_executables_for_install,OOO,crashrep, \
+	crashrep \
+	$(if $(filter WNT,$(OS)),crashrep_com) \
+))
+endif
+
 $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
-	$(call gb_Helper_optional,CRASHREP,crashrep) \
 	gnome-open-url.bin \
 	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
 	$(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \
@@ -107,7 +113,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
 	xpdfimport \
 	$(if $(filter WNT,$(OS)), \
-		crashrep_com \
 		odbcconfig \
 		python \
 		quickstart \

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))

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 \
 ))

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

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,