[Fawkes Git] branch/master: 10 revs updated. (0.5.0-3382-g540e6d2)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Wed Sep 7 22:18:45 CEST 2016


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, master has been updated
        to  540e6d2958d689d64b10691381b4b798e5925f81 (commit)
       via  dd7e5bd3af5c9a3c073dde2e07db2cbbde85201d (commit)
       via  9d7ca3e3a407b6862e7b861418c952fd047965cf (commit)
       via  95d5085bd02c1229d8ba759cfb44ee39275ffcd2 (commit)
       via  b8e3f12789ba0e8d2c947aabf69b4dd73c414a8a (commit)
       via  b9f369c5461b485e2ed3a2a1da2a75f5a48edb15 (commit)
       via  1ac4c8d8cd9eb2cbb2eb735b7e2a09961e8fb04e (commit)
       via  18e89477718bc1d0f953c8a38112ef327c576db4 (commit)
       via  385c4dd3778fce962807033aa5a4c152e835e92d (commit)
       via  aacfa6ac15407ff9195fe8cb1719ee9368629f86 (commit)
      from  20da72625cded9155c00b7120a597994819e2dd3 (commit)

http://git.fawkesrobotics.org/fawkes.git/master

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit aacfa6ac15407ff9195fe8cb1719ee9368629f86
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:01:46 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:01:46 2016 +0200

    buildsys: modernize output of sysinstall rules

http://git.fawkesrobotics.org/fawkes.git/commit/aacfa6a
http://trac.fawkesrobotics.org/changeset/aacfa6a

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 385c4dd3778fce962807033aa5a4c152e835e92d
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:02:22 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:30:20 2016 +0200

    buildsys: support arbitrary file installation for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/385c4dd
http://trac.fawkesrobotics.org/changeset/385c4dd

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 18e89477718bc1d0f953c8a38112ef327c576db4
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:04:42 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:30:20 2016 +0200

    clips: copy CLIPS files for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/18e8947
http://trac.fawkesrobotics.org/changeset/18e8947

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 1ac4c8d8cd9eb2cbb2eb735b7e2a09961e8fb04e
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:04:47 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:30:20 2016 +0200

    clips-agent: copy CLIPS files for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/1ac4c8d
http://trac.fawkesrobotics.org/changeset/1ac4c8d

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b9f369c5461b485e2ed3a2a1da2a75f5a48edb15
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:04:58 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:52:16 2016 +0200

    clips-navgraph: copy CLIPS files for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/b9f369c
http://trac.fawkesrobotics.org/changeset/b9f369c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit b8e3f12789ba0e8d2c947aabf69b4dd73c414a8a
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:05:33 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:52:16 2016 +0200

    clips-protobuf: copy CLIPS files for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/b8e3f12
http://trac.fawkesrobotics.org/changeset/b8e3f12

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 95d5085bd02c1229d8ba759cfb44ee39275ffcd2
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:05:42 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:53:15 2016 +0200

    clips-ros: copy CLIPS files for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/95d5085
http://trac.fawkesrobotics.org/changeset/95d5085

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 9d7ca3e3a407b6862e7b861418c952fd047965cf
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:06:00 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 21:53:15 2016 +0200

    openprs: copy OpenPRS files for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/9d7ca3e
http://trac.fawkesrobotics.org/changeset/9d7ca3e

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit dd7e5bd3af5c9a3c073dde2e07db2cbbde85201d
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:06:04 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 22:05:54 2016 +0200

    openprs-agent: copy OpenPRS files for sysinstall

http://git.fawkesrobotics.org/fawkes.git/commit/dd7e5bd
http://trac.fawkesrobotics.org/changeset/dd7e5bd

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 540e6d2958d689d64b10691381b4b798e5925f81
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Wed Sep 7 21:06:47 2016 +0200
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Sep 7 22:05:54 2016 +0200

    joystick: add missing linking against libm

