[Personalrobots-commit] SF.net SVN: personalrobots:[6631] pkg/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6631
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=6631&view=rev
Author:   rdiankov
Date:     2008-11-13 00:27:26 +0000 (Thu, 13 Nov 2008)

Log Message:
-----------
fixed boost-regex dependency so at least it does not error anymore, added necessary packages for openrave to compile correctly

Modified Paths:
--------------
    pkg/trunk/3rdparty/openrave/Makefile
    pkg/trunk/3rdparty/openrave/manifest.xml
    pkg/trunk/robot_descriptions/openrave_robot_description/CMakeLists.txt
    pkg/trunk/robot_descriptions/wg_robot_description_parser/CMakeLists.txt
    pkg/trunk/util/resource_locator/CMakeLists.txt
    pkg/trunk/util/resource_locator/manifest.xml

Added Paths:
-----------
    pkg/trunk/3rdparty/soqt/
    pkg/trunk/3rdparty/soqt/Makefile
    pkg/trunk/3rdparty/soqt/manifest.xml

Modified: pkg/trunk/3rdparty/openrave/Makefile
===================================================================

--- pkg/trunk/3rdparty/openrave/Makefile	2008-11-13 00:27:25 UTC (rev 6630)
+++ pkg/trunk/3rdparty/openrave/Makefile	2008-11-13 00:27:26 UTC (rev 6631)
@@ -9,7 +9,7 @@
 build: SVN_UP openrave
 
 openrave: $(SVN_DIR)
-	cd $(SVN_DIR) && svn up && make prefix=$(PWD) && make install
+	@cd $(SVN_DIR) && PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && svn up && make prefix=$(PWD) && make install
 
 clean:
 	make -C $(SVN_DIR) clean

Modified: pkg/trunk/3rdparty/openrave/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/openrave/manifest.xml	2008-11-13 00:27:25 UTC (rev 6630)
+++ pkg/trunk/3rdparty/openrave/manifest.xml	2008-11-13 00:27:26 UTC (rev 6631)
@@ -6,5 +6,7 @@
   <export>
     <cpp lflags="-Wl,-rpath,${prefix}/lib `${prefix}/bin/openrave-config --libs`" cflags="`${prefix}/bin/openrave-config --cflags`"/>
   </export>
+  <depend package="soqt"/>
+  <depend package="opende"/>
   <versioncontrol type="svn" url="https://openrave.svn.sourceforge.net/svnroot/openrave"/>
 </package>

Added: pkg/trunk/3rdparty/soqt/Makefile
===================================================================
--- pkg/trunk/3rdparty/soqt/Makefile	                        (rev 0)
+++ pkg/trunk/3rdparty/soqt/Makefile	2008-11-13 00:27:26 UTC (rev 6631)
@@ -0,0 +1,27 @@
+all: soqt
+
+TARBALL = SoQt-1.4.1.tar.gz
+TARBALL_URL = http://ftp.coin3d.org/coin/src/all/SoQt-1.4.1.tar.gz
+SOURCE_DIR = SoQt-1.4.1
+#MD5SUM_FILE = opencv-1.0.0.tar.gz.md5sum
+UNPACK_CMD = tar xzf
+include $(shell rospack find mk)/download_unpack.mk
+
+build: soqt
+
+configured:
+	cd $(SOURCE_DIR) && ./configure --prefix=$(PWD)
+	touch configured
+
+soqt: configured
+	cd $(SOURCE_DIR) && make && make install
+
+clean:
+	rm -rf $(SOURCE_DIR)
+	rm -rf configured
+
+wipe: clean
+	rm -rf $(TARBALL)
+
+$(TARBALL):
+	wget $(TARBALL_URL)

