[Jderobot-admin] jderobot-r1185 - in trunk: . src/stable/interfaces/slice src/stable/interfaces/slice/jderobot
rocapal en jderobot.org
rocapal en jderobot.org
Lun Mar 10 15:53:39 CET 2014
Author: rocapal
Date: 2014-03-10 15:53:39 +0100 (Mon, 10 Mar 2014)
New Revision: 1185
Modified:
trunk/CMakeLists.txt
trunk/src/stable/interfaces/slice/CMakeLists.txt
trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt
trunk/src/stable/interfaces/slice/jderobot/body.ice
trunk/src/stable/interfaces/slice/jderobot/bodyencoders.ice
trunk/src/stable/interfaces/slice/jderobot/bodymotors.ice
trunk/src/stable/interfaces/slice/jderobot/bodymovements.ice
trunk/src/stable/interfaces/slice/jderobot/camera.ice
trunk/src/stable/interfaces/slice/jderobot/common.ice
trunk/src/stable/interfaces/slice/jderobot/encoders.ice
trunk/src/stable/interfaces/slice/jderobot/image.ice
trunk/src/stable/interfaces/slice/jderobot/laser.ice
trunk/src/stable/interfaces/slice/jderobot/motors.ice
trunk/src/stable/interfaces/slice/jderobot/naofollowball.ice
trunk/src/stable/interfaces/slice/jderobot/naomotions.ice
trunk/src/stable/interfaces/slice/jderobot/pose3d.ice
trunk/src/stable/interfaces/slice/jderobot/pose3dencoders.ice
trunk/src/stable/interfaces/slice/jderobot/pose3dmotors.ice
trunk/src/stable/interfaces/slice/jderobot/ptencoders.ice
trunk/src/stable/interfaces/slice/jderobot/ptmotors.ice
trunk/src/stable/interfaces/slice/jderobot/remoteCloud.ice
trunk/src/stable/interfaces/slice/jderobot/sonars.ice
trunk/src/stable/interfaces/slice/jderobot/varcolor.ice
trunk/src/stable/interfaces/slice/jderobot/wiimote.ice
Log:
#185 changed includes to generate py interfaces
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/CMakeLists.txt 2014-03-10 14:53:39 UTC (rev 1185)
@@ -5,7 +5,7 @@
# ENV VARS
SET(gladedir ./)
SET( DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Deps) # Directorio donde se encuentran las dependencias
-SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp) # Directorio con las interfaces ICE en C++
+SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp/jderobot ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp/) # Directorio con las interfaces ICE en C++
SET( LIBS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/libs) # Directorio donde se encuentran las librerias propias de jderobot
SET( SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/slice) # Directorio donde se encuentran las interfaces ICE
SET( LIBS_NEEDED colorspaces jderobotutil progeo pioneer fuzzylib visionlib parallelIce ) # Librerias de las que depende el componente
@@ -103,12 +103,14 @@
#include(${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/CMakeLists.txt)
+
#file(READ ${CMAKE_CURRENT_SOURCE_DIR}/jderobot.cfg contents)
# START RECURSIVE
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/src)
+
###################
# #
# INSTALL #
Modified: trunk/src/stable/interfaces/slice/CMakeLists.txt
===================================================================
--- trunk/src/stable/interfaces/slice/CMakeLists.txt 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/CMakeLists.txt 2014-03-10 14:53:39 UTC (rev 1185)
@@ -2,6 +2,6 @@
string(COMPARE EQUAL ${interfaces_exists} "interfaces_exists-NOTFOUND" result)
IF(result)
add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/jderobot ${CMAKE_CURRENT_SOURCE_DIR}/../cpp/jderobot)
- MESSAGE ( "*** Creating CPP interfaces")
+ MESSAGE (STATUS "Creating CPP interfaces")
ENDIF()
Modified: trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/CMakeLists.txt 2014-03-10 14:53:39 UTC (rev 1185)
@@ -1,12 +1,8 @@
-#FIND_LIBRARY(ice_lib Ice)
-#FIND_PATH(ice_path Ice)
+# Check the ice binaries
+set( SLICE2PY_COMMAND /usr/bin/slice2py)
-#IF(NOT ice_path)
-# MESSAGE(FATAL_ERROR "** Librería de Ice no encontrada")
-#ENDIF()
-
set( CMAKE_CXX_FLAGS "-lIce -lIceUtil -lIceGrid -lIceBox -lIceStorm -lIceStormService" ) # Opciones para el compilador
FILE(GLOB ICE_FILES "*.ice")
@@ -14,22 +10,31 @@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../../cpp/
- ${CMAKE_CURRENT_SOURCE_DIR}/../../cpp/jderobot
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../cpp/jderobot/
${ice_path_storm}
)
+
FOREACH(currentSourceFile ${ICE_FILES})
string(REGEX REPLACE ".*/(.*)" "\\1" new_source ${currentSourceFile})
string(REGEX REPLACE ".*/(.*).ice" "\\1.cpp" new_source1 ${currentSourceFile})
string(REGEX REPLACE ".*/(.*).ice" "\\1.h" new_source2 ${currentSourceFile})
+ string(REGEX REPLACE ".*/(.*).ice" "\\1.py" SOURCE_PY ${currentSourceFile})
string(REGEX REPLACE ".*/(.*).ice" "\\1" new_source_name ${currentSourceFile})
LIST(APPEND SOURCE_FILES ${new_source1})
LIST(APPEND SOURCE_FILES ${new_source2})
+
+ #MESSAGE(STATUS, "source1= ${new_source1} source2= ${new_source2} source=${new_source}")
+
+ # C++
add_custom_command(OUTPUT ${new_source1} ${new_source2}
- COMMAND slice2cpp -I${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/${new_source}
+ COMMAND slice2cpp -I${CMAKE_CURRENT_SOURCE_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${new_source}
)
- #add_library (${new_source_name} STATIC ${new_source1} ${new_soure_name2})
+
+ # Python
+ execute_process(COMMAND ${SLICE2PY_COMMAND} -I${CMAKE_CURRENT_SOURCE_DIR}/.. -I${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${new_source} --output-dir ${CMAKE_CURRENT_SOURCE_DIR}/../../python/jderobot)
+
ENDFOREACH(currentSourceFile)
Modified: trunk/src/stable/interfaces/slice/jderobot/body.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/body.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/body.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -21,7 +21,7 @@
#ifndef BODY_ICE
#define BODY_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/bodyencoders.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/bodyencoders.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/bodyencoders.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -21,8 +21,8 @@
#ifndef BODYENCODERS_ICE
#define BODYENCODERS_ICE
-#include <jderobot/common.ice>
-#include <jderobot/body.ice>
+#include <common.ice>
+#include <body.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/bodymotors.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/bodymotors.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/bodymotors.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -21,8 +21,8 @@
#ifndef BODYMOTORS_ICE
#define BODYMOTORS_ICE
-#include <jderobot/common.ice>
-#include <jderobot/body.ice>
+#include <common.ice>
+#include <body.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/bodymovements.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/bodymovements.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/bodymovements.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -21,8 +21,8 @@
#ifndef BODYMOVEMENTS_ICE
#define BODYMOVEMENTS_ICE
-#include <jderobot/common.ice>
-#include <jderobot/body.ice>
+#include <common.ice>
+#include <body.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/camera.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/camera.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/camera.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -24,7 +24,7 @@
#define CAMERA_ICE
-#include <jderobot/image.ice>
+#include <image.ice>
module jderobot{
/**
Modified: trunk/src/stable/interfaces/slice/jderobot/common.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/common.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/common.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -1,9 +1,9 @@
#ifndef COMMON_ICE
#define COMMON_ICE
-#include <jderobot/datetime.ice>
-#include <jderobot/exceptions.ice>
-#include <jderobot/containers.ice>
+#include <datetime.ice>
+#include <exceptions.ice>
+#include <containers.ice>
module jderobot{
}; /*module*/
Modified: trunk/src/stable/interfaces/slice/jderobot/encoders.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/encoders.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/encoders.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef ENCODERS_ICE
#define ENCODERS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/image.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/image.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/image.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -23,7 +23,7 @@
#ifndef IMAGE_ICE
#define IMAGE_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/laser.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/laser.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/laser.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef LASER_ICE
#define LASER_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/motors.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/motors.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/motors.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef MOTORS_ICE
#define MOTORS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/naofollowball.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/naofollowball.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/naofollowball.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef NAOFOLLOWBALL_ICE
#define NAOFOLLOWBALL_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot {
Modified: trunk/src/stable/interfaces/slice/jderobot/naomotions.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/naomotions.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/naomotions.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef NAOMOTIONS_ICE
#define NAOMOTIONS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot {
Modified: trunk/src/stable/interfaces/slice/jderobot/pose3d.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/pose3d.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/pose3d.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef POSE3D_ICE
#define POSE3D_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
/**
Modified: trunk/src/stable/interfaces/slice/jderobot/pose3dencoders.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/pose3dencoders.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/pose3dencoders.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -23,7 +23,7 @@
#ifndef POSE3DENCODERS_ICE
#define POSE3DENCODERS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/pose3dmotors.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/pose3dmotors.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/pose3dmotors.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef POSE3DMOTORS_ICE
#define POSE3DMOTORS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/ptencoders.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/ptencoders.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/ptencoders.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -23,7 +23,7 @@
#ifndef PTENCODERS_ICE
#define PTENCODERS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/ptmotors.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/ptmotors.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/ptmotors.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef PTMOTORS_ICE
#define PTMOTORS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/remoteCloud.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/remoteCloud.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/remoteCloud.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -20,7 +20,7 @@
#ifndef REMOTECLOUD_ICE
#define REMOTECLOUD_ICE
-#include <jderobot/pointcloud.ice>
+#include <pointcloud.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/sonars.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/sonars.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/sonars.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef SONARS_ICE
#define SONARS_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/varcolor.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/varcolor.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/varcolor.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -2,7 +2,7 @@
#define VARCOLOR_ICE
-#include <jderobot/image.ice>
+#include <image.ice>
module jderobot{
Modified: trunk/src/stable/interfaces/slice/jderobot/wiimote.ice
===================================================================
--- trunk/src/stable/interfaces/slice/jderobot/wiimote.ice 2014-03-10 13:00:44 UTC (rev 1184)
+++ trunk/src/stable/interfaces/slice/jderobot/wiimote.ice 2014-03-10 14:53:39 UTC (rev 1185)
@@ -22,7 +22,7 @@
#ifndef WIIMOTE_ICE
#define WIIMOTE_ICE
-#include <jderobot/common.ice>
+#include <common.ice>
module jderobot{
More information about the Jderobot-admin
mailing list