summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-04 20:43:25 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-07 11:41:32 +0000
commit8ab4d2f29fdd2c058db23f6ee7b2200655d4c6f6 (patch)
tree27239b59958edbe97faa9d3d72bc172a0af32d36 /scp2
parent0d44e98d6aa2c390fd9bcdd97290f463b136ddb6 (diff)
drop crashrep unused since start of LibreOffice
Change-Id: I3df1216054c133314b2317849744a0a37e9fbc8f Reviewed-on: https://gerrit.libreoffice.org/13733 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/AutoInstall.mk1
-rw-r--r--scp2/InstallModule_crashrep.mk20
-rw-r--r--scp2/InstallScript_setup_osl.mk3
-rw-r--r--scp2/Module_scp2.mk3
-rw-r--r--scp2/source/crashrep/file_crashrep.scp32
-rw-r--r--scp2/source/ooo/common_brand.scp5
6 files changed, 1 insertions, 63 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 30b0baff89b6..4983fc7bb406 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,crashrep,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
diff --git a/scp2/InstallModule_crashrep.mk b/scp2/InstallModule_crashrep.mk
deleted file mode 100644
index 1a72e1415708..000000000000
--- a/scp2/InstallModule_crashrep.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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 \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index baa872627a8d..ab776cc2cee1 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -30,9 +30,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/winexplorerext \
) \
) \
- $(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
- scp2/crashrep \
- ) \
$(if $(WITH_EXTENSION_INTEGRATION),\
scp2/extensions \
) \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index be02cd87a9da..2db4fc7e966d 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -39,9 +39,6 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_winexplorerext \
) \
) \
- $(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
- InstallModule_crashrep \
- ) \
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
InstallModule_gnome \
) \
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp
deleted file mode 100644
index e5021465be03..000000000000
--- a/scp2/source/crashrep/file_crashrep.scp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "macros.inc"
-
-// crashreporter files
-
-#ifdef WNT
-
-File gid_Brand_File_Lib_Dbghelp
- LIB_FILE_BODY;
- Name = "dbghelp.dll";
- Dir = gid_Brand_Dir_Program;
- Styles = (PACKED);
-End
-
-#endif
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 88d8166ba889..7a4e5b1bfa2c 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -28,7 +28,6 @@
#include "macros.inc"
#include "AutoInstall/brand"
-#include "AutoInstall/crashrep"
#include "config_folders.h"
@@ -54,9 +53,7 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Labels,
gid_Brand_Dir_Share_Registry,
gid_Brand_Dir_Share_Xdg);
- Files = (auto_crashrep_ALL,
- auto_brand_ALL,
- gid_Brand_File_Bin_Crashreport_Script,
+ Files = (auto_brand_ALL,
gid_Brand_File_Gdb_Trace,
gid_Brand_File_Bin_Soffice,
gid_Brand_File_Bin_Soffice_Bin_Manifest,