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 updated discards 3fe968b97602da6b1917fd1fc07f7735d9255482 (commit) discards 11a6e1e16c7cff35ce4c81e52d3d07caf9872650 (commit) discards c7ed2bb6a6c6939cede0be35fc066d89e6d2eb3b (commit) discards e303bf5b1988f9d567c9ae4e1b17609200792afa (commit) discards f3bf17c4dab3c3a03929274a4c04749600ddcefa (commit) discards da82575b838341b2a9d706a5aefcc1ec3e0fd5a4 (commit) discards c57e2a427f4908039b3ccd16e053c5c3551c0fdb (commit) discards 70e0337e952cc1cf6a359bfd437475371875d392 (commit) discards 04512a55462d6afc3d00acfadecb0b0efef7aa3d (commit) discards 540e6d2958d689d64b10691381b4b798e5925f81 (commit) discards dd7e5bd3af5c9a3c073dde2e07db2cbbde85201d (commit) discards 9d7ca3e3a407b6862e7b861418c952fd047965cf (commit) discards 95d5085bd02c1229d8ba759cfb44ee39275ffcd2 (commit) discards b8e3f12789ba0e8d2c947aabf69b4dd73c414a8a (commit) discards b9f369c5461b485e2ed3a2a1da2a75f5a48edb15 (commit) discards 1ac4c8d8cd9eb2cbb2eb735b7e2a09961e8fb04e (commit) discards 18e89477718bc1d0f953c8a38112ef327c576db4 (commit) discards 385c4dd3778fce962807033aa5a4c152e835e92d (commit) discards aacfa6ac15407ff9195fe8cb1719ee9368629f86 (commit) discards 20da72625cded9155c00b7120a597994819e2dd3 (commit) discards b060759f71d16bda5d7e0dc67b9fbcef541a4f2c (commit) discards 58fccf07d86c9c9c2ef37370f738a53599edd569 (commit) discards 35e6ce6ba8cea724fe7ffc283093ab17604a23df (commit) discards 82aaa6c446169cb5285bff22940951d2bf71fc14 (commit) discards d56e46fcd8b7e96c8bc35cad268373ccc9dd6cd9 (commit) discards cc972ac93b2bf1b0b0b418a5f2f8028c322cfccd (commit) discards 6c3b151adb1d63dcaad2da04d95ea78badb69a83 (commit) discards 78bc743fe75af7bcedbcdfabda1f947471e8f899 (commit) discards b86bae50dc251b6b6ec87b67e7206577c5ff634b (commit) discards 591b20ec54115d86ef2048da1b3774c2bb99ef40 (commit) discards 9e602a976eec77920e3832c4d842e56ce3af0b68 (commit) discards e709aba74e9081d82096ac2e22ac1552feb88618 (commit) discards 939f899669e439724c2043f337109cc363ede756 (commit) discards 96e86df3eab96b92d51a947834c4ba6386a9adf8 (commit) discards 93a6598286f29e6a97c249d4749f0aa8fdc7674a (commit) discards ec22e5b04ba56b1a2645acad09cb8110a9abfba4 (commit) discards 2fc3e0179fe94730f2fdd7dece56d0a39934834d (commit) discards 22f0cd94ac277e5a12eafa4d96c30f4782b6567a (commit) discards 7999eee33c24bf1edf652f5549227aa6f5157cff (commit) discards f9243f704d71465ff916e0e735946655bc0e0d99 (commit) discards 6590aa9efeffef18b51fb3438bb79c2d5afeacf4 (commit) discards 8e6583944af48a528abfa0da63dc593215712c59 (commit) discards 7c82d9a84a11c40ed762a986f09b863a7f277b0b (commit) discards 110a56c03389af4e1ddfb0ccd7cceaa92656f7de (commit) discards ef5043ee4cb44a254ed4e1c03b47629a97b7d30a (commit) discards c8ffb3f4a7a79447332be5162afba4e7fdbf62d4 (commit) discards 17f4d6415f48ed6ee8492c8a98f1f20468ec919c (commit) discards d1203799c00804e06eb543e0c4ddeae885253dd2 (commit) discards 2f8f4967a33bd2b75b190d30e60ed5fcdeb88d97 (commit) discards 1ed2ef4b4272c1950b24ec666d5df4db5b8c2b79 (commit) discards 2abff4cfa8afb1b55541a9904299ffbeced32bb8 (commit) discards 723f2db939d2e56d4fa230cede32d4576f106725 (commit) discards 8ad6e71c8d6ce0e9b3fa84574f2bded16a08ed5c (commit) discards 59b52f051242b1f4b6cc75d6e788be3ba75dc032 (commit) discards 6d1773fbe8a93458f3f69b31bdd2e4b11e14c76e (commit) discards ca77d936f4afdf52ef548bb65758c3541aeefd4e (commit) discards f6cb7ea4ca0ee8d201c02303a422081dc83c8d20 (commit) discards 354a1406b3e367e80b31e161ee64a1511dbebece (commit) discards 5834e306ff44afd552ca0ec27ec558b808f6c348 (commit) discards 6e2e7a2a6a187da5834161e23c16a12b163ef9f3 (commit) discards 7df43d630132592db965a64fe7e0fd4e93f2294f (commit) discards 3fa88c2913cfcc5853316cf7c0b90bca89a0f7af (commit) discards 5d90b05b3f824aea7ba318b34521949c430edc87 (commit) discards 0d3bb414dcdc91dfffa273207c6c6336b8170849 (commit) discards ff5340366ce14a734fd6608db4b7190ac5c0b00a (commit) discards 25abdd646537ccc63d7371ecba4a0b6732dd413c (commit) discards 8d9172137bac9199a2ef3a19b12b6b76322d6abe (commit) discards bb58c4a64d30dd8e1c9c0aa5ebda3f85995672e9 (commit) discards 1569cf2f7b123d70f323438e499287efb8b3fb3e (commit) discards 6a2f4ec95c06887ff7637e9e44e534b119ee3e34 (commit) discards 4a68d7f5719e148bf1bbecd648e3ad342cc226ee (commit) discards d4a5c134dbf5991c976f4011eb7794b72c67099d (commit) discards 702e914cdd1ae1ea878ce7a46e21753b7b859808 (commit) discards f05728b1090b6d4821e6642b612eafed4386b1c4 (commit) discards 22416862ff40b43a05dc55363c127b668bb19a6e (commit) discards 22c0ea8a615c7d0a5d6994df5f115bf1f8610e1e (commit) discards 993231c396b1af926ef26bb9f0b1b7bff1d0e528 (commit) discards 1af3e1936377832db6f4ac367c1b1a0d932325be (commit) discards 98d05a4e54e58f009aac9428eef4d534ef4767da (commit) discards 7487ef2b5efe76160032044e20d01e74c4c9e2c0 (commit) discards 6ad54fd34b26c846e4c80fa66e082e9b47c5318a (commit) discards 6747fb6b659ac75fe274be12fe6a4847c67db3d6 (commit) discards 901d4706a648d7274f339a669e30743ab17f8ca4 (commit) discards e447d9af1226d9f04123fbd834e71c980480d5ce (commit) discards 97ceb721167791ab56a48ba8e6cb52755306a604 (commit) discards 533b5cd707af5811892dcf9a50cb7c061541331a (commit) discards 9fc6d595454939ba7279f4e8f574a85fd866f57c (commit) discards dd60bf7d4c1643987da75f2158156c18d519440c (commit) discards dd1a72d6db1fe5b99a4fa4b47a380ed19bf0209a (commit) discards bf9122b427903d03b5907a4c7177d33d1af832ca (commit) discards 8ce059365c185811610de51c75e9ebfd90d85099 (commit) discards 28621e28f8a0617fe58757e3356141a469304161 (commit) discards b2f2d87bd5288c651e8426aa2eafa7a34408e4a1 (commit) discards 71b60ea0dbc63be456143f0b9f08b71780655de8 (commit) discards 38f1f7a18357dbee272bc68c7e572768c87ff155 (commit) discards bed84c0ea7d9a60812209f9a32c3d04ce8cb98cd (commit) discards 4fe72c26926b29109deda44c39389d8e6f5ac10e (commit) discards b2f096ba0ef43132675151721cd57a154169bc60 (commit) discards 84568886f6ebfed689ea64f8f010468de63d6c5c (commit) discards 4f6b39cc4b758f051ea907c9d6db5532ca34fe14 (commit) discards 3ba3a9f8fffea84fcb3d11113d052d8f746ba2b4 (commit) discards f1856600e85634ba1ca203f0382c106c88e0b0e3 (commit) discards 909353843d1358053ff4f0c58e4026a5ad55eebe (commit) discards 30810872687f9b1136fbd8b3175ccdfff8fd7de2 (commit) discards 8fe984ba9ce01faa96544a0dd5878b58e654f37a (commit) discards 6e1885f4606b6f3475a39ec88e9d09a41533e2ad (commit) discards 762f9af309d8f46821b838547c10433798c95362 (commit) discards 497f55ae030e177b181cb894c1dceb3d9b7aa788 (commit) discards 029d9a2eb5c0e301b8dd096ca866ce545ecc2437 (commit) to 9bbb7d0fb36d3656705cd8a3585fd5c189fad419 (commit) via c48b00b4b60d243ac6b337c5e9f717624776ae98 (commit) via c0e0eb609971d97d877d7b830ac29950d1da0174 (commit) via b55e7a4b2dd2d6c314af32a01262a3198592dd8e (commit) via 2aaa72883c92b3546832be60e12273b229cd5676 (commit) via 535c50e06d3b76bca66b069f3591cb21cd4f4795 (commit) via 588071131dcb023b3018c54958aea5a54561deb4 (commit) via 9ba190d1be45e1bb69b664105b02e7ee8ec41230 (commit) via 245dd89efc241749c3d84269eb1dd0a06878de56 (commit) via d6dbef50be74a35de2f6f88e5c54959435640847 (commit) via 10cd5ba5d9f369e108e49cbe0be06966e30f5fc0 (commit) via 8393838cd2fd202b389ca3d8402d293952de9e58 (commit) via e294066c83ddbbc8c001b08865e18aee43ca81b1 (commit) via 6dd1f3070423f077b44d2354eeb9e58638c34214 (commit) via 5ad698cdca3c961c591fd64b0c8d5cb87d266ba3 (commit) via 8264cbf5b340cfbb83553cd5b2f79764b11515a4 (commit) via 51afc9e414c0aa2814a0592dc3438ecd1c36b77e (commit) via 4fc34bc1a2b2db584ebb8ff0fbe9d773a6240fc5 (commit) via a8fb3e63389da0bef604d8e0b8b393c9e2d2c29e (commit) via 44a73a504ccd2eeb5cf53e3a8eed86813e8b6722 (commit) via 0b071737a417c4948f828ef855499fbf2a3a0dc5 (commit) via 1c86ddf733c4e7448e9c65adb4f33736e88d1782 (commit) via 83ed87d9f7580f66abb30130e67dce9a1fe07004 (commit) via d56f7eb82ed76c6ae728dca96f2249c1ef93017b (commit) via 784243be581f00c3e9682c39b212b2e26583fd67 (commit) via f5da9780a8ef4841e649e337bbad01d83569c702 (commit) via b73935a418d4cd7186aa4cce010a48c234093463 (commit) via bda907baa2a12aed7c19f70be7e6cd21e6cd8dd6 (commit) via 9f5d435494a0ee921119f8d59f84dedac119dca8 (commit) via 96c8a83311dad370563beb57fa9c117cb7954771 (commit) via 513b7351e8a023877aacd2f127b029951a20da45 (commit) via 079b9159311610930ffb448f1270fc1e1595e108 (commit) via 3a1dd4f00b96e3ffe6b76fb5e680de56df7d13a7 (commit) via 0b3ab2fb5d833c6bf4763485ab4095d79385a8b8 (commit) via 10e1d9b87355e32164209c81765c21859f703671 (commit) via 7fe8b669b417a68cf3666c13f24e8c0adcfc8bda (commit) via 2e746e17bf864d230d32f34fd1d502698cc96568 (commit) via 6170084e6c6b155fff6077adbc16ebc5b8fa64a8 (commit) via 56bf8cb8badb5416469c9f9ddbcdbd11f2bf2d56 (commit) via b5f3644ae15ff0364b927e07e7bead4ceec3aaab (commit) via 3da37cd0815daba98244642c1381d2fe183cfb6c (commit) via c9764cc0c6bcbe29457b23667154cad5c6d7a73f (commit) via 2581b85ee15a5d0a05d3ec307c41f3ef04074e69 (commit) via 7ea3b871c38e8cfac781949bc360c202f76b1654 (commit) via 45f4b5efa1b09aa04aa725486c08425169e9c807 (commit) via f857fcdcea63e64bad1263e14abbc6e388f7a82d (commit) via 0e5132c91f0a4ab7f2dc62fa152bb18d1b32ad81 (commit) via fd22b12cedc5d29e58ab7d7b87b2cf4d295ea309 (commit) via 080f081dfc524e3f9744a57f62fb5739c85c7226 (commit) via 665fb630a025a19fb154c7e01a1ff47b971b4951 (commit) via 466450556bcb0fd0b3afad2f3eeb5d0594f0d454 (commit) via 98f4922131adc6fb2382926f17588f35b7bc2a8c (commit) via d9443bfc535e26a131e27fd2fabab814955f7abd (commit) via 48694d6cad38295716ef71a03e400a378b7ca60c (commit) via 7e9a365e38b61dd2755087d3ff26e87411d1a9e8 (commit) via 5d5625ebbc86bfccec620ca2f8d0c4140f9048b0 (commit) via 58daf18a23a6de6c877dce365223dac294634bf2 (commit) via f6ac6707628d4b541fe89d33b9ab66ff9c109252 (commit) via f98b59fa5fe4aab0674380d0f0611f330ad969b8 (commit) via e6515f4ed2e534c6a690eb865314f18046ba22f0 (commit) via da6306dd5cd6492f9c97372828b779ed50b78346 (commit) via 49fcc3195a197aac7529fe724a55274e6a0900a0 (commit) via f20b5469a4652f85dd4c38e3ed4c91602bac8f99 (commit) via ec6f7b5dfb49226c4240cca7831303344b7f0a9d (commit) via 0c18a8648beb91c172d16e7826a009cf6e80eb5b (commit) via 11788535f562606748af966643dfb85bb8adcdfa (commit) via 6d1d5bb34393de9a3b82fc617b91b702bcf14f0b (commit) via 9b2f6e62526e96a56d6f755720eb123e44cb78ce (commit) via eeb575b8282067b64a7bf73d171b208fcfc03909 (commit) via 4e8206be7f9bc504ee45d265e7248253d73520d1 (commit) via 0e29c04013678ddd2b8b880504213482db773cc2 (commit) via 3f9c34504025ec4d65565f7ab7399aebcb5849aa (commit) via a499d79289aac8080cba4c888f9a68def953cbd9 (commit) via 0f07c689aaee14ef9e963b4c8977caf026945639 (commit) via 98b00c217b98d54e2d72d7b25fa605c26397b3b2 (commit) via 430e024ab285d3468d33ec2d27b580f160a44814 (commit) via 50f7ce96692e1ccec0681f038900171ea8a7275e (commit) via 1a0192d280d74f3e5219ed9432d6c81b77a9f13f (commit) via 6c66698e2f67ff202784dccab693b87c9a71aaf7 (commit) via 37f96c1ccc6c2394d544f398a52ecf90a094eb7e (commit) via 16c22d373e0c38f703b069690d3373384f38a2d7 (commit) via 07f47e4409ad926a17a20c76e9fb36a8a9361f67 (commit) via a9e8065d1c86997e7f95ceedac577a7386590775 (commit) via afaf1d6a86df77edae3e3e696f794caf19e13490 (commit) via bee920638ebf969916e3550b8b5bff8fc949a9cd (commit) via da18ec480de8fe06589bf2c549932758adf1c6b8 (commit) via 1ab622e3c92b9b4923c1dc4876363b0e3ba2677a (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 (3fe968b97602da6b1917fd1fc07f7735d9255482) \ N -- N -- N (9bbb7d0fb36d3656705cd8a3585fd5c189fad419) 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. http://git.fawkesrobotics.org/fawkes.git/fzwilling/sub_process 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 535c50e06d3b76bca66b069f3591cb21cd4f4795 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: Wed Sep 21 19:55:21 2016 +0200 utils: moved string utils for command argv and envs into utils/misc http://git.fawkesrobotics.org/fawkes.git/commit/535c50e http://trac.fawkesrobotics.org/changeset/535c50e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 2aaa72883c92b3546832be60e12273b229cd5676 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: Wed Sep 21 19:55:21 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/2aaa728 http://trac.fawkesrobotics.org/changeset/2aaa728 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b55e7a4b2dd2d6c314af32a01262a3198592dd8e 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: Wed Sep 21 19:55:21 2016 +0200 openprs: properly use moved string utils http://git.fawkesrobotics.org/fawkes.git/commit/b55e7a4 http://trac.fawkesrobotics.org/changeset/b55e7a4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c0e0eb609971d97d877d7b830ac29950d1da0174 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: Wed Sep 21 19:55:21 2016 +0200 sub_process: moved utils to create sub processes into utils http://git.fawkesrobotics.org/fawkes.git/commit/c0e0eb6 http://trac.fawkesrobotics.org/changeset/c0e0eb6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c48b00b4b60d243ac6b337c5e9f717624776ae98 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: Wed Sep 21 19:55:21 2016 +0200 utils: require boost asio and system for sb_process utils http://git.fawkesrobotics.org/fawkes.git/commit/c48b00b http://trac.fawkesrobotics.org/changeset/c48b00b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9bbb7d0fb36d3656705cd8a3585fd5c189fad419 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: Wed Sep 21 19:55:21 2016 +0200 openprs: properly use moved sub_process utils http://git.fawkesrobotics.org/fawkes.git/commit/9bbb7d0 http://trac.fawkesrobotics.org/changeset/9bbb7d0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- - *Diffs* ------------------------------------------------------------- - *commit* 535c50e06d3b76bca66b069f3591cb21cd4f4795 - - - - - - - - - - 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* 2aaa72883c92b3546832be60e12273b229cd5676 - - - - - - - - - - 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* b55e7a4b2dd2d6c314af32a01262a3198592dd8e - - - - - - - - - - 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* c0e0eb609971d97d877d7b830ac29950d1da0174 - - - - - - - - - - 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* c48b00b4b60d243ac6b337c5e9f717624776ae98 - - - - - - - - - - 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* 9bbb7d0fb36d3656705cd8a3585fd5c189fad419 - - - - - - - - - - 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