Added: pkg/trunk/3rdparty/soqt/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/soqt/manifest.xml	                        (rev 0)
+++ pkg/trunk/3rdparty/soqt/manifest.xml	2008-11-13 00:27:26 UTC (rev 6631)
@@ -0,0 +1,17 @@
+<package>
+  <description brief="SoQt">
+    This package contains a Coin3D/Qt GUI interface.
+  </description>
+  <author>See web page for a full credits llist.</author>
+  <license url="http://www.coin3d.org/licensing/index_html#free-edition-gpl">GPL</license>
+  <url>http://www.coin3d.org/</url>
+  <export>
+    <cpp lflags="-Wl,-rpath,${prefix}/lib `${prefix}/bin/soqt-config --libs`" cflags="`${prefix}/bin/soqt-config --cppflags`"/>
+    <doxymaker external="http://developer.nvidia.com/page/documentation.html"/>
+  </export>
+  <sysdepend os="ubuntu" version="8.04-hardy" package="libcoin40-dev"/>
+  <sysdepend os="ubuntu" version="8.04-hardy" package="qt4-dev-tools"/>
+  <sysdepend os="ubuntu" version="8.04-hardy" package="libqt4-dev"/>
+  <sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
+  <sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
+</package>

Modified: pkg/trunk/robot_descriptions/openrave_robot_description/CMakeLists.txt
===================================================================
--- pkg/trunk/robot_descriptions/openrave_robot_description/CMakeLists.txt	2008-11-13 00:27:25 UTC (rev 6630)
+++ pkg/trunk/robot_descriptions/openrave_robot_description/CMakeLists.txt	2008-11-13 00:27:26 UTC (rev 6631)
@@ -8,6 +8,15 @@
 find_ros_package(openrave_robot_description)
 get_target_property(urdf2openrave_exe urdf2openrave LOCATION)
 
+find_package( Boost COMPONENTS regex )
+if( NOT ${Boost_regex_FOUND} )
+    message(SEND_ERROR "could not find boost-regex")  
+endif()
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+target_link_libraries(urdf2openrave ${Boost_LIBRARIES})
+
 # process all urdf files
 set(PR2_OUTPUT ${openrave_robot_description_PACKAGE_PATH}/robots/pr2.robot.xml)
 set(PR2_INPUT ${wg_robot_description_PACKAGE_PATH}/pr2/pr2.xml)

Modified: pkg/trunk/robot_descriptions/wg_robot_description_parser/CMakeLists.txt
===================================================================
--- pkg/trunk/robot_descriptions/wg_robot_description_parser/CMakeLists.txt	2008-11-13 00:27:25 UTC (rev 6630)
+++ pkg/trunk/robot_descriptions/wg_robot_description_parser/CMakeLists.txt	2008-11-13 00:27:26 UTC (rev 6631)
@@ -6,15 +6,6 @@
 rospack_add_library(URDF src/URDF.cpp src/parser.cpp)
 rospack_add_compile_flags(URDF -Wextra)
 
-find_package( Boost COMPONENTS regex )
-if( NOT ${Boost_regex_FOUND} )
-    message(SEND_ERROR "could not find boost-regex")  
-endif()
-
-include_directories(${Boost_INCLUDE_DIRS})
-link_directories(${Boost_LIBRARY_DIRS})
-target_link_libraries(URDF ${Boost_LIBRARIES})
-
 rospack_add_executable(parse src/parse.cpp)
 target_link_libraries(parse URDF)
 

Modified: pkg/trunk/util/resource_locator/CMakeLists.txt
===================================================================
--- pkg/trunk/util/resource_locator/CMakeLists.txt	2008-11-13 00:27:25 UTC (rev 6630)
+++ pkg/trunk/util/resource_locator/CMakeLists.txt	2008-11-13 00:27:26 UTC (rev 6631)
@@ -2,3 +2,13 @@
 include(rosbuild)
 rospack(resource_locator)
 rospack_add_library(resource_locator src/reslocator.cpp)
+set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
+
+find_package( Boost COMPONENTS regex )
+if( NOT ${Boost_regex_FOUND} )
+    message(SEND_ERROR "could not find boost-regex")  
+endif()
+
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
+target_link_libraries(resource_locator ${Boost_LIBRARIES})

Modified: pkg/trunk/util/resource_locator/manifest.xml
===================================================================
--- pkg/trunk/util/resource_locator/manifest.xml	2008-11-13 00:27:25 UTC (rev 6630)
+++ pkg/trunk/util/resource_locator/manifest.xml	2008-11-13 00:27:26 UTC (rev 6631)
@@ -14,6 +14,7 @@
     <cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lresource_locator"/>
   </export>
 
+  <sysdepend os="ubuntu" version="7.04-gutsy" package="libboost-regex-dev"/>  
   <sysdepend os="ubuntu" version="8.04-hardy" package="libboost-regex-dev"/>  
   
 </package>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


