diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-03 12:37:18 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-01-18 13:45:04 +0100 |
| commit | dc8db9f1a7b9c3f9a3e4bacf966446dcaac96177 (patch) | |
| tree | f6eebaf23926562d4551ff9be241edb73dd36983 | |
| parent | 875005e83725c4ec992b6936816175b0ecb206d7 (diff) | |
integrate the minidump upload into the normal LibreOffice
Change-Id: Id1808ceebf6c54698f7d1656a0ce96bcaece89ac
Reviewed-on: https://gerrit.libreoffice.org/25863
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | desktop/source/minidump/minidump.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/minidump/minidump_upload.cxx | 5 | ||||
| -rw-r--r-- | include/desktop/minidump.hxx (renamed from desktop/source/minidump/minidump.hxx) | 0 | ||||
| -rw-r--r-- | svx/Library_svx.mk | 10 | ||||
| -rw-r--r-- | svx/source/dialog/crashreportdlg.cxx | 9 |
5 files changed, 16 insertions, 10 deletions
diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx index 371d17cdd3f0..64303d4befdc 100644 --- a/desktop/source/minidump/minidump.cxx +++ b/desktop/source/minidump/minidump.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "minidump.hxx" +#include <desktop/minidump.hxx> #include <map> #include <memory> diff --git a/desktop/source/minidump/minidump_upload.cxx b/desktop/source/minidump/minidump_upload.cxx index 51bba7f2a62f..6a581db6a5a6 100644 --- a/desktop/source/minidump/minidump_upload.cxx +++ b/desktop/source/minidump/minidump_upload.cxx @@ -7,10 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <desktop/minidump.hxx> -#include "minidump.hxx" - -#include<iostream> +#include <iostream> int main(int argc, char** argv) { diff --git a/desktop/source/minidump/minidump.hxx b/include/desktop/minidump.hxx index 21d52e80ddae..21d52e80ddae 100644 --- a/desktop/source/minidump/minidump.hxx +++ b/include/desktop/minidump.hxx diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index d5b8b7dcd427..66c72e56803d 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -40,6 +40,14 @@ $(eval $(call gb_Library_add_defs,svx,\ $(eval $(call gb_Library_set_precompiled_header,svx,$(SRCDIR)/svx/inc/pch/precompiled_svx)) +ifeq ($(ENABLE_BREAKPAD),TRUE) + +$(eval $(call gb_Library_use_static_libraries,svx, \ + minidump \ +)) + +endif + $(eval $(call gb_Library_use_libraries,svx,\ basegfx \ sb \ @@ -74,6 +82,8 @@ $(eval $(call gb_Library_use_libraries,svx,\ $(eval $(call gb_Library_use_externals,svx,\ boost_headers \ + $(call gb_Helper_optional,BREAKPAD, \ + curl) \ icuuc \ icu_headers \ )) diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index aeb5c14fb192..511199b4bf5f 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -9,10 +9,12 @@ #include "crashreportdlg.hxx" + #include <config_folders.h> #include <rtl/bootstrap.hxx> #include <desktop/crashreport.hxx> +#include <desktop/minidump.hxx> #include <osl/file.hxx> CrashReportDialog::CrashReportDialog(vcl::Window* pParent): @@ -56,13 +58,8 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void) if (pBtn == mpBtnSend.get()) { std::string ini_path = CrashReporter::getIniFileName(); - OUString aCommand; - osl::FileBase::getSystemPathFromFileURL(getLibDir() + "/minidump_upload" + SAL_EXEEXTENSION, aCommand); - aCommand = aCommand; - OString aOStringCommand = rtl::OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8) + " " + ini_path.c_str(); - int retVal = std::system(aOStringCommand.getStr()); - SAL_WARN_IF(retVal != 0, "svx.dialog", "Failed to upload minidump. Error Code: " << retVal); + readConfig(ini_path); // TODO: moggi: return the id for the user to look it up Close(); } |