Merge branch 'toolchain-2.9' into cmake-disable-orogen

orocos-toolchain · Nov 29, 2021 · 17e610c · 17e610c
2 parents b8b7b2f + e055820
commit 17e610c
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 13 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10
diff --git a/.travis.yml b/.travis.yml
@@ -63,8 +63,15 @@ before_install:
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       brew update
       brew reinstall boost cmake ccache gnu-getopt readline omniorb
-      brew link --force gnu-getopt
-      brew link --force readline
+
+      # gnu-getopt is keg-only and newer HomeBrew versions refuse to link it.
+      #brew link --force gnu-getopt
+      export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
+
+      # readline is keg-only and newer HomeBrew versions refuse to link it.
+      #brew link --force readline
+      export CMAKE_PREFIX_PATH="/usr/local/opt/readline"
+
       export PATH="/use/local/opt/ccache/libexec:$PATH"
     fi
 

diff --git a/ocl b/ocl
diff --git a/orocos_toolchain/package.xml b/orocos_toolchain/package.xml
@@ -6,15 +6,15 @@
   <description>
     This metapackage provides Orocos RTT and OCL and dependencies.
   </description>
-  <license>GPL v2 + linking exception<license>
-  <licence>LGPL-2.1</license>
+  <license>GPL v2 + linking exception</license>
+  <license>LGPL-2.1</license>
   <maintainer email="[email protected]">Orocos Developers</maintainer>
 
-  <buildtool_depend>catkin</buildtool_depend> <!-- optional -->
+  <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend> <!-- optional -->
 
-  <depend>log4cpp</depend>
-  <depend>ocl</depend>
-  <depend>rtt</depend>
+  <exec_depend>log4cpp</exec_depend>
+  <exec_depend>ocl</exec_depend>
+  <exec_depend>rtt</exec_depend>
 
   <export>
     <metapackage/>

