Changes have been pushed for the repository "fawkesrobotics/fawkes".
Clone: https://github.com/fawkesrobotics/fawkes.git Gitweb: https://github.com/fawkesrobotics/fawkes The branch, thofmann/fix-install-target has been updated discards 17cd4a307705ec33148ead195315bf16c1ae23d5 (commit) discards 834c9fa274040a5eae83d479eb42cf7ff82c1ccf (commit) discards fa65df2cf5f4c6bf35d1ccd845f84d610beb83e1 (commit) discards 45cd3996ef876e358f5aff9e1778d26cc0c20372 (commit) discards 2ca3c5668919476bf345367c4324ef4928521cc9 (commit) discards c428b23ad65a455f49cee37a073c3f0fae5d3116 (commit) discards 716b2cf8b2b0ab1f5ebb04a915dedaef1e39d27a (commit) discards 48207f6055d60150819091f1dd0374357bdcf9b2 (commit) to 1cdb0fc1f0f8aef6ce8ba42b8d0685cb1e9fb0be (commit) via a58cdf8a81e11ae2b6c8a473109d63360e814105 (commit) via d75c268017a7a649826345d649836078c9bdfe5d (commit) via 31e0437a68477933ff4dc11b406a1dec8d8ac5eb (commit) via 94c7b936c38327170ff040a91c7064981ba30239 (commit) via 25b750233d9b993f5292704138e3b4482282d35c (commit) via 9ee8f73cf2e1ea90f8d262e1d87a4f16d3200926 (commit) via f3259de20ea315b008bbe99393719125b17e2570 (commit) via 4b207f245a8d9def50fa3dd1d8ef47197a050e0c (commit) via 4e0a0e16f09f9adf08cd04fb73efba67796e6b7b (commit) via 67b71745de105bcd3798f2a964051542955fb40d (commit) via 831f91892f2f217541e76f7e87b0575fae7f581b (commit) via 68efbaba169e25cad76a628db5271f201ed4b480 (commit) via 6f1c7957487cbeb477841a7855404f43b02f2f17 (commit) via 09fdc3ec3e7cc28a84bf6055b68d0d81790057aa (commit) via c76dd1fb6e57df9b4ffdf64824dbe21e15df9921 (commit) via bc3111cdc435753836807e584e41b05fa21c0eb4 (commit) via 1c0a34820ece5d61382ea30a36da5fbd85ec09fc (commit) via 290ffdd15b3143516467f672b7fd2339c47b4633 (commit) via 5646bfb121d18fc0ef0e7a7138d0148ad040d8e3 (commit) via a9119b87f8d3b427efdc66d45fe5a0c791d5b59d (commit) via 6e7c07e7e05c64dff33ed466ac856eda8f28b288 (commit) via aa72501cedd1c7b01b071db6c348f1f855681505 (commit) via 63b1e08b818d69f9b29d64d059f19d7b99bc7a08 (commit) via f9ed49f705ba2eab41bd261dd885a6f6ee70047c (commit) via cdd9832ce1463aace477e1ad69ccd30c881a4875 (commit) via e9d956e77c3a21d9c75984a848cdc15bd7e591ec (commit) via 974c13d8c14e6b77f54d69efbc20b11ee31af4e7 (commit) via f5d767aee0a44eec2bd9c32d6ff69a3a98ff2ab1 (commit) via 2d25436a0097e85caed2565ccc38d39605700cfc (commit) via 52a57047a1a293e88e919f3b0e152fdfa53a83f5 (commit) via 9bbc4c6560eab4d5020f08908315ce2796dcc923 (commit) via c6174a467626d61774d60f521ba4dea79f0c099b (commit) via 876efbf24c9549645ad38ea93c36b633a0c52698 (commit) via 8d32f53ed0c90ffa0de4238a615e8a0ee9ca5549 (commit) via 8ba15d09a8fa917d82bc02a474b1d798a9505001 (commit) via 0996cc086807fc30b7c5ef8dd1fc15ecfb81cca3 (commit) via 481e9870f31c671b1047b8d99a887c89fb882600 (commit) via be1c521d08a1202902769e676eccd002b720cf0d (commit) via 35405a2ac41965933f3f1261c203c67782527885 (commit) via f2f787b3c25be557683cbb5e59cff8745549fb82 (commit) via 73996ced0959094ac605bb7114b6da14a61e8073 (commit) via 145c5880ce6130788360560ccafb4a53a9d31819 (commit) via 973cc89019c715145646ab9365987f5f107c359b (commit) via d72ae683d6c1ac0a029187620d01c3a011687bc0 (commit) via 8f099c7318172b3bf459e74f97f4d584c31a3579 (commit) via c0f5d7cb87f91452be8555272efeef3ccfb72ccb (commit) via 01c57c226fad527dd9d279417b799a3c70f749d4 (commit) via 85f41f90c7410ec4ae28b98319a21778eece4128 (commit) via fc4ced7d00ca14787865e633a8f22481dec36f18 (commit) via b5d22d1b111e06c385bf3ffcfc9091e2d94906ae (commit) via a479b651ef5f2d94f82c782a897568a364635b86 (commit) via 201453146cdbbaf373aa53707d11a7e4bf1fafd3 (commit) via 4b84fa40acdbd3efbae7bcda41309d14b663731e (commit) via dcb75fcc4048c97b87353bef2c85adaeb209ecbf (commit) via ec1ab5ea2d8f7ecbedef8f7f7b57f37444c8a055 (commit) via 9776075cf5a5818925f20c067920d6bff4c8fae2 (commit) via 2d087951a2a1bdc4f7a98c2085fa4b808e4873d0 (commit) via 1915c5569ca681286afe720e22cf5cbd938a429a (commit) via fb7d2c6dd1d9396de25805e6c5b0c6a98aaec6e9 (commit) via 42890b89e1e00e7d90c039b215acaf1ff5a7a336 (commit) via 2c845561e4019d203f0196b2e72e29943c1be0fb (commit) via 14d2f1dc713c850d6bcf0baae3e205cf4d7f4f99 (commit) via 981af8776c346e479561bf6c6cda9e24212aabaf (commit) via 563b3f68827697e47e7afed0be873c3b6ffa74c8 (commit) via 3f64450bf177bf5b9718505c65fe8328435fdfcc (commit) via 387b350b2f5b6be67e5cd32da9af8ffcba0417b8 (commit) via 815f93ab4995ea17e750325566e695f7e20b864a (commit) via bba0b5fe1b9d60c4993091ef2192c9fd337f1018 (commit) via 1e53d0fb15ea898a3dcffc0e75690162ccceff9b (commit) via 40d7c9da67c149e0bc0aa42c6d637cb94fd4d3ac (commit) via 662ba4565031297757c33b5731316bbf31850e37 (commit) via 7365f96b08b7cbd1a02849653f1cbcea61d5ee96 (commit) via b28ec22faff3c1671d54328523dd1d15eafb4cba (commit) via 989b1152ed2babca1104278fa15138384477e3e3 (commit) via e226b825566207244dbdf70bbf3ba0a3058ad0ea (commit) via b419e05a0ca006d915a92cd1b12cb89a7b0eeadf (commit) via e5b116467c25f02b1198c2de821625bb7d98a0d5 (commit) via 4185ec9ceede8383afe39528d9d8e1d71e753d63 (commit) via 6600bdfc70db69f4d643ea99df47ae6d4e22ae72 (commit) via 5ea2049fffbc1e3fde6ba709ab789a909a9a9376 (commit) via c0c8d0c10060c62ddf3c0602ba87ed2b57d66e58 (commit) via ba2a9d45259455dbb550429d951977371ff76822 (commit) via 8275ea07cfbad845a86e9f714cde50e0938ff6c0 (commit) via fc14abeda85331de687dcb1e7b652ae46aebc2d2 (commit) via bd1556b180248df32d954b59644b1fc354760282 (commit) via df10aaf89c8e2222bee8f799b55943d445a89bdc (commit) via 289e9a0e4536f7cf4eabeaae8e802b81b32e77c3 (commit) via 7722826d497548fba0ac48b8e222def60fda5bcf (commit) via a1922e80d1939bb6075ce07c2269dc807eaec1ca (commit) via 16d36544141b11773e51a12df5db1cd2999477d9 (commit) via e2bd1eeca9735232b50572444a7c8483871e0756 (commit) via 58cf849a8b34cdfba0fc30b68bc73952477aa3d0 (commit) via ec3cce61c5839e61afdd93ddc088cb2679c80f3f (commit) via 81e68ba6a770cdbd2120eb1d2e39e8bf8d93dfc2 (commit) via 4f25e70e6eaa69662609fa0dc7cf907f24ac245d (commit) via ab8a8f6fa2f43d2af439176223a3fc15e6c9f437 (commit) via 756e23eaf62f69ec1f5afd17312101a05353d037 (commit) via 4e902a1f7ce332bcfd03863c38667b980c8616ef (commit) via 47f43587f2ec945bc0d5ec90dd34f61a49a7597f (commit) via c14ed482979fa1e08a7cd135de682b3791c8ef44 (commit) via e38e0a4b31e5c0d6bbc86a621abbc201619fcc44 (commit) via 4771051138576ceef8107e4c020f1e8d9e6e1e1c (commit) via 2b11dca104643d4700d954986f678fef8d245796 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (17cd4a307705ec33148ead195315bf16c1ae23d5) \ N -- N -- N (1cdb0fc1f0f8aef6ce8ba42b8d0685cb1e9fb0be) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. https://github.com/fawkesrobotics/fawkes/tree/thofmann/fix-install-target 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 f3259de20ea315b008bbe99393719125b17e2570 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 08:04:56 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:06 2019 +0200 buildsys: only install targets that have been built We changed the meaning of BINS_all, PLUGINS_all, .... They used to denote the targets that are actually built. Now, a target is always added to the respective _all variable, even if it is not built. Build targets are now stored in BINS_build, .... Only install those, as the other targets are not installable. https://github.com/fawkesrobotics/fawkes/commit/f3259de20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9ee8f73cf2e1ea90f8d262e1d87a4f16d3200926 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 08:17:33 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:06 2019 +0200 buildsys: fix installation of plugin interface headers For an interface defined in a plugin directory, the header is not in SRCDIR but in IFACESRCDIR. Use the header from SRCDIR if it exists, if not use the header from IFACESRCDIR, and fail if neither file exists. https://github.com/fawkesrobotics/fawkes/commit/9ee8f73cf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 25b750233d9b993f5292704138e3b4482282d35c Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 08:54:18 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:06 2019 +0200 buildsys: fix typo in install rule for RESDIR targets https://github.com/fawkesrobotics/fawkes/commit/25b750233 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 94c7b936c38327170ff040a91c7064981ba30239 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 09:05:58 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:06 2019 +0200 webview: only install res files if NPM is available The files are not static but generated by NPM. Thus, we should not set the install directory for res files if NPM is not available, because there will be no files to install. https://github.com/fawkesrobotics/fawkes/commit/94c7b936c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 31e0437a68477933ff4dc11b406a1dec8d8ac5eb Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 11:20:27 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:06 2019 +0200 mongodb: only build interfaces if we build the plugin There is no need for the interface if we cannot build the plugin. This also fixes an issue when building the Fedora RPM, as those interfaces would be built but not installed, which causes an error. https://github.com/fawkesrobotics/fawkes/commit/31e0437a6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit d75c268017a7a649826345d649836078c9bdfe5d Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 11:20:27 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:06 2019 +0200 pddl-planner: only build interfaces if we build the plugin There is no need for the interface if we cannot build the plugin. This also fixes an issue when building the Fedora RPM, as those interfaces would be built but not installed, which causes an error. https://github.com/fawkesrobotics/fawkes/commit/d75c26801 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit a58cdf8a81e11ae2b6c8a473109d63360e814105 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 11:20:27 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:44 2019 +0200 pddl-robot-memory: only build interfaces if we build the plugin There is no need for the interface if we cannot build the plugin. This also fixes an issue when building the Fedora RPM, as those interfaces would be built but not installed, which causes an error. https://github.com/fawkesrobotics/fawkes/commit/a58cdf8a8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1cdb0fc1f0f8aef6ce8ba42b8d0685cb1e9fb0be Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Thu May 9 11:20:27 2019 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Thu May 9 14:03:44 2019 +0200 pcl-db: only build interfaces if we build the plugin There is no need for the interface if we cannot build the plugin. This also fixes an issue when building the Fedora RPM, as those interfaces would be built but not installed, which causes an error. https://github.com/fawkesrobotics/fawkes/commit/1cdb0fc1f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- cfg/conf.d/realsense.yaml | 7 + src/libs/aspect/manager.cpp | 2 +- src/libs/core/Makefile | 4 + src/libs/core/threading/thread.cpp | 20 +- src/libs/core/threading/thread_list.cpp | 8 + .../clips-executive/clips/coordination-mutex.clp | 129 ++--- .../clips-executive/clips/resource-locks.clp | 3 +- .../clips-executive/clips/skills-actions.clp | 2 +- .../clips-executive/clips/wm-robmem-sync.clp | 137 +++-- src/plugins/clips-robot-memory/Makefile | 4 +- .../clips-robot-memory/clips_rm_trigger.cpp | 12 +- src/plugins/clips-robot-memory/clips_rm_trigger.h | 3 +- .../clips_robot_memory_thread.cpp | 463 ++++++++-------- .../clips-robot-memory/clips_robot_memory_thread.h | 33 +- src/plugins/clips/feature_blackboard.cpp | 12 +- src/plugins/mongodb/Makefile | 3 +- src/plugins/mongodb/aspect/Makefile | 8 +- src/plugins/mongodb/aspect/mongodb.cpp | 4 +- src/plugins/mongodb/aspect/mongodb.h | 11 +- src/plugins/mongodb/aspect/mongodb_conncreator.h | 9 +- src/plugins/mongodb/aspect/mongodb_inifin.cpp | 2 +- src/plugins/mongodb/mongodb.mk | 34 +- src/plugins/mongodb/mongodb_client_config.cpp | 155 ++---- src/plugins/mongodb/mongodb_client_config.h | 36 +- src/plugins/mongodb/mongodb_instance_config.cpp | 30 +- src/plugins/mongodb/mongodb_replicaset_config.cpp | 513 +++++++++-------- src/plugins/mongodb/mongodb_replicaset_config.h | 49 +- src/plugins/mongodb/mongodb_thread.cpp | 33 +- src/plugins/mongodb/mongodb_thread.h | 12 +- src/plugins/mongodb/mongorrd_thread.cpp | 100 ++-- src/plugins/mongodb/utils.cpp | 76 +++ .../generator/digest.h => plugins/mongodb/utils.h} | 35 +- src/plugins/mongodb_log/mongodb_log_bb_thread.cpp | 216 ++++---- src/plugins/mongodb_log/mongodb_log_bb_thread.h | 6 +- .../mongodb_log/mongodb_log_image_thread.cpp | 60 +- src/plugins/mongodb_log/mongodb_log_image_thread.h | 14 +- .../mongodb_log/mongodb_log_logger_thread.cpp | 128 ++--- .../mongodb_log/mongodb_log_logger_thread.h | 1 + src/plugins/mongodb_log/mongodb_log_pcl_thread.cpp | 91 ++-- src/plugins/mongodb_log/mongodb_log_pcl_thread.h | 13 +- src/plugins/mongodb_log/mongodb_log_tf_thread.cpp | 103 ++-- .../mongodb_log/tools/ffmongodb_save_imgs.cpp | 109 ++-- .../openrave-robot-memory_thread.cpp | 44 +- src/plugins/pddl-planner/pddl-planner_thread.cpp | 54 +- src/plugins/pddl-planner/pddl-planner_thread.h | 20 +- src/plugins/pddl-robot-memory/Makefile | 5 +- .../pddl-robot-memory/pddl_robot_memory_thread.cpp | 101 ++-- .../pddl-robot-memory/pddl_robot_memory_thread.h | 3 +- .../perception/pcl-db/mongodb_tf_transformer.cpp | 101 ++-- .../perception/pcl-db/mongodb_tf_transformer.h | 19 +- .../perception/pcl-db/pcl_db_merge_pipeline.h | 15 +- .../perception/pcl-db/pcl_db_merge_thread.cpp | 15 +- src/plugins/perception/pcl-db/pcl_db_pipeline.h | 166 +++--- .../perception/pcl-db/pcl_db_retrieve_pipeline.h | 16 +- .../perception/pcl-db/pcl_db_retrieve_thread.cpp | 6 +- .../perception/pcl-db/pcl_db_store_thread.cpp | 66 ++- src/plugins/realsense/realsense_thread.cpp | 89 +-- src/plugins/realsense/realsense_thread.h | 5 +- .../computables/blackboard_computable.cpp | 112 ++-- .../computables/blackboard_computable.h | 7 +- .../robot-memory/computables/computable.cpp | 49 +- src/plugins/robot-memory/computables/computable.h | 32 +- .../computables/computables_manager.cpp | 39 +- .../robot-memory/computables/computables_manager.h | 12 +- .../computables/transform_computable.cpp | 103 ++-- .../computables/transform_computable.h | 7 +- src/plugins/robot-memory/event_trigger.cpp | 16 +- src/plugins/robot-memory/event_trigger.h | 22 +- src/plugins/robot-memory/event_trigger_manager.cpp | 62 ++- src/plugins/robot-memory/event_trigger_manager.h | 62 +-- src/plugins/robot-memory/robot_memory.cpp | 605 +++++++++++---------- src/plugins/robot-memory/robot_memory.h | 125 +++-- src/plugins/robot-memory/robot_memory_thread.cpp | 21 +- src/plugins/robot-memory/robot_memory_thread.h | 1 - src/plugins/robot-memory/tests/Makefile | 4 +- .../robot-memory/tests/robot_memory_test.cpp | 315 ++++++----- src/plugins/robot-memory/tests/robot_memory_test.h | 62 ++- src/plugins/stn-generator/stn-generator_thread.cpp | 47 +- src/plugins/stn-generator/stn-generator_thread.h | 1 - src/plugins/stn-generator/stn.cpp | 40 +- src/plugins/stn-generator/stn.h | 17 +- 81 files changed, 2713 insertions(+), 2463 deletions(-) create mode 100644 src/plugins/mongodb/utils.cpp copy src/{libs/interfaces/generator/digest.h => plugins/mongodb/utils.h} (51%) - *Diffs* ------------------------------------------------------------- - *commit* f3259de20ea315b008bbe99393719125b17e2570 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 08:04:56 2019 +0200 Subject: buildsys: only install targets that have been built etc/buildsys/btypes/rules_sysinstall.mk | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk index fd21a2a0b..0088248ed 100644 --- a/etc/buildsys/btypes/rules_sysinstall.mk +++ b/etc/buildsys/btypes/rules_sysinstall.mk @@ -17,15 +17,15 @@ include $(BUILDSYSDIR)/btypes/rules_fawkes.mk include $(BUILDSYSDIR)/ext/gmsl # Plugins are installed to special directory -$(foreach P,$(PLUGINS_all:$(PLUGINDIR)/%.so=%),$(eval INST_LIB_SUBDIR_$(call nametr,$P) = $(FFLIBSUBDIR)/plugins)) +$(foreach P,$(PLUGINS_build:$(PLUGINDIR)/%.so=%),$(eval INST_LIB_SUBDIR_$(call nametr,$P) = $(FFLIBSUBDIR)/plugins)) # Library headers get subdir matching name if not set -$(foreach P,$(LIBS_all:$(LIBDIR)/libfawkes%.so=%) $(LIBS_gui:$(LIBDIR)/libfawkes%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfawkes$P)),$P),$(eval INST_HDRS_SUBDIR_libfawkes$P = $(P:_%=%)))) -$(foreach P,$(LIBS_all:$(LIBDIR)/libfv%.so=%) $(LIBS_gui:$(LIBDIR)/libfv%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfv$P)),$P),$(eval INST_HDRS_SUBDIR_libfv$P = fv$P))) +$(foreach P,$(LIBS_build:$(LIBDIR)/libfawkes%.so=%) $(LIBS_gui:$(LIBDIR)/libfawkes%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfawkes$P)),$P),$(eval INST_HDRS_SUBDIR_libfawkes$P = $(P:_%=%)))) +$(foreach P,$(LIBS_build:$(LIBDIR)/libfv%.so=%) $(LIBS_gui:$(LIBDIR)/libfv%.so=%),$(if $(and $(call not,$(INST_HDRS_SUBDIR_libfv$P)),$P),$(eval INST_HDRS_SUBDIR_libfv$P = fv$P))) ifdef __buildsys_lua_mk_ # Lua libraries are "inferred" and automatically installed to proper directory -$(foreach L,$(LIBS_all:$(LIBDIR)/lua/%.so=%),$(if $L,$(eval INST_LIB_SUBDIR_lua_$(call nametr,$L) = $(FFLIBSUBDIR)))) +$(foreach L,$(LIBS_build:$(LIBDIR)/lua/%.so=%),$(if $L,$(eval INST_LIB_SUBDIR_lua_$(call nametr,$L) = $(FFLIBSUBDIR)))) endif # Prefix man pages with proper path @@ -49,7 +49,7 @@ endif endif .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) +install_targets: $(subst $(LIBDIR),$(DESTDIR)$(EXEC_LIBDIR),$(LIBS_build) $(LIBS_gui)) $(subst $(PLUGINDIR),$(DESTDIR)$(EXEC_PLUGINDIR),$(PLUGINS_build)) $(subst $(BINDIR),$(DESTDIR)$(EXEC_BINDIR),$(BINS_build) $(BINS_gui)) $(MANPAGES_install) .PHONY: install_resdirs $(INST_RESDIRS) install_resdirs: $(INST_RESDIRS) @@ -146,22 +146,22 @@ endif # uninstall target to remove files from system .PHONY: uninstall uninstall: presubdirs subdirs -ifneq ($(BINS_all)$(BINS_gui),) - $(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Uninstalling binaries: $(subst $(BINDIR)/,,$(BINS_all) $(BINS_gui))" - $(SILENT)rm -f $(subst $(BINDIR),$(DESTDIR)$(EXEC_BINDIR),$(BINS_all) $(BINS_gui)) - $(SILENT)$(foreach B,$(subst $(BINDIR)/,,$(BINS_all) $(BINS_gui)),$(if $(wildcard $(DESTDIR)$(EXEC_DFILEDIR)/$B.desktop),rm -f $(DESTDIR)$(EXEC_DFILEDIR)/$B.desktop;)) +ifneq ($(BINS_build)$(BINS_gui),) + $(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Uninstalling binaries: $(subst $(BINDIR)/,,$(BINS_build) $(BINS_gui))" + $(SILENT)rm -f $(subst $(BINDIR),$(DESTDIR)$(EXEC_BINDIR),$(BINS_build) $(BINS_gui)) + $(SILENT)$(foreach B,$(subst $(BINDIR)/,,$(BINS_build) $(BINS_gui)),$(if $(wildcard $(DESTDIR)$(EXEC_DFILEDIR)/$B.desktop),rm -f $(DESTDIR)$(EXEC_DFILEDIR)/$B.desktop;)) endif -ifneq ($(LIBS_all)$(LIBS_gui),) - $(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Uninstalling libraries: $(subst $(LIBDIR)/,,$(LIBS_all) $(LIBS_gui))" - $(SILENT)$(foreach L,$(subst $(LIBDIR)/,,$(LIBS_all) $(LIBS_gui)), \ +ifneq ($(LIBS_build)$(LIBS_gui),) + $(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Uninstalling libraries: $(subst $(LIBDIR)/,,$(LIBS_build) $(LIBS_gui))" + $(SILENT)$(foreach L,$(subst $(LIBDIR)/,,$(LIBS_build) $(LIBS_gui)), \ rm -f $(abspath $(DESTDIR)$(EXEC_LIBDIR)/$(INST_LIB_SUBDIR_$(call nametr,$(L:%.so=%))))/$L*; \ $(if $(HDRS_$(call nametr,$(L:%.so=%))), \ rm -f $(foreach h,$(HDRS_$(call nametr,$(L:%.so=%))),"$(DESTDIR)$(EXEC_INCDIR)/$(INST_HDRS_SUBDIR_$(call nametr,$(L:%.so=%)))/$(if $(HDR_RENAME_$h),$(HDR_RENAME_$h),$h)" ); \ )) endif -ifneq ($(PLUGINS_all)$(PLUGINS_gui),) - $(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Uninstalling plugins: $(subst $(PLUGINDIR)/,,$(PLUGINS_all) $(PLUGINS_gui))" - $(SILENT)rm -f $(subst $(PLUGINDIR),$(DESTDIR)$(EXEC_PLUGINDIR),$(PLUGINS_all) $(PLUGINS_gui)) +ifneq ($(PLUGINS_build)$(PLUGINS_gui),) + $(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Uninstalling plugins: $(subst $(PLUGINDIR)/,,$(PLUGINS_build) $(PLUGINS_gui))" + $(SILENT)rm -f $(subst $(PLUGINDIR),$(DESTDIR)$(EXEC_PLUGINDIR),$(PLUGINS_build) $(PLUGINS_gui)) endif ifneq ($(INST_RESDIRS),) $(SILENTSYMB)echo -e "$(INDENT_PRINT)--- Removing resource direcotries: $(INST_RESDIRS)" - *commit* 9ee8f73cf2e1ea90f8d262e1d87a4f16d3200926 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 08:17:33 2019 +0200 Subject: buildsys: fix installation of plugin interface headers etc/buildsys/btypes/rules_sysinstall.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk index 0088248ed..c419be59c 100644 --- a/etc/buildsys/btypes/rules_sysinstall.mk +++ b/etc/buildsys/btypes/rules_sysinstall.mk @@ -200,13 +200,16 @@ $(DESTDIR)$(EXEC_LIBDIR)/%.so: $(LIBDIR)/%.so ln -sf "$(notdir $(subst $(LIBDIR),$(abspath $(DESTDIR)$(EXEC_LIBDIR)/$(INST_LIB_SUBDIR_$(call nametr,$*))),$<).$(SOVER_$(call nametr,$*)))" "$(subst $(LIBDIR),$(abspath $(DESTDIR)$(EXEC_LIBDIR)/$(INST_LIB_SUBDIR_$(call nametr,$*))),$<)" || exit $$?; \ ) $(SILENT) $(if $(HDRS_$(call nametr,$*)),$(foreach h,$(HDRS_$(call nametr,$*)), \ - if [ -f "$(SRCDIR)/$h" ]; then \ - echo -e "$(INDENT_PRINT)--- Copying header $h to $(DESTDIR)$(EXEC_INCDIR)/$(INST_HDRS_SUBDIR_$(call nametr,$*))/$(if $(HDR_RENAME_$h),$(HDR_RENAME_$h),$h)"; \ - install -D -m 644 "$(SRCDIR)/$h" "$(DESTDIR)$(EXEC_INCDIR)/$(INST_HDRS_SUBDIR_$(call nametr,$*))/$(if $(HDR_RENAME_$h),$(HDR_RENAME_$h),$h)" || exit $$?; \ + if [ -f "$(SRCDIR)/$h" ] ; then \ + hpath=$(SRCDIR)/$h; \ + elif [ -f "$(IFACESRCDIR)/$h" ]; then \ + hpath=$(IFACESRCDIR)/$h; \ else \ echo -e "$(INDENT_PRINT)--- $(TRED)Header $h does not exist.$(TNORMAL)"; \ exit 1; \ fi; \ + echo -e "$(INDENT_PRINT)--- Copying header $h to $(DESTDIR)$(EXEC_INCDIR)/$(INST_HDRS_SUBDIR_$(call nametr,$*))/$(if $(HDR_RENAME_$h),$(HDR_RENAME_$h),$h)"; \ + install -D -m 644 "$$hpath" "$(DESTDIR)$(EXEC_INCDIR)/$(INST_HDRS_SUBDIR_$(call nametr,$*))/$(if $(HDR_RENAME_$h),$(HDR_RENAME_$h),$h)" || exit $$?; \ )) # $(SILENTSYMB) for h in $(HDRS_$(call nametr,$*)); do \ - *commit* 25b750233d9b993f5292704138e3b4482282d35c - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 08:54:18 2019 +0200 Subject: buildsys: fix typo in install rule for RESDIR targets etc/buildsys/btypes/rules_sysinstall.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk index c419be59c..090019592 100644 --- a/etc/buildsys/btypes/rules_sysinstall.mk +++ b/etc/buildsys/btypes/rules_sysinstall.mk @@ -74,7 +74,7 @@ $(INST_RESDIRS): $(SILENTSYMB) if [ -d "$(RESDIR)/$@" ]; then \ 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)/$@"; \ + echo -e "$(INDENT_PRINT)[CPY] $(PARENTDIR)$(TBOLDGRAY)$@$(TNORMAL) -> $(DESTDIR)$(EXEC_RESDIR)/$@"; \ cp -af $(RESDIR)/$@/* $(DESTDIR)$(EXEC_RESDIR)/$@ || exit $$?; \ fi endif - *commit* 94c7b936c38327170ff040a91c7064981ba30239 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 09:05:58 2019 +0200 Subject: webview: only install res files if NPM is available src/plugins/webview/Makefile | 1 - src/plugins/webview/frontend/Makefile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) _Diff for modified files_: diff --git a/src/plugins/webview/Makefile b/src/plugins/webview/Makefile index ea6986ab6..b27708cf3 100644 --- a/src/plugins/webview/Makefile +++ b/src/plugins/webview/Makefile @@ -45,7 +45,6 @@ PLUGINS_all = $(PLUGINDIR)/webview.so ifeq ($(HAVE_BOOST_LIBS)$(HAVE_LIBMICROHTTPD),11) PLUGINS_build = $(PLUGINS_all) - INST_RESDIRS = webview CFLAGS += $(call boost-libs-cflags,$(REQ_BOOST_LIBS)) LDFLAGS += $(call boost-libs-ldflags,$(REQ_BOOST_LIBS)) diff --git a/src/plugins/webview/frontend/Makefile b/src/plugins/webview/frontend/Makefile index a03b74d7a..e7e6f520b 100644 --- a/src/plugins/webview/frontend/Makefile +++ b/src/plugins/webview/frontend/Makefile @@ -21,6 +21,7 @@ NPM = $(shell type -p npm) ifneq ($(NPM),) TARGETS_all += dist/index.html + INST_RESDIRS = webview SRCS_FRONTEND = $(shell find $(SRCDIR)/src/ -regex '.*\.\(html\|ts\|json\|js\|scss\)') else - *commit* 31e0437a68477933ff4dc11b406a1dec8d8ac5eb - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 11:20:27 2019 +0200 Subject: mongodb: only build interfaces if we build the plugin src/plugins/mongodb/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/mongodb/Makefile b/src/plugins/mongodb/Makefile index 0dd3aa82c..e2135a4bc 100644 --- a/src/plugins/mongodb/Makefile +++ b/src/plugins/mongodb/Makefile @@ -19,8 +19,6 @@ include $(BASEDIR)/etc/buildsys/config.mk include $(LIBSRCDIR)/utils/utils.mk include $(BUILDSYSDIR)/boost.mk -PRESUBDIRS = aspect interfaces - INCDIRS += $(INCDIRS_MONGODB) MONGODB_REQ_BOOST_LIBS = system filesystem @@ -51,6 +49,7 @@ ifeq ($(HAVE_MONGODB_REQ_BOOST_LIBS),1) endif ifeq ($(HAVE_MONGODB)$(HAVE_CPP14)$(HAVE_MONGODB_REQ_BOOST_LIBS),111) + PRESUBDIRS = aspect interfaces PLUGINS_build = $(PLUGINS_all) else ifneq ($(HAVE_MONGODB),1) - *commit* d75c268017a7a649826345d649836078c9bdfe5d - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 11:20:27 2019 +0200 Subject: pddl-planner: only build interfaces if we build the plugin src/plugins/pddl-planner/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/pddl-planner/Makefile b/src/plugins/pddl-planner/Makefile index a26c250f1..8eea704ac 100644 --- a/src/plugins/pddl-planner/Makefile +++ b/src/plugins/pddl-planner/Makefile @@ -18,8 +18,6 @@ BASEDIR = ../../.. include $(BASEDIR)/etc/buildsys/config.mk include $(BASEDIR)/src/plugins/mongodb/mongodb.mk -PRESUBDIRS = interfaces - LIBS_pddl_planner = m fawkescore fawkesutils fawkesaspects fawkesbaseapp \ fawkesblackboard fawkesinterface fawkesrobotmemory \ PddlPlannerInterface @@ -30,6 +28,8 @@ OBJS_all = $(OBJS_pddl_planner) PLUGINS_all = $(PLUGINDIR)/pddl-planner.$(SOEXT) ifeq ($(HAVE_CPP11)$(HAVE_MONGODB),11) + PRESUBDIRS = interfaces + CFLAGS += $(CFLAGS_CPP11) $(CFLAGS_MONGODB) LDFLAGS += $(LDFLAGS_CTEMPLATE) $(LDFLAGS_MONGODB) - *commit* a58cdf8a81e11ae2b6c8a473109d63360e814105 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 11:20:27 2019 +0200 Subject: pddl-robot-memory: only build interfaces if we build the plugin src/plugins/pddl-robot-memory/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/pddl-robot-memory/Makefile b/src/plugins/pddl-robot-memory/Makefile index 61fe1eab1..1042e3dbd 100644 --- a/src/plugins/pddl-robot-memory/Makefile +++ b/src/plugins/pddl-robot-memory/Makefile @@ -19,8 +19,6 @@ include $(BASEDIR)/etc/buildsys/config.mk include $(BASEDIR)/src/plugins/robot-memory/robot_memory.mk include $(BASEDIR)/src/plugins/pddl-robot-memory/ctemplate.mk -PRESUBDIRS = interfaces - LIBS_pddl_robot_memory = m fawkescore fawkesutils fawkesaspects fawkesbaseapp \ fawkesblackboard fawkesinterface fawkesrobotmemory \ PddlGenInterface @@ -31,6 +29,8 @@ OBJS_all = $(OBJS_pddl_robot_memory) PLUGINS_all = $(PLUGINDIR)/pddl-robot-memory.$(SOEXT) ifeq ($(HAVE_CPP11)$(HAVE_ROBOT_MEMORY)$(HAVE_CTEMPLATE),111) + PRESUBDIRS = interfaces + CFLAGS += $(CFLAGS_CPP11) $(CFLAGS_ROBOT_MEMORY) LDFLAGS += $(LDFLAGS_CTEMPLATE) $(LDFLAGS_ROBOT_MEMORY) - *commit* 1cdb0fc1f0f8aef6ce8ba42b8d0685cb1e9fb0be - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Thu May 9 11:20:27 2019 +0200 Subject: pcl-db: only build interfaces if we build the plugin src/plugins/perception/pcl-db/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/plugins/perception/pcl-db/Makefile b/src/plugins/perception/pcl-db/Makefile index 47b495aef..e756d5456 100644 --- a/src/plugins/perception/pcl-db/Makefile +++ b/src/plugins/perception/pcl-db/Makefile @@ -23,8 +23,6 @@ include $(BASEDIR)/src/plugins/mongodb/mongodb.mk # Add -DUSE_TIMETRACKER to enable time tracking CFLAGS += -DUSE_TIMETRACKER -PRESUBDIRS = interfaces - ifeq ($(PCL_USES_OPENMP),1) ifneq ($(USE_OPENMP),1) CFLAGS += $(CFLAGS_OPENMP) @@ -57,6 +55,8 @@ PLUGINS_all = $(PLUGINDIR)/pcl-db-store.so \ $(PLUGINDIR)/pcl-db-merge.so ifeq ($(HAVE_MONGODB)$(HAVE_PCL)$(HAVE_TF)$(HAVE_CPP11),1111) + PRESUBDIRS = interfaces + CFLAGS += $(CFLAGS_PCL) $(CFLAGS_TF) $(CFLAGS_MONGODB) $(CFLAGS_CPP11) LDFLAGS += $(LDFLAGS_PCL) $(LDFLAGS_TF) $(LDFLAGS_MONGODB) _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
