Changes have been pushed for the project "Fawkes Robotics Software Framework".
Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, fzwilling/sub_process has been created at 3fe968b97602da6b1917fd1fc07f7735d9255482 (commit) http://git.fawkesrobotics.org/fawkes.git/fzwilling/sub_process - *Log* --------------------------------------------------------------- commit da82575b838341b2a9d706a5aefcc1ec3e0fd5a4 Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> AuthorDate: Tue Sep 20 17:57:53 2016 +0200 Commit: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> CommitDate: Tue Sep 20 20:25:59 2016 +0200 utils: moved string utils for command argv and envs into utils/misc http://git.fawkesrobotics.org/fawkes.git/commit/da82575 http://trac.fawkesrobotics.org/changeset/da82575 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f3bf17c4dab3c3a03929274a4c04749600ddcefa Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> AuthorDate: Tue Sep 20 18:32:33 2016 +0200 Commit: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> CommitDate: Tue Sep 20 20:26:05 2016 +0200 utils: require cpp11 For example this is needed in the new utils classes for string conversions to use tuples and nicer for loops. http://git.fawkesrobotics.org/fawkes.git/commit/f3bf17c http://trac.fawkesrobotics.org/changeset/f3bf17c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e303bf5b1988f9d567c9ae4e1b17609200792afa Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> AuthorDate: Tue Sep 20 18:34:36 2016 +0200 Commit: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> CommitDate: Tue Sep 20 20:26:09 2016 +0200 openprs: properly use moved string utils http://git.fawkesrobotics.org/fawkes.git/commit/e303bf5 http://trac.fawkesrobotics.org/changeset/e303bf5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c7ed2bb6a6c6939cede0be35fc066d89e6d2eb3b Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> AuthorDate: Tue Sep 20 18:37:40 2016 +0200 Commit: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> CommitDate: Tue Sep 20 20:26:13 2016 +0200 sub_process: moved utils to create sub processes into utils http://git.fawkesrobotics.org/fawkes.git/commit/c7ed2bb http://trac.fawkesrobotics.org/changeset/c7ed2bb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 11a6e1e16c7cff35ce4c81e52d3d07caf9872650 Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> AuthorDate: Tue Sep 20 19:26:05 2016 +0200 Commit: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> CommitDate: Tue Sep 20 20:26:17 2016 +0200 utils: require boost asio and system for sb_process utils http://git.fawkesrobotics.org/fawkes.git/commit/11a6e1e http://trac.fawkesrobotics.org/changeset/11a6e1e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3fe968b97602da6b1917fd1fc07f7735d9255482 Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> AuthorDate: Tue Sep 20 19:30:53 2016 +0200 Commit: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> CommitDate: Tue Sep 20 20:26:21 2016 +0200 openprs: properly use moved sub_process utils http://git.fawkesrobotics.org/fawkes.git/commit/3fe968b http://trac.fawkesrobotics.org/changeset/3fe968b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/libs/utils/Makefile | 30 +++++++++++++++++-- src/libs/utils/misc/string_commands.cpp | 3 +- src/libs/utils/misc/string_commands.h | 6 ++-- .../utils => libs/utils/sub_process}/proc.cpp | 0 .../utils => libs/utils/sub_process}/proc.h | 0 .../openprs/aspect/openprs_kernel_manager.cpp | 4 +- 6 files changed, 33 insertions(+), 10 deletions(-) rename src/{plugins/openprs/utils => libs/utils/sub_process}/proc.cpp (100%) rename src/{plugins/openprs/utils => libs/utils/sub_process}/proc.h (100%) - *Diffs* ------------------------------------------------------------- - *commit* da82575b838341b2a9d706a5aefcc1ec3e0fd5a4 - - - - - - - - - - Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> Date: Tue Sep 20 17:57:53 2016 +0200 Subject: utils: moved string utils for command argv and envs into utils/misc .../utils/misc/string_commands.cpp} | 0 .../string.h => libs/utils/misc/string_commands.h} | 0 2 files changed, 0 insertions(+), 0 deletions(-) - *commit* f3bf17c4dab3c3a03929274a4c04749600ddcefa - - - - - - - - - - Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> Date: Tue Sep 20 18:32:33 2016 +0200 Subject: utils: require cpp11 src/libs/utils/Makefile | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/libs/utils/Makefile b/src/libs/utils/Makefile index 5f8c937..d84e9b3 100644 --- a/src/libs/utils/Makefile +++ b/src/libs/utils/Makefile @@ -43,11 +43,17 @@ LDFLAGS += $(LDFLAGS_LIBMAGIC) OBJS_all = $(OBJS_libfawkesutils) $(OBJS_lua_fawkesutils) LIBS_all = $(LIBDIR)/libfawkesutils.so -ifeq ($(HAVE_TOLUA),1) +ifeq ($(HAVE_TOLUA)$(HAVE_CPP11),11) + CFLAGS += $(CFLAGS_CPP11) LIBS_all += $(LUALIBDIR)/fawkesutils.so TARGETS_all += $(SRCDIR)/fawkesutils_tolua.cpp else - WARN_TARGETS += warning_tolua_wrapper + ifneq ($(HAVE_CPP11),1) + WARN_TARGETS += warning_cpp11 + endif + ifneq ($(HAVE_TOLUA),1) + WARN_TARGETS += warning_tolua_wrapper + endif endif ifneq ($(HAVE_INOTIFY),1) @@ -60,6 +66,9 @@ all: $(WARN_TARGETS) warning_libmagic: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Restricted file type detection support$(TNORMAL) (file[-devel] (libmagic) not installed)" $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)File monitoring utils cannot be built$(TNORMAL) (inotify headers not found)" +warning_cpp11: + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting utils$(TNORMAL) " \ + "(CPP11 not available)" endif $(LUALIBDIR)/fawkesutils.$(SOEXT): | $(LIBDIR)/libfawkesutils.$(SOEXT) - *commit* e303bf5b1988f9d567c9ae4e1b17609200792afa - - - - - - - - - - Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> Date: Tue Sep 20 18:34:36 2016 +0200 Subject: openprs: properly use moved string utils src/libs/utils/misc/string_commands.cpp | 3 ++- src/libs/utils/misc/string_commands.h | 6 +++--- .../openprs/aspect/openprs_kernel_manager.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) _Diff for modified files_: diff --git a/src/libs/utils/misc/string_commands.cpp b/src/libs/utils/misc/string_commands.cpp index 80a4122..960ae90 100644 --- a/src/libs/utils/misc/string_commands.cpp +++ b/src/libs/utils/misc/string_commands.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - * string.cpp - string utilities + * string.cpp - string utilities for command argv and envs * * Created: Fri Aug 22 15:32:47 2014 * Copyright 2014 Tim Niemueller [www.niemueller.de] @@ -26,6 +26,7 @@ #include <tuple> #include <string> #include <cstring> +#include <vector> namespace fawkes { #if 0 /* just to make Emacs auto-indent happy */ diff --git a/src/libs/utils/misc/string_commands.h b/src/libs/utils/misc/string_commands.h index 74745e6..ab864b4 100644 --- a/src/libs/utils/misc/string_commands.h +++ b/src/libs/utils/misc/string_commands.h @@ -1,6 +1,6 @@ /*************************************************************************** - * string.h - string utilities + * string.h - string utilities for command argv and envs * * Created: Fri Aug 22 14:49:05 2014 * Copyright 2014 Tim Niemueller [www.niemueller.de] @@ -20,8 +20,8 @@ * Read the full text in the LICENSE.GPL file in the doc directory. */ -#ifndef __PLUGINS_OPENPRS_UTILS_STRING_H_ -#define __PLUGINS_OPENPRS_UTILS_STRING_H_ +#ifndef __PLUGINS_UTILS_STRING_H_ +#define __PLUGINS_UTILS_STRING_H_ #include <string> #include <vector> diff --git a/src/plugins/openprs/aspect/openprs_kernel_manager.cpp b/src/plugins/openprs/aspect/openprs_kernel_manager.cpp index 3ff143a..79320c9 100644 --- a/src/plugins/openprs/aspect/openprs_kernel_manager.cpp +++ b/src/plugins/openprs/aspect/openprs_kernel_manager.cpp @@ -22,7 +22,7 @@ #include <plugins/openprs/aspect/openprs_kernel_manager.h> #include <plugins/openprs/utils/proc.h> -#include <plugins/openprs/utils/string.h> +#include <utils/misc/string_commands.h> #include <logging/logger.h> #include <config/config.h> #include <utils/time/time.h> - *commit* c7ed2bb6a6c6939cede0be35fc066d89e6d2eb3b - - - - - - - - - - Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> Date: Tue Sep 20 18:37:40 2016 +0200 Subject: sub_process: moved utils to create sub processes into utils .../utils => libs/utils/sub_process}/proc.cpp | 0 .../utils => libs/utils/sub_process}/proc.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) - *commit* 11a6e1e16c7cff35ce4c81e52d3d07caf9872650 - - - - - - - - - - Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> Date: Tue Sep 20 19:26:05 2016 +0200 Subject: utils: require boost asio and system for sb_process utils src/libs/utils/Makefile | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/libs/utils/Makefile b/src/libs/utils/Makefile index d84e9b3..12da36a 100644 --- a/src/libs/utils/Makefile +++ b/src/libs/utils/Makefile @@ -16,9 +16,13 @@ BASEDIR = ../../.. include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDSYSDIR)/lua.mk +include $(BASEDIR)/etc/buildsys/boost.mk FILTER_OUT=%_tolua.o +REQ_BOOST_LIBS = asio system +HAVE_BOOST_LIBS = $(call boost-have-libs,$(REQ_BOOST_LIBS)) + ifneq ($(wildcard $(SYSROOT)/usr/include/magic.h $(SYSROOT)/opt/local/include/magic.h),) HAVE_LIBMAGIC = 1 LIBS_LIBMAGIC = magic @@ -42,10 +46,13 @@ CFLAGS += $(CFLAGS_LIBMAGIC) LDFLAGS += $(LDFLAGS_LIBMAGIC) OBJS_all = $(OBJS_libfawkesutils) $(OBJS_lua_fawkesutils) -LIBS_all = $(LIBDIR)/libfawkesutils.so -ifeq ($(HAVE_TOLUA)$(HAVE_CPP11),11) - CFLAGS += $(CFLAGS_CPP11) + +ifeq ($(HAVE_TOLUA)$(HAVE_CPP11)$(HAVE_BOOST_LIBS),111) + CFLAGS += $(CFLAGS_CPP11) $(call boost-libs-cflags,$(REQ_BOOST_LIBS)) LIBS_all += $(LUALIBDIR)/fawkesutils.so + LDFLAGS += $(call boost-libs-ldflags,$(REQ_BOOST_LIBS)) + + LIBS_all = $(LIBDIR)/libfawkesutils.so TARGETS_all += $(SRCDIR)/fawkesutils_tolua.cpp else ifneq ($(HAVE_CPP11),1) @@ -54,6 +61,9 @@ else ifneq ($(HAVE_TOLUA),1) WARN_TARGETS += warning_tolua_wrapper endif + ifneq ($(HAVE_BOOST_LIBS),1) + WARN_TARGETS_BOOST = $(foreach l,$(REQ_BOOST_LIBS),$(if $(call boost-have-lib,$l),, warning_boost_$l)) + endif endif ifneq ($(HAVE_INOTIFY),1) @@ -61,7 +71,7 @@ ifneq ($(HAVE_INOTIFY),1) endif ifeq ($(OBJSSUBMAKE),1) -all: $(WARN_TARGETS) +all: $(WARN_TARGETS) $(WARN_TARGETS_BOOST) .PHONY: warning_libmagic warning_inotify warning_libmagic: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Restricted file type detection support$(TNORMAL) (file[-devel] (libmagic) not installed)" @@ -69,6 +79,9 @@ warning_libmagic: warning_cpp11: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting utils$(TNORMAL) " \ "(CPP11 not available)" +$(WARN_TARGETS_BOOST): warning_boost_%: + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Cannot build utils library$(TNORMAL) (Boost library $* not found)"endif + endif $(LUALIBDIR)/fawkesutils.$(SOEXT): | $(LIBDIR)/libfawkesutils.$(SOEXT) - *commit* 3fe968b97602da6b1917fd1fc07f7735d9255482 - - - - - - - - - - Author: Frederik Zwilling <zwill...@kbsg.rwth-aachen.de> Date: Tue Sep 20 19:30:53 2016 +0200 Subject: openprs: properly use moved sub_process utils .../openprs/aspect/openprs_kernel_manager.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/openprs/aspect/openprs_kernel_manager.cpp b/src/plugins/openprs/aspect/openprs_kernel_manager.cpp index 79320c9..38fb262 100644 --- a/src/plugins/openprs/aspect/openprs_kernel_manager.cpp +++ b/src/plugins/openprs/aspect/openprs_kernel_manager.cpp @@ -21,7 +21,7 @@ */ #include <plugins/openprs/aspect/openprs_kernel_manager.h> -#include <plugins/openprs/utils/proc.h> +#include <utils/sub_process/proc.h> #include <utils/misc/string_commands.h> #include <logging/logger.h> #include <config/config.h> -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