http://git.fawkesrobotics.org/fawkes.git/commit/540e6d2
http://trac.fawkesrobotics.org/changeset/540e6d2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 etc/buildsys/btypes/config_sysinstall.mk |   15 ++++++--
 etc/buildsys/btypes/rules_sysinstall.mk  |   53 +++++++++++++++++++++--------
 src/plugins/clips-agent/Makefile         |    6 +++
 src/plugins/clips-navgraph/Makefile      |    6 +++
 src/plugins/clips-protobuf/Makefile      |    6 +++
 src/plugins/clips-ros/Makefile           |    6 +++
 src/plugins/clips/Makefile               |    8 ++++-
 src/plugins/joystick/Makefile            |    6 ++--
 src/plugins/openprs-agent/Makefile       |   10 ++++-
 src/plugins/openprs/Makefile             |   12 +++++--
 10 files changed, 100 insertions(+), 28 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* aacfa6ac15407ff9195fe8cb1719ee9368629f86 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:01:46 2016 +0200
Subject: buildsys: modernize output of sysinstall rules

 etc/buildsys/btypes/rules_sysinstall.mk |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

_Diff for modified files_:
diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk
index 9b38c21..5e16ed8 100644
--- a/etc/buildsys/btypes/rules_sysinstall.mk
+++ b/etc/buildsys/btypes/rules_sysinstall.mk
@@ -51,21 +51,22 @@ resdirs: $(INST_RESDIRS)
 ifneq ($(INST_RESDIRS),)
 $(INST_RESDIRS):
 	$(SILENTSYMB) if [ -d "$(RESDIR)/$@" ]; then	\
-		echo -e "$(INDENT_PRINT)--- Copying resource directory $@ to $(DESTDIR)$(EXEC_RESDIR)/$@"; \
+		echo -e "$(INDENT_PRINT)[DIR] $(DESTDIR)$(TBOLDGRAY)$(RESDIR)/$@$(TNORMAL)"; \
 		mkdir -p $(DESTDIR)$(EXEC_RESDIR)/$@ || exit $?; \
