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 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 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 (c57e2a427f4908039b3ccd16e053c5c3551c0fdb) \ N -- N -- N (588071131dcb023b3018c54958aea5a54561deb4) 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/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 eeb575b8282067b64a7bf73d171b208fcfc03909 Merge: f900604 430e024 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:54:02 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:54:02 2016 +0200 Merge remote-tracking branch 'origin/vmatare/tfutils' http://git.fawkesrobotics.org/fawkes.git/commit/eeb575b http://trac.fawkesrobotics.org/changeset/eeb575b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9b2f6e62526e96a56d6f755720eb123e44cb78ce Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Aug 29 16:44:45 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:54:53 2016 +0200 tfutils: fix tf_age return statement http://git.fawkesrobotics.org/fawkes.git/commit/9b2f6e6 http://trac.fawkesrobotics.org/changeset/9b2f6e6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6d1d5bb34393de9a3b82fc617b91b702bcf14f0b Merge: 9b2f6e6 98b00c2 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:54:58 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:54:58 2016 +0200 Merge remote-tracking branch 'origin/fzwilling/skiller-two-skills-called-use-last' http://git.fawkesrobotics.org/fawkes.git/commit/6d1d5bb http://trac.fawkesrobotics.org/changeset/6d1d5bb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 11788535f562606748af966643dfb85bb8adcdfa Merge: 6d1d5bb ed00e5d Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:55:01 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:55:01 2016 +0200 Merge remote-tracking branch 'origin/fzwilling/depthcam' http://git.fawkesrobotics.org/fawkes.git/commit/1178853 http://trac.fawkesrobotics.org/changeset/1178853 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 0c18a8648beb91c172d16e7826a009cf6e80eb5b Merge: 1178853 88ebc52 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:55:05 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:55:05 2016 +0200 Merge remote-tracking branch 'origin/thofmann/bash-completion' http://git.fawkesrobotics.org/fawkes.git/commit/0c18a86 http://trac.fawkesrobotics.org/changeset/0c18a86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit ec6f7b5dfb49226c4240cca7831303344b7f0a9d Merge: 0c18a86 50f7ce9 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:55:17 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:55:17 2016 +0200 Merge remote-tracking branch 'origin/thofmann/gcc6' http://git.fawkesrobotics.org/fawkes.git/commit/ec6f7b5 http://trac.fawkesrobotics.org/changeset/ec6f7b5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f20b5469a4652f85dd4c38e3ed4c91602bac8f99 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 11:55:54 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 buildsys: no C++11 flag on GCC 6 and above The default mode for C++ on GCC 6 is C++14. Hence the CPP11 flags should be empty. Otherwise the flag would even be a downgrade from the default. http://git.fawkesrobotics.org/fawkes.git/commit/f20b546 http://trac.fawkesrobotics.org/changeset/f20b546 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 49fcc3195a197aac7529fe724a55274e6a0900a0 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 11:57:47 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 gazebo: add ffmpeg flags if available Locally built Gazebo versions might include support for ffmpeg. Hence, if ffmpeg available, add its headers to the include path. It does not hurt if ffmpeg was not compiled in, but it makes builds fail if not and this patch is not applied. http://git.fawkesrobotics.org/fawkes.git/commit/49fcc31 http://trac.fawkesrobotics.org/changeset/49fcc31 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit da6306dd5cd6492f9c97372828b779ed50b78346 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:51:09 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 fvwidgets: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/da6306d http://trac.fawkesrobotics.org/changeset/da6306d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e6515f4ed2e534c6a690eb865314f18046ba22f0 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:51:21 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 gui_utils: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/e6515f4 http://trac.fawkesrobotics.org/changeset/e6515f4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f98b59fa5fe4aab0674380d0f0611f330ad969b8 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:51:34 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 netloggui: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/f98b59f http://trac.fawkesrobotics.org/changeset/f98b59f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f6ac6707628d4b541fe89d33b9ab66ff9c109252 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:52:15 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 plugin_gui: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/f6ac670 http://trac.fawkesrobotics.org/changeset/f6ac670 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 58daf18a23a6de6c877dce365223dac294634bf2 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:52:27 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 skillgui: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/58daf18 http://trac.fawkesrobotics.org/changeset/58daf18 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 5d5625ebbc86bfccec620ca2f8d0c4140f9048b0 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:52:39 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 firestation: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/5d5625e http://trac.fawkesrobotics.org/changeset/5d5625e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7e9a365e38b61dd2755087d3ff26e87411d1a9e8 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:52:48 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 fuse_viewer: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/7e9a365 http://trac.fawkesrobotics.org/changeset/7e9a365 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 48694d6cad38295716ef71a03e400a378b7ca60c Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:52:55 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 yuv_viewer: remove code for glibmm without exceptions http://git.fawkesrobotics.org/fawkes.git/commit/48694d6 http://trac.fawkesrobotics.org/changeset/48694d6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit d9443bfc535e26a131e27fd2fabab814955f7abd Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 12:53:19 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 lasergui: support builds for new and old glibmm Old versions used std::auto_ptr, while 2.48 and later use std::unique_ptr. Support both conditionally. http://git.fawkesrobotics.org/fawkes.git/commit/d9443bf http://trac.fawkesrobotics.org/changeset/d9443bf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 98f4922131adc6fb2382926f17588f35b7bc2a8c Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 13:42:43 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 openprs: conditional use of unique_ptr Bring back support for older systems with auto_ptr. http://git.fawkesrobotics.org/fawkes.git/commit/98f4922 http://trac.fawkesrobotics.org/changeset/98f4922 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 466450556bcb0fd0b3afad2f3eeb5d0594f0d454 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 13:44:21 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 pcl-db: make C++11 or later mandatory requirement http://git.fawkesrobotics.org/fawkes.git/commit/4664505 http://trac.fawkesrobotics.org/changeset/4664505 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 665fb630a025a19fb154c7e01a1ff47b971b4951 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 13:45:01 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 static-transforms: conditional use of unique_ptr http://git.fawkesrobotics.org/fawkes.git/commit/665fb63 http://trac.fawkesrobotics.org/changeset/665fb63 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 080f081dfc524e3f9744a57f62fb5739c85c7226 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 13:45:21 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:14 2016 +0200 webview-ptzcam: conditional use of unique_ptr http://git.fawkesrobotics.org/fawkes.git/commit/080f081 http://trac.fawkesrobotics.org/changeset/080f081 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit fd22b12cedc5d29e58ab7d7b87b2cf4d295ea309 Merge: 080f081 cbe35a0 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:57:50 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:57:50 2016 +0200 Merge remote-tracking branch 'origin/vmatare/motor-freeze' http://git.fawkesrobotics.org/fawkes.git/commit/fd22b12 http://trac.fawkesrobotics.org/changeset/fd22b12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 0e5132c91f0a4ab7f2dc62fa152bb18d1b32ad81 Merge: fd22b12 e321e6c Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:58:02 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:58:02 2016 +0200 Merge remote-tracking branch 'origin/bschaepers/amcl-segfault-fix' http://git.fawkesrobotics.org/fawkes.git/commit/0e5132c http://trac.fawkesrobotics.org/changeset/0e5132c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f857fcdcea63e64bad1263e14abbc6e388f7a82d Merge: 0e5132c 2ed1d57 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:58:12 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:58:12 2016 +0200 Merge remote-tracking branch 'origin/bschaepers/debian' http://git.fawkesrobotics.org/fawkes.git/commit/f857fcd http://trac.fawkesrobotics.org/changeset/f857fcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 45f4b5efa1b09aa04aa725486c08425169e9c807 Author: Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de> AuthorDate: Thu Feb 25 13:01:09 2016 +0100 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:58:22 2016 +0200 libconfig: documentation fixes http://git.fawkesrobotics.org/fawkes.git/commit/45f4b5e http://trac.fawkesrobotics.org/changeset/45f4b5e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7ea3b871c38e8cfac781949bc360c202f76b1654 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Thu Sep 1 09:42:24 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:58:33 2016 +0200 kdl_parser: use buildsys eigen3 detection While the orocos-kdl pkg-config does include Eigen3 in the include path, it does not set some flags necessary for successful compilation on recent GCCs. This has been fixed to also use the Fawkes buildsys Eigen3 detection and its determination of the appropriate flags. http://git.fawkesrobotics.org/fawkes.git/commit/7ea3b87 http://trac.fawkesrobotics.org/changeset/7ea3b87 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 2581b85ee15a5d0a05d3ec307c41f3ef04074e69 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Thu Sep 1 10:31:09 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:58:44 2016 +0200 ros-skiller: make callback arguments non-refs The goals are passed by value and not by reference. The new GCC (rightfully) complains about this. http://git.fawkesrobotics.org/fawkes.git/commit/2581b85 http://trac.fawkesrobotics.org/changeset/2581b85 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit c9764cc0c6bcbe29457b23667154cad5c6d7a73f Merge: 2581b85 0e29c04 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 15:58:56 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 15:58:56 2016 +0200 Merge remote-tracking branch 'origin/vmatare/laser-lines-matching' http://git.fawkesrobotics.org/fawkes.git/commit/c9764cc http://trac.fawkesrobotics.org/changeset/c9764cc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3da37cd0815daba98244642c1381d2fe183cfb6c Merge: c9764cc 4e8206b Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 16:01:52 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:01:52 2016 +0200 Merge remote-tracking branch 'origin/thofmann/skills-interface-ids' http://git.fawkesrobotics.org/fawkes.git/commit/3da37cd http://trac.fawkesrobotics.org/changeset/3da37cd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b5f3644ae15ff0364b927e07e7bead4ceec3aaab Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 15:17:11 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:03:13 2016 +0200 mongodb: update compile and link flags for FreeBSD http://git.fawkesrobotics.org/fawkes.git/commit/b5f3644 http://trac.fawkesrobotics.org/changeset/b5f3644 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 56bf8cb8badb5416469c9f9ddbcdbd11f2bf2d56 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 15:17:36 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:03:19 2016 +0200 skiller: remove unused member variables of exec thread Clang found this. http://git.fawkesrobotics.org/fawkes.git/commit/56bf8cb http://trac.fawkesrobotics.org/changeset/56bf8cb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6170084e6c6b155fff6077adbc16ebc5b8fa64a8 Merge: 56bf8cb bf9d5b3 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 16:03:28 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:03:28 2016 +0200 Merge remote-tracking branch 'origin/timn/ros-webview-fawkes_msgs' http://git.fawkesrobotics.org/fawkes.git/commit/6170084 http://trac.fawkesrobotics.org/changeset/6170084 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 2e746e17bf864d230d32f34fd1d502698cc96568 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 15:51:21 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:03:40 2016 +0200 laser-lines: documentation fixes for line tracking code http://git.fawkesrobotics.org/fawkes.git/commit/2e746e1 http://trac.fawkesrobotics.org/changeset/2e746e1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 7fe8b669b417a68cf3666c13f24e8c0adcfc8bda Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 16:34:34 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:03:57 2016 +0200 config: remove unused old config file http://git.fawkesrobotics.org/fawkes.git/commit/7fe8b66 http://trac.fawkesrobotics.org/changeset/7fe8b66 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 10e1d9b87355e32164209c81765c21859f703671 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 16:36:10 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:08 2016 +0200 config: remove unused old firevision field configs http://git.fawkesrobotics.org/fawkes.git/commit/10e1d9b http://trac.fawkesrobotics.org/changeset/10e1d9b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 0b3ab2fb5d833c6bf4763485ab4095d79385a8b8 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 17:22:02 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:17 2016 +0200 buildsys: fix boost version comparison macros The divider for the minor version was 1000 instead of 100 resulting in wrong checks. http://git.fawkesrobotics.org/fawkes.git/commit/0b3ab2f http://trac.fawkesrobotics.org/changeset/0b3ab2f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 3a1dd4f00b96e3ffe6b76fb5e680de56df7d13a7 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 17:23:43 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:24 2016 +0200 pcl-db: revive more auto_ptr The MongoDB API itself uses auto_ptr. It's just handled gracefully in the newer C++ mode as it seems. Create a guarded version which works for both cases. http://git.fawkesrobotics.org/fawkes.git/commit/3a1dd4f http://trac.fawkesrobotics.org/changeset/3a1dd4f - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 079b9159311610930ffb448f1270fc1e1595e108 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 17:24:30 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:30 2016 +0200 robotino: fix Boost version check Arguments were given in the wrong order. http://git.fawkesrobotics.org/fawkes.git/commit/079b915 http://trac.fawkesrobotics.org/changeset/079b915 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 513b7351e8a023877aacd2f127b029951a20da45 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 17:54:24 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:34 2016 +0200 buildsys: do no longer install firevision header to subdir Put headers in the regular place and keep the fv prefix. http://git.fawkesrobotics.org/fawkes.git/commit/513b735 http://trac.fawkesrobotics.org/changeset/513b735 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 96c8a83311dad370563beb57fa9c117cb7954771 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 20:40:30 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:42 2016 +0200 buildsys: remove _ in header install dirs If a library was named like fawkes_protobuf_comm, the resulting install directory was _protobuf_comm, which is not the intended directory. Therefore, remove a leading underscore. http://git.fawkesrobotics.org/fawkes.git/commit/96c8a83 http://trac.fawkesrobotics.org/changeset/96c8a83 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9f5d435494a0ee921119f8d59f84dedac119dca8 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 20:46:46 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:49 2016 +0200 eclipse_debugger: rename binary to ffeclipse-debugger Adhere to the Fawkes framework naming convention and disambiguate from Eclipse IDE related stuff. http://git.fawkesrobotics.org/fawkes.git/commit/9f5d435 http://trac.fawkesrobotics.org/changeset/9f5d435 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit bda907baa2a12aed7c19f70be7e6cd21e6cd8dd6 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 20:48:26 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:04:55 2016 +0200 lasergui: rename binary to fflasergui Adhere to naming convention and reduce the number of exceptions. The lasergui is no longer as central with rviz integration hence renaming can easily be done. http://git.fawkesrobotics.org/fawkes.git/commit/bda907b http://trac.fawkesrobotics.org/changeset/bda907b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit b73935a418d4cd7186aa4cce010a48c234093463 Merge: bda907b 1cf25d9 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 16:05:07 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:05:07 2016 +0200 Merge remote-tracking branch 'origin/tneumann/colli-testing/obst-wider-cost-next-to-it' http://git.fawkesrobotics.org/fawkes.git/commit/b73935a http://trac.fawkesrobotics.org/changeset/b73935a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit f5da9780a8ef4841e649e337bbad01d83569c702 Merge: b73935a a2c35e2 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 16:05:19 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:05:19 2016 +0200 Merge remote-tracking branch 'origin/tneumann/colli-testing/omni-drive-mode-no-ori-next-target' http://git.fawkesrobotics.org/fawkes.git/commit/f5da978 http://trac.fawkesrobotics.org/changeset/f5da978 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 784243be581f00c3e9682c39b212b2e26583fd67 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 22:45:15 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:05:30 2016 +0200 lasergui: fix typo in man page rule http://git.fawkesrobotics.org/fawkes.git/commit/784243b http://trac.fawkesrobotics.org/changeset/784243b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit d56f7eb82ed76c6ae728dca96f2249c1ef93017b Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 23:01:12 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:05:40 2016 +0200 lasergui: update man page to reflect new name of tool http://git.fawkesrobotics.org/fawkes.git/commit/d56f7eb http://trac.fawkesrobotics.org/changeset/d56f7eb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 83ed87d9f7580f66abb30130e67dce9a1fe07004 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 23:52:39 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:05:48 2016 +0200 openprs: specify module install path http://git.fawkesrobotics.org/fawkes.git/commit/83ed87d http://trac.fawkesrobotics.org/changeset/83ed87d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 1c86ddf733c4e7448e9c65adb4f33736e88d1782 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 23:53:29 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:05:53 2016 +0200 openprs-agent: specify module install path http://git.fawkesrobotics.org/fawkes.git/commit/1c86ddf http://trac.fawkesrobotics.org/changeset/1c86ddf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 0b071737a417c4948f828ef855499fbf2a3a0dc5 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 5 23:59:09 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:00 2016 +0200 gazebo: specify install path for Gazebo plugins http://git.fawkesrobotics.org/fawkes.git/commit/0b07173 http://trac.fawkesrobotics.org/changeset/0b07173 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 44a73a504ccd2eeb5cf53e3a8eed86813e8b6722 Merge: 0b07173 d99cf4d Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 16:06:17 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:17 2016 +0200 Merge remote-tracking branch 'origin/jrothe/plugin_generator' http://git.fawkesrobotics.org/fawkes.git/commit/44a73a5 http://trac.fawkesrobotics.org/changeset/44a73a5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit a8fb3e63389da0bef604d8e0b8b393c9e2d2c29e Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:01:46 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:25 2016 +0200 buildsys: modernize output of sysinstall rules http://git.fawkesrobotics.org/fawkes.git/commit/a8fb3e6 http://trac.fawkesrobotics.org/changeset/a8fb3e6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 4fc34bc1a2b2db584ebb8ff0fbe9d773a6240fc5 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:02:22 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:41 2016 +0200 buildsys: support arbitrary file installation for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/4fc34bc http://trac.fawkesrobotics.org/changeset/4fc34bc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 51afc9e414c0aa2814a0592dc3438ecd1c36b77e Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:04:42 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:45 2016 +0200 clips: copy CLIPS files for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/51afc9e http://trac.fawkesrobotics.org/changeset/51afc9e - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 8264cbf5b340cfbb83553cd5b2f79764b11515a4 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:04:47 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:49 2016 +0200 clips-agent: copy CLIPS files for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/8264cbf http://trac.fawkesrobotics.org/changeset/8264cbf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 5ad698cdca3c961c591fd64b0c8d5cb87d266ba3 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:04:58 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:52 2016 +0200 clips-navgraph: copy CLIPS files for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/5ad698c http://trac.fawkesrobotics.org/changeset/5ad698c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 6dd1f3070423f077b44d2354eeb9e58638c34214 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:05:33 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:06:56 2016 +0200 clips-protobuf: copy CLIPS files for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/6dd1f30 http://trac.fawkesrobotics.org/changeset/6dd1f30 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit e294066c83ddbbc8c001b08865e18aee43ca81b1 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:05:42 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:07:00 2016 +0200 clips-ros: copy CLIPS files for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/e294066 http://trac.fawkesrobotics.org/changeset/e294066 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 8393838cd2fd202b389ca3d8402d293952de9e58 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:06:00 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:07:03 2016 +0200 openprs: copy OpenPRS files for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/8393838 http://trac.fawkesrobotics.org/changeset/8393838 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 10cd5ba5d9f369e108e49cbe0be06966e30f5fc0 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:06:04 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:07:06 2016 +0200 openprs-agent: copy OpenPRS files for sysinstall http://git.fawkesrobotics.org/fawkes.git/commit/10cd5ba http://trac.fawkesrobotics.org/changeset/10cd5ba - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit d6dbef50be74a35de2f6f88e5c54959435640847 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 7 21:06:47 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:07:10 2016 +0200 joystick: add missing linking against libm http://git.fawkesrobotics.org/fawkes.git/commit/d6dbef5 http://trac.fawkesrobotics.org/changeset/d6dbef5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 245dd89efc241749c3d84269eb1dd0a06878de56 Merge: d6dbef5 23c9096 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 16:07:18 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:07:18 2016 +0200 Merge remote-tracking branch 'origin/thofmann/recovery-of-cancelled-threads' http://git.fawkesrobotics.org/fawkes.git/commit/245dd89 http://trac.fawkesrobotics.org/changeset/245dd89 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 9ba190d1be45e1bb69b664105b02e7ee8ec41230 Merge: 245dd89 55cd4f0 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Wed Sep 21 16:07:30 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:07:30 2016 +0200 Merge remote-tracking branch 'origin/sschoenitz/timeout' http://git.fawkesrobotics.org/fawkes.git/commit/9ba190d http://trac.fawkesrobotics.org/changeset/9ba190d - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit 588071131dcb023b3018c54958aea5a54561deb4 Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> AuthorDate: Mon Sep 19 13:49:21 2016 +0200 Commit: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> CommitDate: Wed Sep 21 16:07:40 2016 +0200 laser-lines: fix format string arguments Passing strings to ellipsis not supported. http://git.fawkesrobotics.org/fawkes.git/commit/5880711 http://trac.fawkesrobotics.org/changeset/5880711 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- - *Diffs* ------------------------------------------------------------- - *commit* eeb575b8282067b64a7bf73d171b208fcfc03909 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:54:02 2016 +0200 Subject: Merge remote-tracking branch 'origin/vmatare/tfutils' src/lua/fawkes/tfutils.lua | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) _Diff for modified files_: - *commit* 9b2f6e62526e96a56d6f755720eb123e44cb78ce - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Aug 29 16:44:45 2016 +0200 Subject: tfutils: fix tf_age return statement src/lua/fawkes/tfutils.lua | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/lua/fawkes/tfutils.lua b/src/lua/fawkes/tfutils.lua index 39cfa3f..d50d91b 100644 --- a/src/lua/fawkes/tfutils.lua +++ b/src/lua/fawkes/tfutils.lua @@ -133,7 +133,7 @@ end function tf_age(src_frame, target_frame) local transform = fawkes.tf.StampedTransform:new() tf:lookup_transform(src_frame, target_frame, transform) - return timediff = fawkes.Time:new() - transform.stamp + return (fawkes.Time:new() - transform.stamp) end - *commit* 6d1d5bb34393de9a3b82fc617b91b702bcf14f0b - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:54:58 2016 +0200 Subject: Merge remote-tracking branch 'origin/fzwilling/skiller-two-skills-called-use-last' src/lua/skiller/fawkes/init.lua | 53 +++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 27 deletions(-) _Diff for modified files_: - *commit* 11788535f562606748af966643dfb85bb8adcdfa - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:55:01 2016 +0200 Subject: Merge remote-tracking branch 'origin/fzwilling/depthcam' cfg/conf.d/gazsim.yaml | 7 ++ src/plugins/gazebo/Makefile | 3 +- .../{gazsim-webcam => gazsim-depthcam}/Makefile | 28 +++-- .../gazsim_depthcam_plugin.cpp} | 22 ++-- .../gazsim-depthcam/gazsim_depthcam_thread.cpp | 105 ++++++++++++++++++++ .../gazsim_depthcam_thread.h} | 54 ++++++----- 6 files changed, 171 insertions(+), 48 deletions(-) _Diff for modified files_: - *commit* 0c18a8648beb91c172d16e7826a009cf6e80eb5b - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:55:05 2016 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/bash-completion' etc/bash/fawkes_completion.bash | 84 +++++++++++++++++++++++++++++++++++++ src/libs/baseapp/init_options.cpp | 24 ++++++++++- src/libs/baseapp/run.cpp | 68 +++++++++++++++-------------- 3 files changed, 141 insertions(+), 35 deletions(-) _Diff for modified files_: - *commit* ec6f7b5dfb49226c4240cca7831303344b7f0a9d - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:55:17 2016 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/gcc6' src/libs/fvutils/ipc/shm_image.cpp | 7 +++++++ src/libs/fvwidgets/image_widget.cpp | 2 +- src/libs/gui_utils/plugin_tree_view.cpp | 8 ++++---- src/libs/plugin/manager.cpp | 6 +++--- src/libs/utils/system/dynamic_module/module.cpp | 4 ++-- src/libs/utils/system/fam.cpp | 8 ++++---- src/plugins/bblogger/bblogreplay_plugin.cpp | 4 ++++ src/plugins/clips/feature_config.cpp | 5 +++++ src/plugins/laser-cluster/laser-cluster-plugin.cpp | 4 ++++ src/plugins/laser-filter/filter_thread.cpp | 9 +++++++++ src/plugins/laser-filter/laser_filter_plugin.cpp | 12 ++++++++++++ src/plugins/laser/acquisition_thread.cpp | 5 ++--- src/plugins/laser/laser_plugin.cpp | 4 ++++ src/plugins/laser/urg_aqt.cpp | 4 ++++ src/plugins/laser/urg_gbx_aqt.cpp | 8 ++++++++ .../mongodb_log/tools/ffmongodb_save_imgs.cpp | 3 ++- src/plugins/openni/depth_thread.cpp | 8 ++++++-- src/plugins/openni/handtracker_thread.cpp | 19 ++++++++++++------- src/plugins/openni/image_thread.cpp | 8 ++++++-- src/plugins/openni/pointcloud_thread.cpp | 14 ++++++++++---- src/plugins/openprs/mod_config.cpp | 4 ---- .../perception/pcl-db/mongodb_tf_transformer.cpp | 2 +- src/plugins/perception/pcl-db/pcl_db_pipeline.h | 4 ++-- .../static_transforms/static_transforms_thread.cpp | 4 ---- .../webview-ptzcam/webview-ptzcam-thread.cpp | 4 ---- src/tools/lasergui/lasergui.cpp | 4 ---- src/tools/lasergui/lasergui_hildon.cpp | 2 +- src/tools/plugin_gui/main.cpp | 2 +- src/tools/skillgui/skillgui.cpp | 2 +- src/tools/vision/firestation/main.cpp | 2 +- src/tools/vision/fuse_viewer/main.cpp | 2 +- 31 files changed, 117 insertions(+), 57 deletions(-) _Diff for modified files_: - *commit* f20b5469a4652f85dd4c38e3ed4c91602bac8f99 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 11:55:54 2016 +0200 Subject: buildsys: no C++11 flag on GCC 6 and above etc/buildsys/gcc.mk | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/gcc.mk b/etc/buildsys/gcc.mk index b33e9e0..b836844 100644 --- a/etc/buildsys/gcc.mk +++ b/etc/buildsys/gcc.mk @@ -42,9 +42,11 @@ gcc_lessthan_version = $(strip $(if $(call lt,$(GCC_VERSION_MAJOR),$1),1, \ # Check für C++0x/C++11 availability ifeq ($(call gcc_atleast_version,4,3),1) HAVE_CPP11=1 - CFLAGS_CPP11=-std=c++0x - ifeq ($(call gcc_atleast_version,4,7),1) - CFLAGS_CPP11=-std=c++11 + ifneq ($(call gcc_atleast_version,6,0),1) + CFLAGS_CPP11=-std=c++0x + ifeq ($(call gcc_atleast_version,4,7),1) + CFLAGS_CPP11=-std=c++11 + endif endif endif - *commit* 49fcc3195a197aac7529fe724a55274e6a0900a0 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 11:57:47 2016 +0200 Subject: gazebo: add ffmpeg flags if available src/plugins/gazebo/gazebo.mk | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gazebo/gazebo.mk b/src/plugins/gazebo/gazebo.mk index b72ec95..0b57ad9 100644 --- a/src/plugins/gazebo/gazebo.mk +++ b/src/plugins/gazebo/gazebo.mk @@ -28,6 +28,15 @@ endif ifeq ($(HAVE_GAZEBO),1) CFLAGS_GAZEBO = -DHAVE_GAZEBO $(shell $(PKGCONFIG) --cflags 'gazebo') LDFLAGS_GAZEBO = $(shell $(PKGCONFIG) --libs 'gazebo') -ldl + + # if ffmpeg is installed, gazebo may have been compiled with support for it + # # hence check for headers and add the respective include directories + ifneq ($(wildcard $(SYSROOT)/usr/include/ffmpeg/libavcodec/avcodec.h),) + CFLAGS_GAZEBO += -I$(SYSROOT)/usr/include/ffmpeg + endif + ifneq ($(wildcard $(SYSROOT)/usr/local/include/ffmpeg/libavcodec/avcodec.h),) + CFLAGS_GAZEBO += -I$(SYSROOT)/usr/local/include/ffmpeg + endif endif endif # __buildsys_gazebo_mk_ - *commit* da6306dd5cd6492f9c97372828b779ed50b78346 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:51:09 2016 +0200 Subject: fvwidgets: remove code for glibmm without exceptions src/libs/fvwidgets/image_widget.cpp | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) _Diff for modified files_: diff --git a/src/libs/fvwidgets/image_widget.cpp b/src/libs/fvwidgets/image_widget.cpp index eccf68c..bf43c03 100644 --- a/src/libs/fvwidgets/image_widget.cpp +++ b/src/libs/fvwidgets/image_widget.cpp @@ -433,12 +433,7 @@ ImageWidget::save_image(std::string filename, Glib::ustring type) const throw() __cam_mutex->lock(); try { -#ifdef GLIBMM_EXCEPTIONS_ENABLED __pixbuf->save(filename, type); -#else - std::unique_ptr<Glib::Error> error; - __pixbuf->save(filename, type, error); -#endif __cam_mutex->unlock(); return true; } - *commit* e6515f4ed2e534c6a690eb865314f18046ba22f0 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:51:21 2016 +0200 Subject: gui_utils: remove code for glibmm without exceptions src/libs/gui_utils/plugin_tree_view.cpp | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) _Diff for modified files_: diff --git a/src/libs/gui_utils/plugin_tree_view.cpp b/src/libs/gui_utils/plugin_tree_view.cpp index 79dc204..bf933ef 100644 --- a/src/libs/gui_utils/plugin_tree_view.cpp +++ b/src/libs/gui_utils/plugin_tree_view.cpp @@ -122,12 +122,7 @@ PluginTreeView::~PluginTreeView() #ifdef HAVE_GCONFMM if (__gconf) { -# ifdef GLIBMM_EXCEPTIONS_ENABLED __gconf->remove_dir(__gconf_prefix); -# else - std::unique_ptr<Glib::Error> error; - __gconf->remove_dir(__gconf_prefix, error); -# endif } #endif } @@ -153,20 +148,10 @@ PluginTreeView::set_gconf_prefix(Glib::ustring gconf_prefix) if (! __gconf) { __gconf = Gnome::Conf::Client::get_default_client(); } else { -# ifdef GLIBMM_EXCEPTIONS_ENABLED __gconf->remove_dir(__gconf_prefix); -# else - std::unique_ptr<Glib::Error> error; - __gconf->remove_dir(__gconf_prefix, error); -# endif } -#ifdef GLIBMM_EXCEPTIONS_ENABLED __gconf->add_dir(gconf_prefix); -#else - std::unique_ptr<Glib::Error> error; - __gconf->add_dir(gconf_prefix, Gnome::Conf::CLIENT_PRELOAD_NONE, error); -#endif __gconf_prefix = gconf_prefix; if (__gconf_connection) { @@ -445,12 +430,7 @@ PluginTreeView::append_plugin_column() # ifdef HAVE_GCONFMM if ( __gconf ) { -# ifdef GLIBMM_EXCEPTIONS_ENABLED description_as_tooltip = __gconf->get_bool(__gconf_prefix + "/description_as_tooltip"); -# else - std::unique_ptr<Glib::Error> error; - description_as_tooltip = __gconf->get_bool(__gconf_prefix + "/description_as_tooltip", error); -# endif } # endif #endif - *commit* f98b59fa5fe4aab0674380d0f0611f330ad969b8 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:51:34 2016 +0200 Subject: netloggui: remove code for glibmm without exceptions src/tools/netloggui/main.cpp | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) _Diff for modified files_: diff --git a/src/tools/netloggui/main.cpp b/src/tools/netloggui/main.cpp index cebe0a3..9a097fd 100644 --- a/src/tools/netloggui/main.cpp +++ b/src/tools/netloggui/main.cpp @@ -29,13 +29,7 @@ main(int argc, char **argv) { Gtk::Main gtk_main(argc, argv); Glib::RefPtr<Gtk::Builder> builder; -#ifdef GLIBMM_EXCEPTIONS_ENABLED builder = Gtk::Builder::create_from_file(RESDIR"/guis/netloggui/netloggui.ui"); -#else - Glib::RefPtr<Gtk::BuilderError> error; - builder = - Gtk::Builder::create_from_file(RESDIR"/guis/netloggui/netloggui.ui", error); -#endif NetLogGuiGtkWindow *window = NULL; builder->get_widget_derived("wnd_netloggui", window); - *commit* f6ac6707628d4b541fe89d33b9ab66ff9c109252 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:52:15 2016 +0200 Subject: plugin_gui: remove code for glibmm without exceptions src/tools/plugin_gui/main.cpp | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) _Diff for modified files_: diff --git a/src/tools/plugin_gui/main.cpp b/src/tools/plugin_gui/main.cpp index cc9a2dd..fba07e3 100644 --- a/src/tools/plugin_gui/main.cpp +++ b/src/tools/plugin_gui/main.cpp @@ -46,22 +46,12 @@ int main(int argc, char** argv) #endif Glib::RefPtr<Gtk::Builder> builder; -#ifdef GLIBMM_EXCEPTIONS_ENABLED try { builder = Gtk::Builder::create_from_file(UI_FILE); } catch (Gtk::BuilderError &e) { printf("Failed to create GUI: %s\n", e.what().c_str()); } -#else - std::unique_ptr<Gtk::BuilderError> error; - Glib::RefPtr<Gtk::Builder> builder = - Gtk::Builder::create_from_file(UI_FILE, error); - if (error.get()) { - throw fawkes::Exception("Failed to load Glade file: %s", - error->what().c_str()); - } -#endif PluginGuiGtkWindow *window = NULL; builder->get_widget_derived("wndMain", window); - *commit* 58daf18a23a6de6c877dce365223dac294634bf2 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:52:27 2016 +0200 Subject: skillgui: remove code for glibmm without exceptions src/tools/skillgui/skillgui.cpp | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) _Diff for modified files_: diff --git a/src/tools/skillgui/skillgui.cpp b/src/tools/skillgui/skillgui.cpp index b9627e8..7a0df68 100644 --- a/src/tools/skillgui/skillgui.cpp +++ b/src/tools/skillgui/skillgui.cpp @@ -234,12 +234,7 @@ SkillGuiGtkWindow::on_config_changed() row[__sks_record.skillstring] = *i; } -#ifdef GLIBMM_EXCEPTIONS_ENABLED bool colored = __gconf->get_bool(GCONF_PREFIX"/graph_colored"); -#else - std::unique_ptr<Glib::Error> error; - bool colored = __gconf->get_bool(GCONF_PREFIX"/graph_colored", error); -#endif tb_graphcolored->set_active(colored); #endif } - *commit* 5d5625ebbc86bfccec620ca2f8d0c4140f9048b0 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:52:39 2016 +0200 Subject: firestation: remove code for glibmm without exceptions src/tools/vision/firestation/main.cpp | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) _Diff for modified files_: diff --git a/src/tools/vision/firestation/main.cpp b/src/tools/vision/firestation/main.cpp index b322b60..590544d 100644 --- a/src/tools/vision/firestation/main.cpp +++ b/src/tools/vision/firestation/main.cpp @@ -30,14 +30,8 @@ int main(int argc, char** argv) try { Gtk::Main kit(argc, argv); -#ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create_from_file(RESDIR"/guis/firestation/firestation.ui"); -#else - std::unique_ptr<Gtk::BuilderError> error; - Glib::RefPtr<Gtk::Builder> builder = - Gtk::Builder::create_from_file(RESDIR"/guis/firestation/firestation.ui", error); -#endif Firestation firestation(builder); kit.run(firestation.get_window()); return 0; - *commit* 7e9a365e38b61dd2755087d3ff26e87411d1a9e8 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:52:48 2016 +0200 Subject: fuse_viewer: remove code for glibmm without exceptions src/tools/vision/fuse_viewer/main.cpp | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) _Diff for modified files_: diff --git a/src/tools/vision/fuse_viewer/main.cpp b/src/tools/vision/fuse_viewer/main.cpp index ae92bfd..78c2540 100644 --- a/src/tools/vision/fuse_viewer/main.cpp +++ b/src/tools/vision/fuse_viewer/main.cpp @@ -36,17 +36,8 @@ int main(int argc, char** argv) { Gtk::Main kit(argc, argv); -#ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create_from_file(RESDIR"/guis/fuse_viewer/fuse_viewer.ui"); -#else - std::unique_ptr<Gtk::BuilderError> error; - Glib::RefPtr<Gtk::Builder> builder = - Gtk::Builder::create_from_file(RESDIR"/guis/fuse_viewer/fuse_viewer.ui", error); - if (error.get()) { - throw fawkes::Exception("Failed to load UI file: %s", error->what().c_str()); - } -#endif FuseViewerGtkWindow *window = NULL; builder->get_widget_derived("wndMain", window); - *commit* 48694d6cad38295716ef71a03e400a378b7ca60c - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:52:55 2016 +0200 Subject: yuv_viewer: remove code for glibmm without exceptions src/tools/vision/yuv_viewer/main.cpp | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) _Diff for modified files_: diff --git a/src/tools/vision/yuv_viewer/main.cpp b/src/tools/vision/yuv_viewer/main.cpp index 306e5d0..751d41a 100644 --- a/src/tools/vision/yuv_viewer/main.cpp +++ b/src/tools/vision/yuv_viewer/main.cpp @@ -36,17 +36,8 @@ int main(int argc, char** argv) { Gtk::Main kit(argc, argv); -#ifdef GLIBMM_EXCEPTIONS_ENABLED Glib::RefPtr<Gtk::Builder> builder = Gtk::Builder::create_from_file(RESDIR"/guis/yuv_viewer/yuv_viewer.ui"); -#else - Glib::RefPtr<Gtk::BuilderError> error; - Glib::RefPtr<Gtk::Builder> builder = - Gtk::Builder::create(RESDIR"/guis/yuv_viewer/yuv_viewer.ui", error); - if (error.get()) { - throw fawkes::Exception("Failed to load UI file: %s", error->what().c_str()); - } -#endif YuvViewerGtkWindow *window = NULL; builder->get_widget_derived("wndMain", window); - *commit* d9443bfc535e26a131e27fd2fabab814955f7abd - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 12:53:19 2016 +0200 Subject: lasergui: support builds for new and old glibmm src/tools/lasergui/lasergui.cpp | 4 ++++ src/tools/lasergui/lasergui_hildon.cpp | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/tools/lasergui/lasergui.cpp b/src/tools/lasergui/lasergui.cpp index fbc1930..6a1e747 100644 --- a/src/tools/lasergui/lasergui.cpp +++ b/src/tools/lasergui/lasergui.cpp @@ -160,7 +160,11 @@ class LaserGuiGtkWindow : public Gtk::Window md.set_title("Interface Selection Failed"); md.run(); } else { +#if __cplusplus >= 201103L std::unique_ptr<MultiInterfaceChooserDialog> ifcd( +#else + std::auto_ptr<MultiInterfaceChooserDialog> ifcd( +#endif MultiInterfaceChooserDialog::create(*this, __bb, "Laser*Interface", diff --git a/src/tools/lasergui/lasergui_hildon.cpp b/src/tools/lasergui/lasergui_hildon.cpp index 6a080eb..33cf95c 100644 --- a/src/tools/lasergui/lasergui_hildon.cpp +++ b/src/tools/lasergui/lasergui_hildon.cpp @@ -72,7 +72,11 @@ class LaserGuiHildonWindow : public Hildon::Window __laser_if = NULL; __ifd = NULL; +# if GLIBMM_MAJOR_VERSION > 2 || (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION >= 48) std::unique_ptr<Glib::Error> error; +# else + std::auto_ptr<Glib::Error> error; +# endif set_icon_from_file(RESDIR"/guis/lasergui/lines_"ICON_FORMAT".png", error); add(__area); - *commit* 98f4922131adc6fb2382926f17588f35b7bc2a8c - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 13:42:43 2016 +0200 Subject: openprs: conditional use of unique_ptr src/plugins/openprs/mod_config.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/openprs/mod_config.cpp b/src/plugins/openprs/mod_config.cpp index 8eaeb7d..0d8d351 100644 --- a/src/plugins/openprs/mod_config.cpp +++ b/src/plugins/openprs/mod_config.cpp @@ -44,7 +44,11 @@ action_config_load(TermList terms) ACTION_ASSERT_ARG_LENGTH("config-load", terms, 1); ACTION_SET_AND_ASSERT_ARG_TYPE("config-load", prefix, terms, 1, STRING); +#if __cplusplus >= 201103L std::unique_ptr<Configuration::ValueIterator> v(g_config->search(prefix->u.string)); +#else + std::auto_ptr<Configuration::ValueIterator> v(g_config->search(prefix->u.string)); +#endif while (v->next()) { TermList tl = sl_make_slist(); tl = build_term_list(tl, build_string(v->path())); - *commit* 466450556bcb0fd0b3afad2f3eeb5d0594f0d454 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 13:44:21 2016 +0200 Subject: pcl-db: make C++11 or later mandatory requirement src/plugins/perception/pcl-db/Makefile | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/perception/pcl-db/Makefile b/src/plugins/perception/pcl-db/Makefile index 2c30d9d..88269d3 100644 --- a/src/plugins/perception/pcl-db/Makefile +++ b/src/plugins/perception/pcl-db/Makefile @@ -54,8 +54,8 @@ OBJS_pcl_db_store = pcl_db_store_plugin.o pcl_db_store_thread.o OBJS_all = $(OBJS_pcl_db_merge) $(OBJS_pcl_db_retrieve) $(OBJS_pcl_db_store) -ifeq ($(HAVE_MONGODB)$(HAVE_PCL)$(HAVE_TF),111) - CFLAGS += $(CFLAGS_PCL) $(CFLAGS_TF) $(CFLAGS_MONGODB) +ifeq ($(HAVE_MONGODB)$(HAVE_PCL)$(HAVE_TF)$(HAVE_CPP11),1111) + CFLAGS += $(CFLAGS_PCL) $(CFLAGS_TF) $(CFLAGS_MONGODB) $(CFLAGS_CPP11) LDFLAGS += $(LDFLAGS_PCL) $(LDFLAGS_TF) $(LDFLAGS_MONGODB) PLUGINS_all = $(PLUGINDIR)/pcl-db-store.so $(PLUGINDIR)/pcl-db-retrieve.so @@ -81,6 +81,9 @@ else ifneq ($(HAVE_TF),1) WARN_TARGETS += warning_tf endif + ifneq ($(HAVE_CPP11),1) + WARN_TARGETS += warning_cpp11 + endif endif ros: interfaces @@ -89,7 +92,7 @@ ros: interfaces ifeq ($(OBJSSUBMAKE),1) all: $(WARN_TARGETS) -.PHONY: warning_mongodb warning_pcl warning_pcl_components warning_tf +.PHONY: warning_mongodb warning_pcl warning_pcl_components warning_tf warning_cpp11 warning_mongodb: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL plugins$(TNORMAL) (mongodb[-devel] not installed)" warning_pcl: @@ -98,6 +101,8 @@ warning_pcl_components: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL merge plugin$(TNORMAL) (missing PCL components: $(call pcl-missing-libs,$(REQUIRED_PCL_LIBS_MERGE)))" warning_tf: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL merge plugin$(TNORMAL) (TF framework not available)" +warning_cpp11: + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting MongoDB PCL merge plugin$(TNORMAL) (C++11 support required)" endif include $(BUILDSYSDIR)/base.mk - *commit* 665fb630a025a19fb154c7e01a1ff47b971b4951 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 13:45:01 2016 +0200 Subject: static-transforms: conditional use of unique_ptr .../static_transforms/static_transforms_thread.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/static_transforms/static_transforms_thread.cpp b/src/plugins/static_transforms/static_transforms_thread.cpp index 5a23abe..edd1e33 100644 --- a/src/plugins/static_transforms/static_transforms_thread.cpp +++ b/src/plugins/static_transforms/static_transforms_thread.cpp @@ -78,7 +78,11 @@ StaticTransformsThread::entries_get_from_config() std::set<std::string> ignored_transforms; std::string prefix = CFG_PREFIX"transforms/"; +#if __cplusplus >= 201103L std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str())); +#else + std::auto_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str())); +#endif while (i->next()) { std::string cfg_name = std::string(i->path()).substr(prefix.length()); cfg_name = cfg_name.substr(0, cfg_name.find("/")); - *commit* 080f081dfc524e3f9744a57f62fb5739c85c7226 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 13:45:21 2016 +0200 Subject: webview-ptzcam: conditional use of unique_ptr .../webview-ptzcam/webview-ptzcam-thread.cpp | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp b/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp index 0e40cc3..a48fb64 100644 --- a/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp +++ b/src/plugins/webview-ptzcam/webview-ptzcam-thread.cpp @@ -87,7 +87,11 @@ WebviewPtzCamThread::init() std::map<std::string, std::tuple<std::string, float, float, unsigned int>> presets; std::string prefix = "/webview/ptzcam/presets/"; +#if __cplusplus >= 201103L std::unique_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str())); +#else + std::auto_ptr<Configuration::ValueIterator> i(config->search(prefix.c_str())); +#endif while (i->next()) { std::string cfg_name = std::string(i->path()).substr(prefix.length()); cfg_name = cfg_name.substr(0, cfg_name.find("/")); - *commit* fd22b12cedc5d29e58ab7d7b87b2cf4d295ea309 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:57:50 2016 +0200 Subject: Merge remote-tracking branch 'origin/vmatare/motor-freeze' src/plugins/robotino/act_thread.cpp | 5 +++++ src/plugins/robotino/act_thread.h | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) _Diff for modified files_: - *commit* 0e5132c91f0a4ab7f2dc62fa152bb18d1b32ad81 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:58:02 2016 +0200 Subject: Merge remote-tracking branch 'origin/bschaepers/amcl-segfault-fix' src/plugins/amcl/map/map_cspace.cpp | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) _Diff for modified files_: - *commit* f857fcdcea63e64bad1263e14abbc6e388f7a82d - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:58:12 2016 +0200 Subject: Merge remote-tracking branch 'origin/bschaepers/debian' src/plugins/mongodb_log/tools/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) _Diff for modified files_: - *commit* 45f4b5efa1b09aa04aa725486c08425169e9c807 - - - - - - - - - - Author: Bjoern Schaepers <bjoern.schaep...@rwth-aachen.de> Date: Thu Feb 25 13:01:09 2016 +0100 Subject: libconfig: documentation fixes src/libs/config/config.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/src/libs/config/config.cpp b/src/libs/config/config.cpp index f22882d..bd17ad2 100644 --- a/src/libs/config/config.cpp +++ b/src/libs/config/config.cpp @@ -48,10 +48,10 @@ namespace fawkes { * * * @fn void Configuration::copy(Configuration *copyconf) - * Copy all values from the given configuration. + * Copies all values from the given configuration. * All values from the given configuration are copied. Old values are not erased * so that the copied values will overwrite existing values, new values are - * created, but values existent in current config but not in the copie config + * created, but values existent in current config but not in the copied config * will remain unchanged. * @param copyconf configuration to copy * - *commit* 7ea3b871c38e8cfac781949bc360c202f76b1654 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Thu Sep 1 09:42:24 2016 +0200 Subject: kdl_parser: use buildsys eigen3 detection src/libs/kdl_parser/Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/libs/kdl_parser/Makefile b/src/libs/kdl_parser/Makefile index 951bd70..01e75c0 100644 --- a/src/libs/kdl_parser/Makefile +++ b/src/libs/kdl_parser/Makefile @@ -16,15 +16,16 @@ BASEDIR = ../../.. include $(BASEDIR)/etc/buildsys/config.mk include $(BUILDSYSDIR)/boost.mk +include $(BUILDSYSDIR)/eigen3.mk LIBS_libfawkeskdl_parser = fawkescore OBJS_libfawkeskdl_parser = $(patsubst %.cpp,%.o,$(patsubst qa/%,,$(subst $(SRCDIR)/,,$(realpath $(wildcard $(SRCDIR)/*.cpp))))) HDRS_libfawkeskdl_parser = $(subst $(SRCDIR)/,,$(wildcard $(SRCDIR)/*.h)) OBJS_all = $(OBJS_libfawkeskdl_parser) -ifeq ($(HAVE_KDLPARSER),1) - CFLAGS += $(CFLAGS_KDLPARSER) - LDFLAGS += $(LDFLAGS_KDLPARSER) +ifeq ($(HAVE_KDLPARSER)$(HAVE_EIGEN3),11) + CFLAGS += $(CFLAGS_KDLPARSER) $(CFLAGS_EIGEN3) + LDFLAGS += $(LDFLAGS_KDLPARSER) $(LDFLAGS_EIGEN3) LIBS_all = $(LIBDIR)/libfawkeskdl_parser.so else ifneq ($(HAVE_KDL),1) - *commit* 2581b85ee15a5d0a05d3ec307c41f3ef04074e69 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Thu Sep 1 10:31:09 2016 +0200 Subject: ros-skiller: make callback arguments non-refs src/plugins/ros/skiller_thread.cpp | 4 ++-- src/plugins/ros/skiller_thread.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/plugins/ros/skiller_thread.cpp b/src/plugins/ros/skiller_thread.cpp index dc3ab94..6362f38 100644 --- a/src/plugins/ros/skiller_thread.cpp +++ b/src/plugins/ros/skiller_thread.cpp @@ -104,7 +104,7 @@ RosSkillerThread::stop() } void -RosSkillerThread::action_goal_cb(SkillerServer::GoalHandle &goal) +RosSkillerThread::action_goal_cb(SkillerServer::GoalHandle goal) { MutexLocker lock(loop_mutex); if (exec_running_ && exec_as_) { @@ -120,7 +120,7 @@ RosSkillerThread::action_goal_cb(SkillerServer::GoalHandle &goal) } void -RosSkillerThread::action_cancel_cb(SkillerServer::GoalHandle &goal) +RosSkillerThread::action_cancel_cb(SkillerServer::GoalHandle goal) { MutexLocker lock(loop_mutex); stop(); diff --git a/src/plugins/ros/skiller_thread.h b/src/plugins/ros/skiller_thread.h index c6a2ba4..7bc38fe 100644 --- a/src/plugins/ros/skiller_thread.h +++ b/src/plugins/ros/skiller_thread.h @@ -68,8 +68,8 @@ class RosSkillerThread typedef actionlib::ActionServer<fawkes_msgs::ExecSkillAction> SkillerServer; - void action_goal_cb(SkillerServer::GoalHandle &goal); - void action_cancel_cb(SkillerServer::GoalHandle &goal); + void action_goal_cb(SkillerServer::GoalHandle goal); + void action_cancel_cb(SkillerServer::GoalHandle goal); void message_cb(const std_msgs::String::ConstPtr & goal); void stop(); - *commit* c9764cc0c6bcbe29457b23667154cad5c6d7a73f - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 15:58:56 2016 +0200 Subject: Merge remote-tracking branch 'origin/vmatare/laser-lines-matching' src/plugins/laser-lines/Makefile | 2 +- src/plugins/laser-lines/laser-lines-thread.cpp | 453 ++++++++++++------------ src/plugins/laser-lines/laser-lines-thread.h | 18 +- src/plugins/laser-lines/line_info.cpp | 128 +++++++ src/plugins/laser-lines/line_info.h | 33 ++ 5 files changed, 399 insertions(+), 235 deletions(-) _Diff for modified files_: - *commit* 3da37cd0815daba98244642c1381d2fe183cfb6c - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 16:01:52 2016 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/skills-interface-ids' src/lua/skills/generic/advanced/katana_grab.lua | 2 +- .../skills/generic/advanced/katana_grab_any.lua | 2 +- src/lua/skills/generic/advanced/katana_put.lua | 2 +- src/lua/skills/generic/goto.lua | 4 ++-- src/lua/skills/generic/jaco.lua | 6 +++--- src/lua/skills/generic/jaco_bimanual.lua | 2 +- src/lua/skills/generic/katana.lua | 2 +- src/lua/skills/generic/katana_approach.lua | 2 +- src/lua/skills/generic/katana_rel.lua | 2 +- src/lua/skills/generic/ppgoto.lua | 2 +- src/lua/skills/generic/relgoto.lua | 2 +- src/lua/skills/generic/transrot.lua | 2 +- src/lua/skills/generic/turn.lua | 2 +- src/lua/skills/nao/getup.lua | 2 +- src/lua/skills/nao/led.lua | 4 ++-- src/lua/skills/nao/naorelgoto.lua | 4 ++-- src/lua/skills/nao/naostrafe.lua | 2 +- src/lua/skills/nao/park.lua | 4 ++-- src/lua/skills/nao/servo.lua | 6 +++--- src/lua/skills/nao/soccer/kick.lua | 2 +- src/lua/skills/nao/standup.lua | 2 +- src/lua/skills/nao/stop.lua | 2 +- src/lua/skills/nao/walk.lua | 2 +- 23 files changed, 31 insertions(+), 31 deletions(-) _Diff for modified files_: - *commit* b5f3644ae15ff0364b927e07e7bead4ceec3aaab - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 15:17:11 2016 +0200 Subject: mongodb: update compile and link flags for FreeBSD src/plugins/mongodb/mongodb.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/mongodb/mongodb.mk b/src/plugins/mongodb/mongodb.mk index bde0fc9..e759cdf 100644 --- a/src/plugins/mongodb/mongodb.mk +++ b/src/plugins/mongodb/mongodb.mk @@ -36,6 +36,10 @@ ifneq ($(wildcard /usr/include/mongo/client/dbclient.h /usr/local/include/mongo/ ifeq ($(DISTRO),ubuntu) LDFLAGS_MONGODB += -lssl -lcrypto endif + ifeq ($(OS),FreeBSD) + CFLAGS_MONGODB += -Wno-deprecated-declarations + LDFLAGS_MONGODB += -lssl -lcrypto -lsasl2 + endif endif endif - *commit* 56bf8cb8badb5416469c9f9ddbcdbd11f2bf2d56 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 15:17:36 2016 +0200 Subject: skiller: remove unused member variables of exec thread src/plugins/skiller/exec_thread.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) _Diff for modified files_: diff --git a/src/plugins/skiller/exec_thread.h b/src/plugins/skiller/exec_thread.h index c3a4a49..c3f7dcf 100644 --- a/src/plugins/skiller/exec_thread.h +++ b/src/plugins/skiller/exec_thread.h @@ -92,9 +92,6 @@ class SkillerExecutionThread fawkes::ComponentLogger *__clog; fawkes::BlackBoardWithOwnership *__bbo; - unsigned int __last_exclusive_controller; - bool __reader_just_left; - // config values std::string __cfg_skillspace; bool __cfg_watch_files; - *commit* 6170084e6c6b155fff6077adbc16ebc5b8fa64a8 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 16:03:28 2016 +0200 Subject: Merge remote-tracking branch 'origin/timn/ros-webview-fawkes_msgs' src/plugins/ros/Makefile | 13 +++++------ src/plugins/ros/webview_reqproc.cpp | 12 +++++----- src/plugins/ros/webview_thread.cpp | 36 +++++++++++++++------------------- src/plugins/ros/webview_thread.h | 20 +++++++++--------- 4 files changed, 38 insertions(+), 43 deletions(-) _Diff for modified files_: - *commit* 2e746e17bf864d230d32f34fd1d502698cc96568 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 15:51:21 2016 +0200 Subject: laser-lines: documentation fixes for line tracking code src/plugins/laser-lines/line_info.cpp | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/plugins/laser-lines/line_info.cpp b/src/plugins/laser-lines/line_info.cpp index 97cd804..db36d9f 100644 --- a/src/plugins/laser-lines/line_info.cpp +++ b/src/plugins/laser-lines/line_info.cpp @@ -24,7 +24,19 @@ using namespace std; +/** @class TrackedLineInfo "line_info.h" + * Container for a line with tracking and smoothing info. + */ +/** Constructor. + * @param tfer tf transformer + * @param input_frame_id frame id of incoming data + * @param tracking_frame_id fixed frame in which to perform tracking + * @param cfg_switch_tolerance tolerance in m for when to assume a line ID switch + * @param cfg_moving_avg_len length of buffer for moving average + * @param logger logger for informational messages + * @param plugin_name component for informational messages + */ TrackedLineInfo::TrackedLineInfo( fawkes::tf::Transformer *tfer, const string &input_frame_id, @@ -44,8 +56,8 @@ TrackedLineInfo::TrackedLineInfo( {} -/** - * Compute this line's distance from @param linfo, using odom as reference frame. +/** Compute this line's distance from line info + * @param linfo line info * @return the scalar distance between the two base points in meters. */ btScalar TrackedLineInfo::distance(const LineInfo &linfo) const @@ -66,8 +78,8 @@ btScalar TrackedLineInfo::distance(const LineInfo &linfo) const } -/** - * Update this line with the data from @param linfo. +/** Update this line. + * @param linfo new info to consume * This also updates moving averages for all fields. */ void TrackedLineInfo::update(LineInfo &linfo) - *commit* 7fe8b669b417a68cf3666c13f24e8c0adcfc8bda - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 16:34:34 2016 +0200 Subject: config: remove unused old config file cfg/modules.d/80_readylogagent.yaml | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) - *commit* 10e1d9b87355e32164209c81765c21859f703671 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 16:36:10 2016 +0200 Subject: config: remove unused old firevision field configs cfg/firevision/fields/msl2007.field | 25 ------------------------- cfg/firevision/fields/rwth-foyer-half.field | 12 ------------ cfg/firevision/fields/rwth-foyer.field | 17 ----------------- 3 files changed, 0 insertions(+), 54 deletions(-) - *commit* 0b3ab2fb5d833c6bf4763485ab4095d79385a8b8 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 17:22:02 2016 +0200 Subject: buildsys: fix boost version comparison macros etc/buildsys/boost.mk | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/boost.mk b/etc/buildsys/boost.mk index 309e00d..3317dee 100644 --- a/etc/buildsys/boost.mk +++ b/etc/buildsys/boost.mk @@ -45,7 +45,8 @@ ifeq ($(call boost-have-include,version.hpp),1) BOOST_VERSION_PATCH = $(shell echo $$(($(BOOST_VERSION) % 100))) endif -boost-version-create = $(shell echo $$(($1 * 100000 + $2 * 1000 + $3))) -boost-version-atleast = $(shell echo $$(($(BOOST_VERSION) >= $1 * 100000 + $2 * 1000 + $3))) +boost-version-create = $(shell echo $$(($1 * 100000 + $2 * 100 + $3))) +boost-version-atleast = $(shell echo $$(($(BOOST_VERSION) >= $1 * 100000 + $2 * 100 + $3))) +boost-version-parse = $(shell echo $$(($1 / 100000)).$$(($1 / 100 % 1000)).$$(($1 % 100))) endif # __buildsys_boost_mk_ - *commit* 3a1dd4f00b96e3ffe6b76fb5e680de56df7d13a7 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 17:23:43 2016 +0200 Subject: pcl-db: revive more auto_ptr .../perception/pcl-db/mongodb_tf_transformer.cpp | 4 ++++ src/plugins/perception/pcl-db/pcl_db_pipeline.h | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp b/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp index 61a389f..441ef20 100644 --- a/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp +++ b/src/plugins/perception/pcl-db/mongodb_tf_transformer.cpp @@ -132,7 +132,11 @@ MongoDBTransformer::restore(long long start_msec, long long end_msec, long long std::list<std::string> collections = mongodb_client_->getCollectionNames(database_); +#if __cplusplus >= 201103L std::unique_ptr<DBClientCursor> cursor; +#else + std::auto_ptr<DBClientCursor> cursor; +#endif BSONObj doc; std::list<std::string>::iterator c; for (c = collections.begin(); c != collections.end(); ++c) { diff --git a/src/plugins/perception/pcl-db/pcl_db_pipeline.h b/src/plugins/perception/pcl-db/pcl_db_pipeline.h index 1736bf2..74bd557 100644 --- a/src/plugins/perception/pcl-db/pcl_db_pipeline.h +++ b/src/plugins/perception/pcl-db/pcl_db_pipeline.h @@ -159,7 +159,11 @@ class PointCloudDBPipeline std::string fq_collection = database + "." + collection; try { for (unsigned int i = 0; i < num_clouds; ++i) { +#if __cplusplus >= 201103L std::unique_ptr<mongo::DBClientCursor> cursor = +#else + std::auto_ptr<mongo::DBClientCursor> cursor = +#endif mongodb_client_->query(fq_collection, QUERY("timestamp" << mongo::LTE << times[i] << mongo::GTE << (times[i] - cfg_pcl_age_tolerance_)) @@ -277,7 +281,11 @@ class PointCloudDBPipeline // retrieve point clouds for (unsigned int i = 0; i < num_clouds; ++i) { +#if __cplusplus >= 201103L std::unique_ptr<mongo::DBClientCursor> cursor = +#else + std::auto_ptr<mongo::DBClientCursor> cursor = +#endif mongodb_client_->query(database + "." + collection, QUERY("timestamp" << mongo::LTE << times[i] << mongo::GTE << (times[i] - cfg_pcl_age_tolerance_)) - *commit* 079b9159311610930ffb448f1270fc1e1595e108 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 17:24:30 2016 +0200 Subject: robotino: fix Boost version check src/plugins/robotino/Makefile | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) _Diff for modified files_: diff --git a/src/plugins/robotino/Makefile b/src/plugins/robotino/Makefile index a8fc65e..486d0a1 100644 --- a/src/plugins/robotino/Makefile +++ b/src/plugins/robotino/Makefile @@ -50,7 +50,7 @@ else WARN_TARGETS += warning_openrobotino endif -ifeq ($(HAVE_LIBUDEV)$(HAVE_ROBOTINO_DIRECT_BOOST_LIBS)$(call boost-version-atleast,1,0,48),111) +ifeq ($(HAVE_LIBUDEV)$(HAVE_ROBOTINO_DIRECT_BOOST_LIBS)$(call boost-version-atleast,1,48,0),111) HAVE_ROBOTINO_DIRECT = 1 CFLAGS += -DHAVE_ROBOTINO_DIRECT $(CFLAGS_CPP11) $(CFLAGS_LIBUDEV) $(CFLAGS_ROBOTINO_DIRECT_BOOST) @@ -65,7 +65,7 @@ else WARN_TARGETS_ROBOTINO_DIRECT_BOOST = $(foreach l,$(ROBOTINO_DIRECT_REQ_BOOST_LIBS),$(if $(call boost-have-lib,$l),, warning_robotino_direct_boost_$l)) WARN_TARGETS += $(WARN_TARGETS_ROBOTINO_DIRECT_BOOST) endif - ifneq ($(call boost-version-atleast,1,0,48),1) + ifneq ($(call boost-version-atleast,1,48,0),1) WARN_TARGETS += warning_old_boost endif endif @@ -138,13 +138,13 @@ warning_ros: warning_sensor_msgs: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TBROWN)Omitting Robotino Joints plugin$(TNORMAL) (ROS package sensor_msgs not found)" warning_libudev: - $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (libudev not available)" + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (libudev not available)" $(WARN_TARGETS_ROBOTINO_DIRECT_BOOST): warning_robotino_direct_boost_%: - $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (Boost library $* not found)" + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (Boost library $* not found)" warning_old_boost: - $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (Boost library too old, require at least 1.0.48, have $(BOOST_VERSION))" + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (Boost library too old, require at least 1.0.48, have $(call boost-version-parse,$(BOOST_VERSION)))" warning_cpp11: - $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct commnunication support$(TNORMAL) (C++11 support required)" + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TYELLOW)Omitting Robotino direct communication support$(TNORMAL) (C++11 support required)" endif include $(BUILDSYSDIR)/base.mk - *commit* 513b7351e8a023877aacd2f127b029951a20da45 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 17:54:24 2016 +0200 Subject: buildsys: do no longer install firevision header to subdir etc/buildsys/btypes/rules_sysinstall.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk index 895165e..3058bb5 100644 --- a/etc/buildsys/btypes/rules_sysinstall.mk +++ b/etc/buildsys/btypes/rules_sysinstall.mk @@ -21,7 +21,7 @@ $(foreach P,$(PLUGINS_all:$(PLUGINDIR)/%.so=%),$(eval INST_LIB_SUBDIR_$(call nam # 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 = firevision/$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))) ifdef __buildsys_lua_mk_ # Lua libraries are "inferred" and automatically installed to proper directory - *commit* 96c8a83311dad370563beb57fa9c117cb7954771 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 20:40:30 2016 +0200 Subject: buildsys: remove _ in header install dirs etc/buildsys/btypes/rules_sysinstall.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/etc/buildsys/btypes/rules_sysinstall.mk b/etc/buildsys/btypes/rules_sysinstall.mk index 3058bb5..9b38c21 100644 --- a/etc/buildsys/btypes/rules_sysinstall.mk +++ b/etc/buildsys/btypes/rules_sysinstall.mk @@ -20,7 +20,7 @@ include $(BUILDSYSDIR)/ext/gmsl $(foreach P,$(PLUGINS_all:$(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)/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))) ifdef __buildsys_lua_mk_ - *commit* 9f5d435494a0ee921119f8d59f84dedac119dca8 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 20:46:46 2016 +0200 Subject: eclipse_debugger: rename binary to ffeclipse-debugger src/tools/eclipse_debugger/Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/tools/eclipse_debugger/Makefile b/src/tools/eclipse_debugger/Makefile index 5ae78b2..145ca71 100644 --- a/src/tools/eclipse_debugger/Makefile +++ b/src/tools/eclipse_debugger/Makefile @@ -41,14 +41,14 @@ endif CFLAGS += $(CFLAGS_GUI) $(CFLAGS_GRAPHVIZ) LDFLAGS += $(LDFLAGS_GUI) $(LDFLAGS_GRAPHVIZ) -LIBS_eclipsedebugger = stdc++ m fawkescore fawkesutils fawkesnetcomm fawkesblackboard \ +LIBS_ffeclipse_debugger = stdc++ m fawkescore fawkesutils fawkesnetcomm fawkesblackboard \ fawkesguiutils fawkesinterface EclipseDebuggerInterface -OBJS_eclipsedebugger = main.o eclipse_debugger.o +OBJS_ffeclipse_debugger = main.o eclipse_debugger.o -OBJS_all = $(OBJS_eclipsedebugger) +OBJS_all = $(OBJS_ffeclipse_debugger) ifeq ($(HAVE_GUI),1) - BINS_gui = $(BINDIR)/eclipsedebugger + BINS_gui = $(BINDIR)/ffeclipse-debugger else WARN_TARGETS += warning_eclipsedebugger endif - *commit* bda907baa2a12aed7c19f70be7e6cd21e6cd8dd6 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 20:48:26 2016 +0200 Subject: lasergui: rename binary to fflasergui src/tools/lasergui/Makefile | 16 ++++++++-------- .../lasergui/{lasergui.txt => fflasergui.txt} | 0 2 files changed, 8 insertions(+), 8 deletions(-) _Diff for modified files_: diff --git a/src/tools/lasergui/Makefile b/src/tools/lasergui/Makefile index 00bd413..72703c4 100644 --- a/src/tools/lasergui/Makefile +++ b/src/tools/lasergui/Makefile @@ -21,7 +21,7 @@ include $(BUILDSYSDIR)/gui.mk CFLAGS += $(CFLAGS_GUI) LDFLAGS += $(LDFLAGS_GUI) -LIBS_lasergui = stdc++ m fawkescore fawkesutils fawkesblackboard \ +LIBS_fflasergui = stdc++ m fawkescore fawkesutils fawkesblackboard \ fawkesinterface fawkesnetcomm fawkesguiutils \ Position2DTrackInterface \ Laser360Interface Laser720Interface Laser1080Interface \ @@ -29,23 +29,23 @@ LIBS_lasergui = stdc++ m fawkescore fawkesutils fawkesblackboard \ ifeq ($(BUILD_TYPE),maemo) ifeq ($(HAVE_HILDON_GUI),1) - OBJS_lasergui = lasergui_hildon.o - LIBS_lasergui += osso + OBJS_fflasergui = lasergui_hildon.o + LIBS_fflasergui += osso BUILD_LASERGUI = $(HAVE_GUI) else WARN_TARGETS += warning_hildonmm endif else - OBJS_lasergui = lasergui.o + OBJS_fflasergui = lasergui.o BUILD_LASERGUI = $(HAVE_GUI) endif -OBJS_lasergui += laser_drawing_area.o visdisplay.o -OBJS_all = $(OBJS_lasergui) +OBJS_fflasergui += laser_drawing_area.o visdisplay.o +OBJS_all = $(OBJS_fflasergui) ifeq ($(BUILD_LASERGUI),1) - BINS_gui = $(BINDIR)/lasergui + BINS_gui = $(BINDIR)/fflasergui INST_RESDIRS = guis/lasergui - MANPAGES_all = $(MANDIR)/man1/lasergui.1 + MANPAGES_all = $(MANDIR)/man1/fflasergui.1 else WARN_TARGETS += warning_lasergui endif - *commit* b73935a418d4cd7186aa4cce010a48c234093463 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 16:05:07 2016 +0200 Subject: Merge remote-tracking branch 'origin/tneumann/colli-testing/obst-wider-cost-next-to-it' src/plugins/colli/search/obstacle.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) _Diff for modified files_: - *commit* f5da9780a8ef4841e649e337bbad01d83569c702 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 16:05:19 2016 +0200 Subject: Merge remote-tracking branch 'origin/tneumann/colli-testing/omni-drive-mode-no-ori-next-target' .../colli/drive_modes/forward_omni_drive_mode.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: - *commit* 784243be581f00c3e9682c39b212b2e26583fd67 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 22:45:15 2016 +0200 Subject: lasergui: fix typo in man page rule src/tools/lasergui/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/tools/lasergui/Makefile b/src/tools/lasergui/Makefile index 72703c4..fd109ec 100644 --- a/src/tools/lasergui/Makefile +++ b/src/tools/lasergui/Makefile @@ -45,7 +45,7 @@ OBJS_all = $(OBJS_fflasergui) ifeq ($(BUILD_LASERGUI),1) BINS_gui = $(BINDIR)/fflasergui INST_RESDIRS = guis/lasergui - MANPAGES_all = $(MANDIR)/man1/fflasergui.1 + MANPAGES_gui = $(MANDIR)/man1/fflasergui.1 else WARN_TARGETS += warning_lasergui endif - *commit* d56f7eb82ed76c6ae728dca96f2249c1ef93017b - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 23:01:12 2016 +0200 Subject: lasergui: update man page to reflect new name of tool src/tools/lasergui/fflasergui.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) _Diff for modified files_: diff --git a/src/tools/lasergui/fflasergui.txt b/src/tools/lasergui/fflasergui.txt index d6d912f..c78bba7 100644 --- a/src/tools/lasergui/fflasergui.txt +++ b/src/tools/lasergui/fflasergui.txt @@ -1,14 +1,14 @@ -lasergui(1) -=========== +fflasergui(1) +============= NAME ---- -lasergui - Watch laser scanner data remotely in real-time +fflasergui - Watch laser scanner data remotely in real-time SYNOPSIS -------- [verse] -*lasergui* +*fflasergui* DESCRIPTION ----------- - *commit* 83ed87d9f7580f66abb30130e67dce9a1fe07004 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 23:52:39 2016 +0200 Subject: openprs: specify module install path src/plugins/openprs/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/openprs/Makefile b/src/plugins/openprs/Makefile index 91b5112..87f9567 100644 --- a/src/plugins/openprs/Makefile +++ b/src/plugins/openprs/Makefile @@ -35,6 +35,10 @@ OBJS_openprs_mod_blackboard = mod_blackboard.o LIBS_openprs_mod_config = fawkescore fawkesutils fawkesconfig fawkesnetcomm OBJS_openprs_mod_config = mod_config.o +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) \ - *commit* 1c86ddf733c4e7448e9c65adb4f33736e88d1782 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 23:53:29 2016 +0200 Subject: openprs-agent: specify module install path src/plugins/openprs-agent/Makefile | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/openprs-agent/Makefile b/src/plugins/openprs-agent/Makefile index 0705f99..7383aa2 100644 --- a/src/plugins/openprs-agent/Makefile +++ b/src/plugins/openprs-agent/Makefile @@ -31,6 +31,10 @@ 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 +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) - *commit* 0b071737a417c4948f828ef855499fbf2a3a0dc5 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 5 23:59:09 2016 +0200 Subject: gazebo: specify install path for Gazebo plugins .../gazsim-localization/gazebo-plugin/Makefile | 2 ++ .../gazsim-robotino/gazebo-plugin-gyro/Makefile | 2 ++ .../gazsim-robotino/gazebo-plugin-motor/Makefile | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) _Diff for modified files_: diff --git a/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile b/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile index a3963e0..b619a7f 100644 --- a/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile +++ b/src/plugins/gazebo/gazsim-localization/gazebo-plugin/Makefile @@ -26,6 +26,8 @@ LIBDIRS_BASE += $(GAZEBO_LIBDIR) LIBS_gazebo_libgps = gazsim_msgs OBJS_gazebo_libgps = gps.o +INST_LIB_SUBDIR_gazebo_libgps = $(FFLIBSUBDIR) + OBJS_all = $(OBJS_gazebo_libgps) ifeq ($(HAVE_GAZEBO)$(HAVE_PROTOBUF),11) diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile index 2d9f392..a0e71de 100644 --- a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile +++ b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-gyro/Makefile @@ -26,6 +26,8 @@ LIBDIRS_BASE += $(GAZEBO_LIBDIR) LIBS_gazebo_libgyro = gazsim_msgs OBJS_gazebo_libgyro = gyro.o +INST_LIB_SUBDIR_gazebo_libgyro = $(FFLIBSUBDIR) + OBJS_all = $(OBJS_gazebo_libgyro) ifeq ($(HAVE_GAZEBO)$(HAVE_PROTOBUF),11) diff --git a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile index 262930b..95e20cb 100644 --- a/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile +++ b/src/plugins/gazebo/gazsim-robotino/gazebo-plugin-motor/Makefile @@ -26,6 +26,8 @@ LIBDIRS_BASE += $(GAZEBO_LIBDIR) LIBS_gazebo_libmotor = gazsim_msgs OBJS_gazebo_libmotor = motor.o +INST_LIB_SUBDIR_gazebo_libmotor = $(FFLIBSUBDIR) + OBJS_all = $(OBJS_gazebo_libmotor) ifeq ($(HAVE_GAZEBO)$(HAVE_PROTOBUF),11) - *commit* 44a73a504ccd2eeb5cf53e3a8eed86813e8b6722 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 16:06:17 2016 +0200 Subject: Merge remote-tracking branch 'origin/jrothe/plugin_generator' src/tools/{watchdog => plugin_generator}/Makefile | 31 +- src/tools/plugin_generator/ffgenplugin.txt | 63 ++++ src/tools/plugin_generator/main.cpp | 96 +++++ src/tools/plugin_generator/plugin_generator.cpp | 397 +++++++++++++++++++++ src/tools/plugin_generator/plugin_generator.h | 70 ++++ 5 files changed, 645 insertions(+), 12 deletions(-) _Diff for modified files_: - *commit* a8fb3e63389da0bef604d8e0b8b393c9e2d2c29e - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* 4fc34bc1a2b2db584ebb8ff0fbe9d773a6240fc5 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* 51afc9e414c0aa2814a0592dc3438ecd1c36b77e - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* 8264cbf5b340cfbb83553cd5b2f79764b11515a4 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* 5ad698cdca3c961c591fd64b0c8d5cb87d266ba3 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* 6dd1f3070423f077b44d2354eeb9e58638c34214 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* e294066c83ddbbc8c001b08865e18aee43ca81b1 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* 8393838cd2fd202b389ca3d8402d293952de9e58 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* 10cd5ba5d9f369e108e49cbe0be06966e30f5fc0 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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* d6dbef50be74a35de2f6f88e5c54959435640847 - - - - - - - - - - Author: Tim Niemueller <niemuel...@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 - *commit* 245dd89efc241749c3d84269eb1dd0a06878de56 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 16:07:18 2016 +0200 Subject: Merge remote-tracking branch 'origin/thofmann/recovery-of-cancelled-threads' src/libs/core/threading/thread.cpp | 2 ++ src/libs/core/threading/thread_list.cpp | 18 +++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) _Diff for modified files_: - *commit* 9ba190d1be45e1bb69b664105b02e7ee8ec41230 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Wed Sep 21 16:07:30 2016 +0200 Subject: Merge remote-tracking branch 'origin/sschoenitz/timeout' src/lua/fawkes/fsm/jumpstate.lua | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) _Diff for modified files_: - *commit* 588071131dcb023b3018c54958aea5a54561deb4 - - - - - - - - - - Author: Tim Niemueller <niemuel...@kbsg.rwth-aachen.de> Date: Mon Sep 19 13:49:21 2016 +0200 Subject: laser-lines: fix format string arguments src/plugins/laser-lines/line_info.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) _Diff for modified files_: diff --git a/src/plugins/laser-lines/line_info.cpp b/src/plugins/laser-lines/line_info.cpp index db36d9f..1ceb713 100644 --- a/src/plugins/laser-lines/line_info.cpp +++ b/src/plugins/laser-lines/line_info.cpp @@ -93,7 +93,7 @@ void TrackedLineInfo::update(LineInfo &linfo) transformer->transform_point(tracking_frame_id, bp_new, this->base_point_odom); } catch (fawkes::tf::TransformException &e) { logger->log_warn(plugin_name.c_str(), "Can't transform to %s. Attempting to track in %s.", - tracking_frame_id, input_frame_id); + tracking_frame_id.c_str(), input_frame_id.c_str()); this->base_point_odom = bp_new; } this->history.push_back(linfo); -- 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