diff --git a/orogen b/orogen
diff --git a/rtt b/rtt
diff --git a/typelib b/typelib
diff --git a/utilrb b/utilrb
+3 −3		bin/cdeployer.cpp
+1 −3		bin/deployer-corba.cpp
+2 −2		bin/deployer.cpp
+1 −1		logging/Appender.cpp
+1 −1		logging/FileAppender.cpp
+3 −3		logging/LoggingService.cpp
+1 −1		logging/OstreamAppender.cpp
+1 −1		logging/RollingFileAppender.cpp
+22 −22		lua/rtt.cpp
+15 −17		manifest.xml
+1 −1		orocos-ocl-config.cmake
+16 −23		package.xml
+4 −0		reporting/ReportingComponent.cpp
+1 −1		reporting/TcpReporting.cpp
+3 −3		reporting/socket.cpp
+3 −3		reporting/socket.hpp
+4 −4		taskbrowser/TaskBrowser.cpp
+1 −1		UseOROCOS-RTT-helpers.cmake
+15 −17		manifest.xml
+12 −16		package.xml
+2 −0		rtt/Activity.cpp
+0 −5		rtt/Activity.hpp
+17 −0		rtt/CMakeLists.txt
+14 −47		rtt/ExecutionEngine.cpp
+0 −31		rtt/ExecutionEngine.hpp
+0 −5		rtt/Handle.cpp
+0 −5		rtt/Handle.hpp
+3 −1		rtt/InputPort.hpp
+7 −2		rtt/OutputPort.hpp
+26 −1		rtt/Property.hpp
+9 −7		rtt/PropertyBag.cpp
+4 −3		rtt/PropertyBag.hpp
+0 −5		rtt/SendHandle.hpp
+1 −1		rtt/TaskContext.cpp
+10 −1		rtt/base/InputPortInterface.cpp
+1 −0		rtt/base/InputPortInterface.hpp
+7 −0		rtt/base/OutputPortInterface.cpp
+3 −0		rtt/base/OutputPortInterface.hpp
+16 −3		rtt/base/PortInterface.cpp
+11 −1		rtt/base/PortInterface.hpp
+18 −8		rtt/base/TaskCore.cpp
+6 −1		rtt/base/TaskCore.hpp
+60 −30		rtt/extras/FileDescriptorActivity.cpp
+46 −8		rtt/extras/FileDescriptorActivity.hpp
+33 −15		rtt/extras/SlaveActivity.cpp
+3 −2		rtt/extras/SlaveActivity.hpp
+6 −7		rtt/marsh/PropertyBagIntrospector.cpp
+12 −14		rtt/marsh/TinyDemarshaller.cpp
+9 −0		rtt/os/Thread.cpp
+18 −0		rtt/os/gnulinux/traces/CMakeLists.txt
+3 −0		rtt/os/gnulinux/traces/lttng_ust.c
+98 −0		rtt/os/gnulinux/traces/lttng_ust.h
+14 −0		rtt/os/gnulinux/traces/lttng_ust.tp
+1 −1		rtt/os/oro_gcc/oro_arch.h
+4 −0		rtt/os/startstop.cpp
+4 −3		rtt/os/tlsf/tlsf.c
+13 −0		rtt/os/traces.h
+15 −1		rtt/scripting/StateGraphParser.cpp
+18 −20		rtt/scripting/parse_exception.hpp
+2 −2		rtt/transports/corba/RemoteChannelElement.hpp
+2 −2		rtt/types/PropertyDecomposition.cpp
+10 −10		tests/datasource_test.cpp
+1 −0		tests/ports_test.cpp
+20 −3		tests/specialized_activities.cpp
+4 −0		tests/taskthread_fd_test.cpp
+4 −0		tests/unit.hpp
+5 −14		CMakeLists.txt
+1 −1		bindings/ruby/ext/convert.cc
+8 −0		bindings/ruby/ext/memory.cc
+13 −13		bindings/ruby/ext/registry.cc
+9 −9		bindings/ruby/ext/specialized_types.cc
+1 −1		bindings/ruby/ext/typelib.hh
+5 −2		bindings/ruby/ext/typelib_ruby.cc
+1 −1		bindings/ruby/ext/value.cc
+5 −2		bindings/ruby/lib/typelib.rb
+13 −6		bindings/ruby/lib/typelib/accessor.rb
+3 −6		bindings/ruby/lib/typelib/compound_type.rb
+4 −4		bindings/ruby/lib/typelib/cxx.rb
+31 −12		bindings/ruby/lib/typelib/gccxml.rb
+4 −12		bindings/ruby/lib/typelib/registry.rb
+6 −0		bindings/ruby/lib/typelib/type.rb
+0 −5		env-hooks/00.typelib.sh.in
+2 −1		lang/csupport/containers.cc
+38 −31		lang/idl/export.cc
+2 −2		lang/tlb/import.cc
+2 −1		manifest.xml
+13 −25		package.xml
+5 −1		test/CMakeLists.txt
+29 −0		test/data/test_underscores.h
+25 −0		test/data/test_underscores.idl
+20 −0		test/ruby/container_memory_leak_on_resize.rb
+5 −0		test/ruby/cxx_common_tests.rb
+1 −1		test/ruby/cxx_import_tests/documentation_metadata_tags.h
+26 −0		test/ruby/cxx_import_tests/empty_base_class.hh
+44 −0		test/ruby/cxx_import_tests/empty_base_class.tlb
+10 −0		test/ruby/cxx_import_tests/relative_includes.hh
+1 −1		test/ruby/cxx_tlbgen.in
+42 −0		test/ruby/test_compound_type.rb
+7 −0		test/ruby/test_container_type.rb
+0 −1		test/ruby/test_cxx.rb
+49 −0		test/ruby/test_cxx_castxml.rb
+4 −1		test/ruby/test_idl.rb
+3 −3		test/ruby/test_numeric_type.rb
+2 −2		test/test_containers.cc
+7 −2		test/test_display.cc
+2 −2		test/test_lang_tlb.cc
+76 −9		test/test_marshalling.cc
+27 −10		test/test_memory_layout.cc
+1 −1		test/test_model.cc
+1 −1		test/test_plugin.cc
+2 −2		test/test_registry.cc
+1 −1		test/test_typebuilder.cc
+5 −5		test/test_value.cc
+16 −2		test/test_value_ops_init.cc
+1 −1		test/testsuite.cc
+1 −1		typelib/csvoutput.cc
+4 −4		typelib/endian_swap.hh
+13 −4		typelib/memory_layout.cc
+8 −5		typelib/pluginmanager.cc
+2 −2		typelib/registry.cc
+2 −2		typelib/typebuilder.cc
+1 −1		typelib/typemodel.cc
+9 −1		typelib/value_ops.cc
+9 −0		typelib/value_ops.hh
+6 −6		.travis.yml
+37 −25		lib/utilrb/module/dsl_attribute.rb
+15 −3		lib/utilrb/object/address.rb
+101 −19		lib/utilrb/pkgconfig.rb
+5 −0		test/data/test_pc_sysrootdir.pc
+4 −0		test/data/test_pcfiledir.pc
+27 −0		test/test_module.rb
+8 −6		test/test_object.rb
+29 −5		test/test_pkgconfig.rb