+		echo -e "$(INDENT_PRINT)[CPY] $(PARENTDIR)$(TBOLDGRAY)$@(TNORMAL) -> $(DESTDIR)$(EXEC_RESDIR)/$@"; \
 		cp -af $(RESDIR)/$@/* $(DESTDIR)$(EXEC_RESDIR)/$@ || exit $$?; \
 	fi
 endif
 
 install_config:
 ifeq ($(abspath $(SRCDIR)),$(abspath $(BASEDIR)))
-	$(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Creating config directory $(DESTDIR)$(EXEC_CONFDIR)"
+	$(SILENT)echo -e "$(INDENT_PRINT)[DIR] $(DESTDIR)$(TBOLDGRAY)$(EXEC_CONFDIR)$(TNORMAL)"
 	$(SILENT)mkdir -p $(DESTDIR)$(EXEC_CONFDIR)
 	$(SILENT)for f in $$(find cfg/ ! -name '*.db' -type f); do \
 		if [ -e "$(DESTDIR)$(EXEC_CONFDIR)/$${f/cfg\//}" ]; then \
-			echo -e "$(INDENT_PRINT)--- $(TYELLOW)Omitting$(TNORMAL) config file $$f, already exists"; \
+			echo -e "$(INDENT_PRINT)[CPY] $(TYELLOW)Omitting config file $(TNORMAL)$(PARENTDIR)$(TBOLDGRAY)$$f$(TNORMAL) (file already exists)"; \
 		else \
-			echo -e "$(INDENT_PRINT)--- Copying config file $$f"; \
+			echo -e "$(INDENT_PRINT)[CPY] $(PARENTDIR)$(TBOLDGRAY)$$f$(TNORMAL) -> $(DESTDIR)$(EXEC_CONFDIR)/$${f/cfg\//}"; \
 			install -D -m 644 $$f $(DESTDIR)$(EXEC_CONFDIR)/$${f/cfg\//}; \
 		fi \
 	done
@@ -73,36 +74,36 @@ endif
 
 install_buildsys:
 ifeq ($(abspath $(SRCDIR)),$(abspath $(BASEDIR)))
-	$(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Creating buildsys directory $(DESTDIR)$(EXEC_CONFDIR)"
+	$(SILENT)echo -e "$(INDENT_PRINT)[DIR] $(DESTDIR)$(TBOLDGRAY)$(EXEC_BUILDSYSDIR)$(TNORMAL)"
 	$(SILENT)mkdir -p $(DESTDIR)$(EXEC_BUILDSYSDIR)
 	$(SILENT)for f in $$(find $(BUILDSYSDIR) -type d -printf "%P\n"); do \
 		if [ "$$F" == "" ]; then continue; fi; \
 		mkdir -p $(BUILDSYSDIR)/$$f; \
 	done
 	$(SILENT)for f in $$(find $(BUILDSYSDIR) -type f ! -regex '.*[\~#]$$' -printf "%P\n"); do \
-		echo -e "$(INDENT_PRINT)--- Copying buildsys file $$f"; \
+		echo -e "$(INDENT_PRINT)[CPY] $(subst $(realpath $(TOP_BASEDIR))/,,$(BUILDSYSDIR))/$(TBOLDGRAY)$$f$(TNORMAL) -> $(DESTDIR)$(EXEC_BUILDSYSDIR)/$$f"; \
 		install -D -m 644 $(BUILDSYSDIR)/$$f $(DESTDIR)$(EXEC_BUILDSYSDIR)/$$f; \
 	done
 	$(SILENT)echo -e "$(INDENT_PRINT)--- Setting installed build type to 'syswide'";
 	$(SILENT)sed -i -e 's/^BUILD_TYPE=.*$$/BUILD_TYPE=syswide/' $(DESTDIR)$(EXEC_BUILDSYSDIR)/buildtype.mk
 	$(SILENT)echo -e "$(INDENT_PRINT)--- Setting installed INSTALL_PREFIX to '$(PREFIX)'";
 	$(SILENT)sed -i -e 's|^INSTALL_PREFIX\( *\)=.*$$|INSTALL_PREFIX\1= $(PREFIX)|' $(DESTDIR)$(EXEC_BUILDSYSDIR)/btypes/config_syswide.mk
-	$(SILENT)mkdir -p $(DESTDIR)$(EXEC_BUILDCONFDIR)
+	$(SILENT)echo -e "$(INDENT_PRINT)[DIR] $(DESTDIR)$(TBOLDGRAY)$(EXEC_BUILDCONFDIR)$(TNORMAL)"
 	$(SILENT)find $(BUILDCONFDIR) -name '*.mk' -type f -printf "%f:%P\n" | \
 		while IFS=":" read basename relname; \
 		do \
-			echo -e "$(INDENT_PRINT)--- Copying buildsys config file $$relname"; \
-		install -D -m 644 $(BUILDCONFDIR)/$$relname $(DESTDIR)$(EXEC_BUILDCONFDIR)/$$basename; \
+			echo -e "$(INDENT_PRINT)[CPY] $(subst $(realpath $(TOP_BASEDIR))/,,$(BUILDCONFDIR))/$(TBOLDGRAY)$$relname$(TNORMAL) -> $(DESTDIR)$(EXEC_BUILDSYSDIR)/$$basename"; \
+			install -D -m 644 $(BUILDCONFDIR)/$$relname $(DESTDIR)$(EXEC_BUILDCONFDIR)/$$basename; \
 		done
 
 endif
 
 install_lua:
 ifeq ($(abspath $(SRCDIR)),$(abspath $(BASEDIR)))
-	$(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Creating Lua directory $(DESTDIR)$(EXEC_LUADIR)"
+	$(SILENT)echo -e "$(INDENT_PRINT)[DIR] $(DESTDIR)$(TBOLDGRAY)$(EXEC_LUADIR)$(TNORMAL)"
 	$(SILENT)mkdir -p $(DESTDIR)$(EXEC_LUADIR)
 	$(SILENT)for f in $$(find src/lua/ -name '*.lua'); do \
-		echo -e "$(INDENT_PRINT)--- Copying Lua file $$f"; \
+		echo -e "$(INDENT_PRINT)[CPY] $(PARENTDIR)$(TBOLDGRAY)$$f$(TNORMAL) -> $(DESTDIR)$(EXEC_LUADIR)/$${f/src\/lua\//}"; \
 		install -D -m 644 $$f $(DESTDIR)$(EXEC_LUADIR)/$${f/src\/lua\//}; \
 	done
 endif
@@ -111,8 +112,9 @@ install_apidoc:
 ifeq ($(abspath $(SRCDIR)),$(abspath $(BASEDIR)))
 	$(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Creating documentation directory $(DESTDIR)$(EXEC_DOCDIR)"
 	$(SILENT)if [ -d "$(DOCDIR)/api/html" ]; then \
+		echo -e "$(INDENT_PRINT)[DIR] $(DESTDIR)$(TBOLDGRAY)$(EXEC_DOCDIR)$(TNORMAL)"; \
 		mkdir -p $(DESTDIR)$(EXEC_DOCDIR); \
-		echo -e "$(INDENT_PRINT)--- Copying API documentation"; \
+		echo -e "$(INDENT_PRINT)[CPY] $(DOCDIR)/api/html/* -> $(DESTDIR)$(EXEC_DOCDIR)"; \
 		cp -ar $(DOCDIR)/api/html/* $(DESTDIR)$(EXEC_DOCDIR); \
 	else \
 		echo -e "$(INDENT_PRINT)--- $(TYELLOW)API documentation not generated, not copying$(TNORMAL)"; \

- *commit* 385c4dd3778fce962807033aa5a4c152e835e92d - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:02:22 2016 +0200
Subject: buildsys: support arbitrary file installation for sysinstall

 etc/buildsys/btypes/config_sysinstall.mk |   15 +++++++++++----
 etc/buildsys/btypes/rules_sysinstall.mk  |   27 ++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

_Diff for modified files_:
diff --git a/etc/buildsys/btypes/config_sysinstall.mk b/etc/buildsys/btypes/config_sysinstall.mk
index b1df852..6fac9e2 100644
--- a/etc/buildsys/btypes/config_sysinstall.mk
+++ b/etc/buildsys/btypes/config_sysinstall.mk
@@ -37,13 +37,14 @@ SYSCONFDIR     = /etc/fawkes
 CFLAGS_BASE    = $(CFLAGS_MINIMUM)
 LDFLAGS_BASE   = $(LDFLAGS_MINIMUM) -Wl,-rpath=$(EXEC_LIBDIR)/fawkes/interfaces
 
-# Note: the install scripts make the assumption that FFLIBDIR, RESDIR and INCDIR
+# Note: the install scripts make the assumption that FFLIBDIR, SHAREDIR and INCDIR
 # paths (with EXEC_ prefix) are specific to Fawkes and can be deleted completely
 # without interfering with the rest of the system!
 FFLIBSUBDIR        = fawkes
 EXEC_BASEDIR       = $(abspath $(PREFIX))
 EXEC_CONFDIR       = $(SYSCONFDIR)
-EXEC_RESDIR        = $(EXEC_BASEDIR)/share/fawkes
+EXEC_SHAREDIR      = $(EXEC_BASEDIR)/share/fawkes
+EXEC_RESDIR        = $(EXEC_SHAREDIR)/res
 EXEC_LIBDIR        = $(EXEC_BASEDIR)/lib$(LIBBITS)
 EXEC_FFLIBDIR      = $(EXEC_LIBDIR)/$(FFLIBSUBDIR)
 EXEC_PLUGINDIR     = $(EXEC_FFLIBDIR)/plugins
@@ -52,11 +53,17 @@ EXEC_INCDIR        = $(EXEC_BASEDIR)/include/fawkes
 EXEC_DFILEDIR      = $(EXEC_BASEDIR)/share/applications
 EXEC_DOCDIR        = $(EXEC_BASEDIR)/share/doc/fawkes-$(FAWKES_VERSION)
 EXEC_MANDIR        = $(EXEC_BASEDIR)/share/man
-EXEC_LUADIR        = $(EXEC_RESDIR)/lua
+EXEC_LUADIR        = $(EXEC_SHAREDIR)/lua
 EXEC_LUALIBDIR     = $(EXEC_FFLIBDIR)/lua
-EXEC_BUILDSYSDIR   = $(EXEC_RESDIR)/buildsys
+EXEC_BUILDSYSDIR   = $(EXEC_SHAREDIR)/buildsys
 EXEC_BUILDCONFDIR  = $(EXEC_BUILDSYSDIR)/conf
 
+FILE_INSTALL = install
+
+# The default file mode used for additional install files
+# (using INSTALL_extra targets)
+FILEMODE_DEFAULT   = 0644
+
 ifneq ($(CFLAGS_EXT),)
   CFLAGS_BASE += $(CFLAGS_EXT)
 endif
diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk
index 5e16ed8..fd21a2a 100644
--- a/etc/buildsys/btypes/rules_sysinstall.mk
+++ b/etc/buildsys/btypes/rules_sysinstall.mk
@@ -34,7 +34,10 @@ MANPAGES_install = $(addprefix $(DESTDIR)$(EXEC_MANDIR)/,$(patsubst $(abspath $(
 # Main install target
 .PHONY: install install_test_basedir install_config install_buildsys install_lua install_apidoc uncolored-install
 uncolored-install: install
-install: install_test_basedir presubdirs $(subst $(LIBDIR),$(DESTDIR)$(EXEC_LIBDIR),$(LIBS_all) $(LIBS_gui)) $(subst $(PLUGINDIR),$(DESTDIR)$(EXEC_PLUGINDIR),$(PLUGINS_all)) $(subst $(BINDIR),$(DESTDIR)$(EXEC_BINDIR),$(BINS_all) $(BINS_gui)) $(MANPAGES_install) resdirs subdirs install_buildsys install_config install_lua install_apidoc
+install: install_test_basedir presubdirs install_targets install_resdirs install_extra subdirs install_buildsys install_config install_lua install_apidoc
+ifeq ($(abspath $(SRCDIR)),$(abspath $(BASEDIR)))
+	$(SILENT)echo -e "$(TGREEN)*** Installation completed ***$(TNORMAL)"
+endif
 
 # Only allow "make install" from basedir
 install_test_basedir:
@@ -45,8 +48,26 @@ ifeq ($(INDENT),)
 endif
 endif
 
-.PHONY: resdirs $(INST_RESDIRS)
-resdirs: $(INST_RESDIRS)
+.PHONY: install_targets
+install_targets: $(subst $(LIBDIR),$(DESTDIR)$(EXEC_LIBDIR),$(LIBS_all) $(LIBS_gui)) $(subst $(PLUGINDIR),$(DESTDIR)$(EXEC_PLUGINDIR),$(PLUGINS_all)) $(subst $(BINDIR),$(DESTDIR)$(EXEC_BINDIR),$(BINS_all) $(BINS_gui)) $(MANPAGES_install)
+
+.PHONY: install_resdirs $(INST_RESDIRS)
+install_resdirs: $(INST_RESDIRS)
+
+.PHONY: install_extra $(INSTALL_extra)
+install_extra: $(INSTALL_extra)
+
+ifneq ($(INSTALL_extra),1)
+$(INSTALL_extra): %: $$(FILES_$$(call nametr,$$*))
+	$(SILENTSYMB)for f in $(subst $(SRCDIR)/,,$^); do \
+		if [ ! -d $(DESTDIR)$(DESTDIR_$*) ]; then \
+			echo -e "$(INDENT_PRINT)[DIR] $(DESTDIR)$(TBOLDGRAY)$(DESTDIR_$*)$(TNORMAL)"; \
+			mkdir -p "$(DESTDIR)$(DESTDIR_$*)"; \
+		fi; \
+		echo -e "$(INDENT_PRINT)[CPY] $(PARENTDIR)$(TBOLDGRAY)$$f$(TNORMAL) -> $(DESTDIR)$(DESTDIR_$*)"; \
+		$(FILE_INSTALL) -m $(if $(FILEMODE_$*),$(FILEMODE_$*),$(FILEMODE_DEFAULT)) -t $(DESTDIR)$(DESTDIR_$*) $(SRCDIR)/$$f; \
+	done
+endif
 
 ifneq ($(INST_RESDIRS),)
 $(INST_RESDIRS):

- *commit* 18e89477718bc1d0f953c8a38112ef327c576db4 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:04:42 2016 +0200
Subject: clips: copy CLIPS files for sysinstall

 src/plugins/clips/Makefile |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/clips/Makefile b/src/plugins/clips/Makefile
index 74eb584..54d7a47 100644
--- a/src/plugins/clips/Makefile
+++ b/src/plugins/clips/Makefile
@@ -24,6 +24,10 @@ OBJS_clips = clips_plugin.o clips_thread.o \
 
 OBJS_all = $(OBJS_clips)
 
+# Extra files for system-wide install, i.e., "make install"
+FILES_clips_files   = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/clips/*.clp))
+DESTDIR_clips_files = $(EXEC_SHAREDIR)/clips/clips
+
 ifeq ($(CC),gcc)
   ifneq ($(call gcc_atleast_version,4,6),1)
     GCC_TOO_OLD=1
@@ -38,7 +42,9 @@ ifneq ($(GCC_TOO_OLD),1)
     LDFLAGS += $(LDFLAGS_CLIPS)
 
     PLUGINS_all = $(PLUGINDIR)/clips.so
-  else
+
+		INSTALL_extra = clips_files
+else
     WARN_TARGETS += warning_clips
   endif
 else

- *commit* 1ac4c8d8cd9eb2cbb2eb735b7e2a09961e8fb04e - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:04:47 2016 +0200
Subject: clips-agent: copy CLIPS files for sysinstall

 src/plugins/clips-agent/Makefile |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/clips-agent/Makefile b/src/plugins/clips-agent/Makefile
index 3c0192a..23e3fdf 100644
--- a/src/plugins/clips-agent/Makefile
+++ b/src/plugins/clips-agent/Makefile
@@ -25,11 +25,17 @@ OBJS_clips_agent = clips_agent_plugin.o clips_agent_thread.o
 
 OBJS_all = $(OBJS_clips_agent)
 
+# Extra files for system-wide install, i.e., "make install"
+FILES_clips_files   = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/clips/*.clp))
+DESTDIR_clips_files = $(EXEC_SHAREDIR)/clips/clips-agent
+
 ifeq ($(HAVE_CLIPS),1)
   CFLAGS  += $(CFLAGS_CLIPS)
   LDFLAGS += $(LDFLAGS_CLIPS)
 
   PLUGINS_all = $(PLUGINDIR)/clips-agent.so
+
+	INSTALL_extra = clips_files
 else
   WARN_TARGETS += warning_clips
 endif

- *commit* b9f369c5461b485e2ed3a2a1da2a75f5a48edb15 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:04:58 2016 +0200
Subject: clips-navgraph: copy CLIPS files for sysinstall

 src/plugins/clips-navgraph/Makefile |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/clips-navgraph/Makefile b/src/plugins/clips-navgraph/Makefile
index d3d054c..aad5215 100644
--- a/src/plugins/clips-navgraph/Makefile
+++ b/src/plugins/clips-navgraph/Makefile
@@ -25,11 +25,17 @@ OBJS_clips_navgraph = clips_navgraph_plugin.o clips_navgraph_thread.o
 
 OBJS_all = $(OBJS_clips_navgraph)
 
+# Extra files for system-wide install, i.e., "make install"
+FILES_clips_files   = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/clips/*.clp))
+DESTDIR_clips_files = $(EXEC_SHAREDIR)/clips/clips-navgraph
+
 ifeq ($(HAVE_CPP11)$(HAVE_CLIPS)$(HAVE_NAVGRAPH),111)
   CFLAGS  += $(CFLAGS_CLIPS) $(CFLAGS_CPP11)
   LDFLAGS += $(LDFLAGS_CLIPS)
 
   PLUGINS_all = $(PLUGINDIR)/clips-navgraph.$(SOEXT)
+
+	INSTALL_extra = clips_files
 else
   ifneq ($(HAVE_CPP11),1)
     WARN_TARGETS += warning_cpp11

- *commit* b8e3f12789ba0e8d2c947aabf69b4dd73c414a8a - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:05:33 2016 +0200
Subject: clips-protobuf: copy CLIPS files for sysinstall

 src/plugins/clips-protobuf/Makefile |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/clips-protobuf/Makefile b/src/plugins/clips-protobuf/Makefile
index d8ef107..f2e5233 100644
--- a/src/plugins/clips-protobuf/Makefile
+++ b/src/plugins/clips-protobuf/Makefile
@@ -26,6 +26,10 @@ OBJS_clips_protobuf = clips-protobuf-plugin.o clips-protobuf-thread.o
 
 OBJS_all = $(OBJS_clips_protobuf)
 
+# Extra files for system-wide install, i.e., "make install"
+FILES_clips_files   = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/clips/*.clp))
+DESTDIR_clips_files = $(EXEC_SHAREDIR)/clips/clips-protobuf
+
 REQ_BOOST_LIBS = system
 HAVE_BOOST_LIBS = $(call boost-have-libs,$(REQ_BOOST_LIBS))
 
@@ -36,6 +40,8 @@ ifeq ($(HAVE_CPP11)$(HAVE_PROTOBUF)$(HAVE_CLIPS)$(HAVE_BOOST_LIBS),1111)
 	     $(call boost-libs-ldflags,$(REQ_BOOST_LIBS))
 
   PLUGINS_all = $(PLUGINDIR)/clips-protobuf.so
+
+	INSTALL_extra = clips_files
 else
   ifneq ($(HAVE_CPP11),1)
     WARN_TARGETS += warning_cpp11

- *commit* 95d5085bd02c1229d8ba759cfb44ee39275ffcd2 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:05:42 2016 +0200
Subject: clips-ros: copy CLIPS files for sysinstall

 src/plugins/clips-ros/Makefile |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/clips-ros/Makefile b/src/plugins/clips-ros/Makefile
index 0c84a78..a558322 100644
--- a/src/plugins/clips-ros/Makefile
+++ b/src/plugins/clips-ros/Makefile
@@ -28,6 +28,10 @@ OBJS_clips_ros = clips_ros_plugin.o clips_ros_thread.o
 
 OBJS_all = $(OBJS_clips_ros)
 
+# Extra files for system-wide install, i.e., "make install"
+FILES_clips_files   = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/clips/*.clp))
+DESTDIR_clips_files = $(EXEC_SHAREDIR)/clips/clips-ros
+
 ifeq ($(HAVE_CPP11)$(HAVE_ROS)$(HAVE_CLIPS)$(HAVE_BOOST_LIBS)$(call ros-have-pkg,xmlrpcpp),11111)
   CFLAGS  += $(CFLAGS_ROS)  $(CFLAGS_CLIPS) $(call ros-pkg-cflags,xmlrpcpp) $(CFLAGS_CPP11) \
              $(call boost-libs-cflags,$(REQ_BOOST_LIBS))
@@ -35,6 +39,8 @@ ifeq ($(HAVE_CPP11)$(HAVE_ROS)$(HAVE_CLIPS)$(HAVE_BOOST_LIBS)$(call ros-have-pkg
              $(call boost-libs-ldflags,$(REQ_BOOST_LIBS))
 
   PLUGINS_all = $(PLUGINDIR)/clips-ros.$(SOEXT)
+
+	INSTALL_extra = clips_files
 else
   ifneq ($(HAVE_CPP11),1)
     WARN_TARGETS += warning_cpp11

- *commit* 9d7ca3e3a407b6862e7b861418c952fd047965cf - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:06:00 2016 +0200
Subject: openprs: copy OpenPRS files for sysinstall

 src/plugins/openprs/Makefile |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/openprs/Makefile b/src/plugins/openprs/Makefile
index 87f9567..5135fc8 100644
--- a/src/plugins/openprs/Makefile
+++ b/src/plugins/openprs/Makefile
@@ -35,14 +35,18 @@ OBJS_openprs_mod_blackboard = mod_blackboard.o
 LIBS_openprs_mod_config = fawkescore fawkesutils fawkesconfig fawkesnetcomm
 OBJS_openprs_mod_config = mod_config.o
 
+OBJS_all = $(OBJS_openprs) $(OBJS_openprs_mod_utils) \
+	   $(OBJS_openprs_mod_time) $(OBJS_openprs_mod_blackboard) \
+	   $(OBJS_openprs_mod_config)
+
 INST_LIB_SUBDIR_openprs_mod_utils = $(FFLIBSUBDIR)
 INST_LIB_SUBDIR_openprs_mod_time = $(FFLIBSUBDIR)
 INST_LIB_SUBDIR_openprs_mod_blackboard = $(FFLIBSUBDIR)
 INST_LIB_SUBDIR_openprs_mod_config = $(FFLIBSUBDIR)
 
-OBJS_all = $(OBJS_openprs) $(OBJS_openprs_mod_utils) \
-	   $(OBJS_openprs_mod_time) $(OBJS_openprs_mod_blackboard) \
-	   $(OBJS_openprs_mod_config)
+# Extra files for system-wide install, i.e., "make install"
+FILES_openprs_files   = $(subst $(SRCDIR)/,,$(wildcard $(addprefix $(SRCDIR)/data/,*.opf *.inc)))
+DESTDIR_openprs_files = $(EXEC_SHAREDIR)/openprs/data
 
 ifeq ($(HAVE_OPENPRS),1)
   PRESUBDIRS += utils aspect
@@ -69,6 +73,8 @@ ifeq ($(HAVE_OPENPRS),1)
 		$(OPENPRS_MOD_DIR)/mod_time.so \
 		$(OPENPRS_MOD_DIR)/mod_blackboard.so \
 		$(OPENPRS_MOD_DIR)/mod_config.so
+
+	INSTALL_extra = openprs_files
 else
   WARN_TARGETS += warning_openprs
 endif

- *commit* dd7e5bd3af5c9a3c073dde2e07db2cbbde85201d - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:06:04 2016 +0200
Subject: openprs-agent: copy OpenPRS files for sysinstall

 src/plugins/openprs-agent/Makefile |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/openprs-agent/Makefile b/src/plugins/openprs-agent/Makefile
index 7383aa2..ca09984 100644
--- a/src/plugins/openprs-agent/Makefile
+++ b/src/plugins/openprs-agent/Makefile
@@ -31,12 +31,16 @@ OBJS_openprs_mod_protobuf = oprs_protobuf.o mod_protobuf.o
 LIBS_openprs_mod_navgraph = fawkescore fawkesnavgraph fawkesconfig fawkesnetcomm
 OBJS_openprs_mod_navgraph = mod_navgraph.o
 
+OBJS_all = $(OBJS_openprs_agent) $(OBJS_openprs_mod_skiller) \
+	   $(OBJS_openprs_mod_protobuf) $(OBJS_openprs_mod_navgraph)
+
 INST_LIB_SUBDIR_openprs_mod_skiller  = $(FFLIBSUBDIR)
 INST_LIB_SUBDIR_openprs_mod_protobuf = $(FFLIBSUBDIR)
 INST_LIB_SUBDIR_openprs_mod_navgraph = $(FFLIBSUBDIR)
 
-OBJS_all = $(OBJS_openprs_agent) $(OBJS_openprs_mod_skiller) \
-	   $(OBJS_openprs_mod_protobuf) $(OBJS_openprs_mod_navgraph)
+# Extra files for system-wide install, i.e., "make install"
+FILES_openprs_files   = $(subst $(SRCDIR)/,,$(wildcard $(addprefix $(SRCDIR)/data/,*.opf *.inc *.sym)))
+DESTDIR_openprs_files = $(EXEC_SHAREDIR)/openprs/openprs-agent
 
 ifeq ($(HAVE_OPENPRS),1)
   CFLAGS  += $(CFLAGS_OPENPRS)
@@ -58,6 +62,8 @@ ifeq ($(HAVE_OPENPRS),1)
   LIBS_all   += $(OPENPRS_MOD_DIR)/mod_skiller.so \
 		$(OPENPRS_MOD_DIR)/mod_protobuf.so \
 		$(OPENPRS_MOD_DIR)/mod_navgraph.so
+
+	INSTALL_extra = openprs_files
 else
   WARN_TARGETS += warning_openprs
 endif

- *commit* 540e6d2958d689d64b10691381b4b798e5925f81 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Wed Sep 7 21:06:47 2016 +0200
Subject: joystick: add missing linking against libm

 src/plugins/joystick/Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/joystick/Makefile b/src/plugins/joystick/Makefile
index 4dfa1e4..46a93e2 100644
--- a/src/plugins/joystick/Makefile
+++ b/src/plugins/joystick/Makefile
@@ -16,17 +16,17 @@
 BASEDIR = ../../..
 include $(BASEDIR)/etc/buildsys/config.mk
 
-LIBS_joystick = fawkescore fawkesutils fawkesaspects fawkesblackboard \
+LIBS_joystick = m fawkescore fawkesutils fawkesaspects fawkesblackboard \
 		fawkesinterface JoystickInterface
 OBJS_joystick = joystick_plugin.o sensor_thread.o acquisition_thread.o \
 		bb_handler.o force_feedback.o act_thread.o
 
-LIBS_ffjoystick = stdc++ fawkescore fawkesutils fawkesaspects fawkesblackboard \
+LIBS_ffjoystick = stdc++ m fawkescore fawkesutils fawkesaspects fawkesblackboard \
 		  fawkesinterface fawkeslogging JoystickInterface
 OBJS_ffjoystick = ffjoystick.o acquisition_thread.o remote_bb_poster.o \
 		  bb_handler.o force_feedback.o act_thread.o
 
-LIBS_ffkbjoystick = stdc++ fawkescore fawkesutils fawkesaspects fawkesblackboard \
+LIBS_ffkbjoystick = stdc++ m fawkescore fawkesutils fawkesaspects fawkesblackboard \
 		    fawkesinterface fawkeslogging JoystickInterface
 OBJS_ffkbjoystick = ffkbjoystick.o remote_bb_poster.o bb_handler.o
 




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list