[Jderobot-admin] jderobot-r1187 - trunk

[rocapal en jderobot.org]

Author: rocapal
Date: 2014-03-10 16:31:26 +0100 (Mon, 10 Mar 2014)
New Revision: 1187

Modified:
   trunk/CMakeLists.txt
   trunk/clean_repository
Log:
#185 installed correctly the __init__ file


Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2014-03-10 15:04:59 UTC (rev 1186)
+++ trunk/CMakeLists.txt	2014-03-10 15:31:26 UTC (rev 1187)
@@ -119,13 +119,14 @@
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/cpp/jderobot/libJderobotInterfaces.so DESTINATION /usr/local/lib/jderobot)
 
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/python/jderobot/jderobot/__init__.py DESTINATION /usr/lib/python2.7/jderobot/)
+
 # Install python files
 FILE(GLOB_RECURSE HEADERS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/python/jderobot/*py)
 FOREACH(header ${HEADERS_FILES})
 	INSTALL(FILES ${header} DESTINATION /usr/lib/python2.7/jderobot/)
 ENDFOREACH(header)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/interfaces/python/jderobot/jderobot/__init__.py DESTINATION /usr/lib/python2.7/jderobot/)
 
 # install all libraries 
 FILE(GLOB LIB_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/stable/libs/*/*.so*)

Modified: trunk/clean_repository
===================================================================
--- trunk/clean_repository	2014-03-10 15:04:59 UTC (rev 1186)
+++ trunk/clean_repository	2014-03-10 15:31:26 UTC (rev 1187)
@@ -30,6 +30,7 @@
 done
 
 rm -f src/stable/interfaces/cpp/jderobot/*
+rm -rf src/stable/interfaces/python/jderobot/*
 
 mivar=`du -a | grep "cmake_uninstall.cmake$" | awk '{print $2}'`