libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

Zwischenstand: Debianisierung

Browse Source
This commit is contained in:
Marc Wäckerlin
2008-03-31 09:11:05 +00:00
parent 8f7f5804d6
commit afd4cc5907
9 changed files with 132 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mrw/makefile.am
View File

@@ -15,6 +15,7 @@ if HAVE_STACKTRACE
AM_CPPFLAGS += -DHAVE_STACKTRACE
endif
EXTRA_DIST = head.html foot.html style.css hintergrund.png
CLEANFILES = doxygen.errors functiontrace_test.log \
mrwautofunctiontracelog4cxx_test.log \
mrwautofunctiontracelog4cxx_test-mt.log \
@@ -25,7 +26,8 @@ htmldir = $(pkgdatadir)/doc/html
pdfdir = $(pkgdatadir)/doc/pdf
if HAVE_DOXYGEN
html_DATA = $(top_builddir)/doc/html/index.html
dist_pdf_DATA = $(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
pdf_DATA = $(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
EXTRA_DIST += $(pdf_DATA)
endif
lib_LTLIBRARIES = libmrw.la
@@ -362,7 +364,6 @@ endif
endif
dist_check_DATA = test.dat configfile.ini configfile.ini.result
EXTRA_DIST = head.html foot.html style.css hintergrund.png
if HAVE_VALGRIND
VALTESTS=$(VALGRIND_CHECKS:%=valcheck_%)
TESTS = $(VALTESTS) $(NO_VALGRIND_CHECKS) $(dist_check_SCRIPTS)
@@ -379,7 +380,7 @@ check_PROGRAMS = $(VALGRIND_CHECKS) $(NO_VALGRIND_CHECKS)
deps = $(top_srcdir)/COPYING $(top_srcdir)/README $(top_srcdir)/INSTALL $(top_srcdir)/NEWS $(top_srcdir)/ChangeLog
doc: $(top_builddir)/doc/html/index.html $(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf
doc: $(html_DATA) $(pdf_DATA)
$(html_DATA): doxyfile *.[ch]pp $(deps) style.css head.html foot.html
test -d $(top_builddir)/doc/latex || mkdir -p $(top_builddir)/doc/latex
@@ -394,11 +395,10 @@ if PEDANTIC
test \! -s doxygen.errors
endif
$(top_builddir)/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf: doxyfile *.[ch]pp $(deps) $(html_DATA)
$(pdf_DATA): doxyfile *.[ch]pp $(deps) $(html_DATA)
cd $(top_builddir)/doc/latex && make && \
mv refman.pdf @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf || \
( echo "**** ERROR in Doxygen-PDF ****" && \
cat refman.log && false )
mv refman.pdf $(pdf_DATA) || \
( echo "**** ERROR in Doxygen-PDF ****" && false )
clean-local:
- rm doxygen.err libmrw.doxytag
@@ -407,12 +407,12 @@ distclean-local:
- rm -r $(top_builddir)/doc/html/* $(top_builddir)/doc/latex/*
- rm makefile makefile.in doxygen.err libmrw.doxytag
if HAVE_DOXYGEN
dist-hook:
test -d $(distdir)/doc/html || \
mkdir -p $(distdir)/doc/html
cp $(top_builddir)/doc/html/* $(distdir)/doc/html/.
if HAVE_DOXYGEN
install-data-hook:
env | grep -i tmp
test -d "$(DESTDIR)$(pkgdatadir)/doc" || \

1
mrw/stacktrace.hpp
View File

@@ -17,6 +17,7 @@
#include <map>
#include <string>
#include <memory>
#include <iostream>
#include <sys/mman.h>
#include <bfd.h>

8
mrw/string.hpp
View File

@@ -231,13 +231,13 @@ namespace mrw {
@param l the list of strings to join
@param delimiter the delimiter between the joined strings
*/
template<template<class CONTENTS_TPL> class LIST,
typename CONTENTS>
std::string join(const LIST<CONTENTS>& l,
template<template<class CONTENTS_TPL, class ALLOC_TPL> class LIST,
typename CONTENTS, typename ALLOC>
std::string join(const LIST<CONTENTS, ALLOC>& l,
const std::string& delimiter=" ")
throw(std::bad_exception) {
std::string result;
for (typename LIST<CONTENTS>::const_iterator it(l.begin());
for (typename LIST<CONTENTS, ALLOC>::const_iterator it(l.begin());
it!=l.end(); ++it)
result+=(result.size()?delimiter:"")+mrw::string(*it);
return result;