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

[<rdi...@us...>]

Revision: 8406
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=8406&view=rev
Author:   rdiankov
Date:     2008-12-19 06:26:26 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
openrave parallel builds now

Modified Paths:
--------------
    pkg/trunk/3rdparty/openrave/Makefile
    pkg/trunk/openrave_planning/ormanipulation/octave/testscene.m
    pkg/trunk/openrave_planning/ormanipulation/openrave_sensing.ros.xml

Modified: pkg/trunk/3rdparty/openrave/Makefile
===================================================================
--- pkg/trunk/3rdparty/openrave/Makefile	2008-12-19 06:15:52 UTC (rev 8405)
+++ pkg/trunk/3rdparty/openrave/Makefile	2008-12-19 06:26:26 UTC (rev 8406)
@@ -2,7 +2,7 @@
 
 SVN_DIR = openrave_svn
 # Should really specify a revision
-SVN_REVISION = -r 573
+SVN_REVISION = -r 574
 SVN_URL = https://openrave.svn.sourceforge.net/svnroot/openrave
 include $(shell rospack find mk)/svn_checkout.mk
 
@@ -11,7 +11,7 @@
 build: SVN_UP openrave
 
 openrave: SVN_UP
-	@cd $(SVN_DIR) && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && export CPATH="$(shell rospack find bullet)/include" && export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && export BOOST_ROOT=$(shell rospack find boost)/boost && mkdir -p build && cd build && $(shell rospack find cmake)/cmake/bin/cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release .. && make install
+	@cd $(SVN_DIR) && export PATH="$(shell rospack find soqt)/bin:$(shell rospack find opende)/opende/bin:$(PATH)" && export CPATH="$(shell rospack find bullet)/include" && export LD_LIBRARY_PATH=$(shell rospack find bullet)/lib:$(LD_LIBRARY_PATH) && export BOOST_ROOT=$(shell rospack find boost)/boost && mkdir -p build && cd build && $(shell rospack find cmake)/cmake/bin/cmake -DCMAKE_INSTALL_PREFIX=$(PWD) -DCMAKE_BUILD_TYPE=Release .. && make $(PARALLEL_JOBS) install
 
 clean:
 	make -C $(SVN_DIR) clean

Modified: pkg/trunk/openrave_planning/ormanipulation/octave/testscene.m
===================================================================
--- pkg/trunk/openrave_planning/ormanipulation/octave/testscene.m	2008-12-19 06:15:52 UTC (rev 8405)
+++ pkg/trunk/openrave_planning/ormanipulation/octave/testscene.m	2008-12-19 06:26:26 UTC (rev 8406)
@@ -1,11 +1,10 @@
 #!/usr/bin/env octave
 global probs
 
-cd('octave')
-
+cd(getenv('OCTAVE_WORKINGDIR'));
 startup;
 orEnvLoadScene('',1); % reset the scene
-orEnvSetOptions('debug debug');
+#orEnvSetOptions('debug debug');
 
 %% create problem before everything so resources can init!
 probs.rosplan = orEnvCreateProblem('ROSPlanningProblem');

Modified: pkg/trunk/openrave_planning/ormanipulation/openrave_sensing.ros.xml
===================================================================
--- pkg/trunk/openrave_planning/ormanipulation/openrave_sensing.ros.xml	2008-12-19 06:15:52 UTC (rev 8405)
+++ pkg/trunk/openrave_planning/ormanipulation/openrave_sensing.ros.xml	2008-12-19 06:26:26 UTC (rev 8406)
@@ -3,5 +3,7 @@
   <include file="$(find ormanipulation)/startopenrave.ros.xml"/>
   <node pkg="phase_space" type="phase_space_node"/>
   <!-- launch octave scripts to start the openrave client -->
-  <node pkg="ormanipulation" type="testscene.m"/>
+  <node pkg="ormanipulation" type="testscene.m" output="screen">
+    <env name="OCTAVE_WORKINGDIR" value="$(find ormanipulation)/octave"/>
+  </node>
 </launch>


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