This commit is contained in:
2015-05-09 17:13:01 +02:00
parent 9c132de686
commit 4e2fe033c9
145 changed files with 7213 additions and 1252 deletions
+3 -3
View File
@@ -8,8 +8,8 @@ find_package(catkin REQUIRED COMPONENTS
hos_core_types
hos_cosgi_devicerepository
hos_cosgi_launcher
hos_cosgi_rulesengine
hos_cosgi_rulesexecution_python
hos_cosgi_ruleengine
hos_cosgi_scripting_python
hos_philips_hue
)
@@ -85,7 +85,7 @@ find_package(catkin REQUIRED COMPONENTS
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES hos_launch
# CATKIN_DEPENDS hos_core_types hos_cosgi_devicerepository hos_cosgi_launcher hos_cosgi_rulesengine hos_cosgi_rulesexecution_python hos_philips_hue
# CATKIN_DEPENDS hos_core_types hos_cosgi_devicerepository hos_cosgi_launcher hos_cosgi_ruleengine hos_cosgi_ruleexecution_python hos_philips_hue
# DEPENDS system_lib
)
+4 -4
View File
@@ -1,6 +1,6 @@
<launch>
<group ns="/hos/rules/rulesengine0">
<param name="rulepkg01" textfile="$(find hos_cosgi_rulesengine)/test/rulepkg01.json"/>
<group ns="/hos/rules/ruleengine0">
<param name="rulepkg01" textfile="$(find hos_cosgi_ruleengine)/test/rulepkg01.json"/>
</group>
<node name="cosgi_devicerepository" pkg="hos_cosgi_launcher" type="hos_cosgi_launcher" output="screen">
<param name="autostart_bundles"
@@ -9,8 +9,8 @@
$(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/log_writer_syslog.zip
$(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/shell.zip
$(find hos_cosgi_launcher)/../../devel_isolated/hos_celix/share/celix/bundles/shell_tui.zip
$(find hos_cosgi_launcher)/../../build_isolated/hos_cosgi_rulesexecution_python/hos_cosgi_rulesexecution_python.zip
$(find hos_cosgi_launcher)/../../build_isolated/hos_cosgi_rulesengine/hos_cosgi_rulesengine.zip
$(find hos_cosgi_launcher)/../../build_isolated/hos_cosgi_scripting_python/hos_cosgi_scripting_python.zip
$(find hos_cosgi_launcher)/../../build_isolated/hos_cosgi_ruleengine/hos_cosgi_ruleengine.zip
$(find hos_cosgi_launcher)/../../build_isolated/hos_cosgi_devicerepository/hos_cosgi_devicerepository.zip"/>
</node>
</launch>
+4 -4
View File
@@ -43,14 +43,14 @@
<build_depend>hos_core_types</build_depend>
<build_depend>hos_cosgi_devicerepository</build_depend>
<build_depend>hos_cosgi_launcher</build_depend>
<build_depend>hos_cosgi_rulesengine</build_depend>
<build_depend>hos_cosgi_rulesexecution_python</build_depend>
<build_depend>hos_cosgi_ruleengine</build_depend>
<build_depend>hos_cosgi_scripting_python</build_depend>
<build_depend>hos_philips_hue</build_depend>
<run_depend>hos_core_types</run_depend>
<run_depend>hos_cosgi_devicerepository</run_depend>
<run_depend>hos_cosgi_launcher</run_depend>
<run_depend>hos_cosgi_rulesengine</run_depend>
<run_depend>hos_cosgi_rulesexecution_python</run_depend>
<run_depend>hos_cosgi_ruleengine</run_depend>
<run_depend>hos_cosgi_scripting_python</run_depend>
<run_depend>hos_philips_hue</run_depend>