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, thofmann/threading-multi-recover-examle has been created at 9b4dc88943a9ac460f368104dda893a11af17878 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/threading-multi-recover-examle - *Log* --------------------------------------------------------------- commit 9b4dc88943a9ac460f368104dda893a11af17878 Merge: a813cad 39fa4ff Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Tue May 20 13:48:06 2014 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Tue May 20 13:48:06 2014 +0200 Merge branch 'unittests' into syncpoint-with-tests Conflicts: etc/buildsys/rules.mk http://git.fawkesrobotics.org/fawkes.git/commit/9b4dc88 http://trac.fawkesrobotics.org/changeset/9b4dc88 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- - *Diffs* ------------------------------------------------------------- - *commit* 9b4dc88943a9ac460f368104dda893a11af17878 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Tue May 20 13:48:06 2014 +0200 Subject: Merge branch 'unittests' into syncpoint-with-tests etc/buildsys/rules.mk | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) _Diff for modified files_: diff --cc etc/buildsys/rules.mk index 30a7448,7bc6baa..18d49ba --- a/etc/buildsys/rules.mk +++ b/etc/buildsys/rules.mk @@@ -76,21 -91,13 +93,23 @@@ endi ifeq ($(MAKELEVEL),1) EXTRA_ALL = $(LIBS_gui) $(PLUGINS_gui) $(BINS_gui) $(TARGETS_gui) $(MANPAGES_gui) endif -all: presubdirs $(LIBS_all:%.so=%.$(SOEXT)) $(PLUGINS_all:%.so=%.$(SOEXT)) $(BINS_all) $(MANPAGES_all) $(TARGETS_all) $(EXTRA_ALL) subdirs -gui: presubdirs $(LIBS_gui:%.so=%.$(SOEXT)) $(PLUGINS_gui:%.so=%.$(SOEXT)) $(BINS_gui) $(MANPAGES_gui) $(TARGETS_gui) subdirs +all: presubdirs $(LIBS_all:%.so=%.$(SOEXT)) $(PLUGINS_all:%.so=%.$(SOEXT)) $(BINS_all) $(MANPAGES_all) $(TARGETS_all) $(EXTRA_ALL) subdirs | silent-nothing-to-do-all +gui: presubdirs $(LIBS_gui:%.so=%.$(SOEXT)) $(PLUGINS_gui:%.so=%.$(SOEXT)) $(BINS_gui) $(MANPAGES_gui) $(TARGETS_gui) subdirs | silent-nothing-to-do-gui + test: presubdirs $(LIBS_test:%.so=%.$(SOEXT)) $(PLUGINS_test:%.so=%.$(SOEXT)) $(BINS_test) $(TARGETS_test) subdirs uncolored-all: all uncolored-gui: gui + uncolored-test: test +BUILT_PARTS= +.PHONY: silent-nothing-to-do-gui silent-nothing-to-do-all +silent-nothing-to-do-all: + $(SILENTSYMB)if [ -z "$(BUILT_PARTS)" ]; then echo -e "$(INDENT_PRINT)--- Nothing to do in $(TGRAY)$(PARENTDIR)$(TNORMAL) for target$(if $(subst 1,,$(words $(MAKECMDGOALS))),s) $(TBOLDGRAY)$(MAKECMDGOALS)$(TNORMAL)"; fi + $(eval BUILT_PARTS += $@) + +silent-nothing-to-do-gui: + $(SILENTSYMB)if [ -z "$(BUILT_PARTS)" ]; then echo -e "$(INDENT_PRINT)--- Nothing to do in $(TGRAY)$(PARENTDIR)$(TNORMAL) for target$(if $(subst 1,,$(words $(MAKECMDGOALS))),s) $(TBOLDGRAY)$(MAKECMDGOALS)$(TNORMAL)"; fi + $(eval BUILT_PARTS += $@) + ifdef OBJS_all ifneq ($(OBJS_all),) # Do not delete .o files to allow for incremental builds @@@ -121,8 -129,24 +140,13 @@@ clean: presubdirs subdir $(SILENT)$(foreach P,$(PLUGINS_gui:%.so=%.$(SOEXT)),rm -f $(P);) $(SILENT)$(foreach M,$(MANPAGES_gui),rm -f $(M);) $(SILENT)$(foreach T,$(TARGETS_gui),rm -rf $(T);) + $(SILENT)$(foreach B,$(BINS_test),rm -f $(B);) + $(SILENT)$(foreach L,$(LIBS_test:%.so=%.$(SOEXT)),rm -f $(addsuffix *,$(L));) + $(SILENT)$(foreach P,$(PLUGINS_test:%.so=%.$(SOEXT)),rm -f $(P);) + $(SILENT)$(foreach M,$(MANPAGES_test),rm -f $(M);) + $(SILENT)$(foreach T,$(TARGETS_test),rm -rf $(T);) $(SILENT)$(foreach E,$(CLEAN_FILES),rm -rf $(E);) -ifeq (,$(findstring qa,$(SUBDIRS))) -.PHONY: qa -qa: presubdirs subdirs - $(SILENT) if [ -d "$(subst /.objs,,$(abspath $(CURDIR)))/qa" ]; then \ - echo -e "$(INDENT_PRINT)--> Building QA in $(subst $(abspath $(CURDIR)/$(BASEDIR))/,,$(subst /.objs,,$(abspath $(CURDIR)))/qa)"; \ - $(MAKE) --no-print-directory --no-keep-going -C "$(subst /.objs,,$(CURDIR))/qa" \ - SRCDIR="$(subst /.objs,,$(CURDIR))/qa" $(MFLAGS) INDENT="$(INDENT)$(INDENT_STRING)" \ - OBJSSUBMAKE=0 || exit $$?; \ - fi -endif - .PHONY: presubdirs $(PRESUBDIRS) subdirs $(SUBDIRS) presubdirs: $(PRESUBDIRS) subdirs: $(SUBDIRS) -- 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
