diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-05-24 04:27:18 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-05-24 04:28:16 +0200 |
| commit | 1e4e503a5399990064d9d91c392a7bec7502b01d (patch) | |
| tree | 254fbf7175f0c59951b0af0c6a118591a5f7ee7f | |
| parent | d586e3bf04d486aa28709ff98926e2817629d59f (diff) | |
add build system part for upload crashreport symbols
Change-Id: Ib8dc0267034716740ba6d7f60cf635adc4bd1561
| -rw-r--r-- | Makefile.gbuild | 3 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 17 |
4 files changed, 24 insertions, 0 deletions
diff --git a/Makefile.gbuild b/Makefile.gbuild index 8c41a2898618..bcfa569954eb 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -20,4 +20,7 @@ include $(SRCDIR)/solenv/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk)) +upload-symbols: + bin/upload_symbols.py $(WORKDIR)/symbols.zip $(BREAKPAD_SYMBOL_CONFIG) "$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)" + # vim: set noet sw=4 ts=4: diff --git a/Makefile.in b/Makefile.in index 155c200b54ab..5da8e933fcde 100644 --- a/Makefile.in +++ b/Makefile.in @@ -386,6 +386,9 @@ symbols: $(SRCDIR)/bin/symbolstore.py $(WORKDIR)/UnpackedTarball/breakpad/src/tools/linux/dump_syms/dump_syms $(WORKDIR)/symbols/ $(INSTDIR)/program/* cd $(WORKDIR)/symbols/ && zip -r $(WORKDIR)/symbols.zip * +upload-symbols: + $(MAKE) -f $(SRCDIR)/Makefile.gbuild upload-symbols + dump-deps: @$(SRCDIR)/bin/module-deps.pl $(MAKE) $(SRCDIR)/Makefile.gbuild diff --git a/config_host.mk.in b/config_host.mk.in index 60b87bd24722..ddd144e48cd2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -42,6 +42,7 @@ export BOOST_IOSTREAMS_LIB=@BOOST_IOSTREAMS_LIB@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ export BOOST_SYSTEM_LIB=@BOOST_SYSTEM_LIB@ export BRAND_INTRO_IMAGES=@BRAND_INTRO_IMAGES@ +export BREAKPAD_SYMBOL_CONFIG=@BREAKPAD_SYMBOL_CONFIG@ export BSH_JAR=@BSH_JAR@ export BUILD_PLATFORM=@build@ export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@ diff --git a/configure.ac b/configure.ac index 6dea282490a9..091abb4c8141 100644 --- a/configure.ac +++ b/configure.ac @@ -2023,6 +2023,12 @@ AC_ARG_WITH(ant-home, of the entire distribution.]), ,) +AC_ARG_WITH(symbol-config, + AS_HELP_STRING([--with-symbol-config], + [Configuration for the crashreport symbol upload]), + [], + [$with_symbol_config=no]) + AC_ARG_WITH(export-validation, AS_HELP_STRING([--with-export-validation], [If you want the exported files to be validated. Right now limited to OOXML and ODF files. @@ -9135,6 +9141,17 @@ else AC_DEFINE(ENABLE_BREAKPAD) AC_DEFINE(HAVE_FEATURE_BREAKPAD, 1) BUILD_TYPE="$BUILD_TYPE BREAKPAD" + + AC_MSG_CHECKING([for crashreport config]) + if test "$with_symbol_config" = "no"; then + BREAKPAD_SYMBOL_CONFIG="invalid" + AC_MSG_RESULT([no]) + else + BREAKPAD_SYMBOL_CONFIG="$with_symbol_config" + AC_DEFINE(BREAKPAD_SYMBOL_CONFIG) + AC_MSG_RESULT([yes]) + fi + AC_SUBST(BREAKPAD_SYMBOL_CONFIG) fi AC_SUBST(ENABLE_BREAKPAD) |