|
From: <tpr...@us...> - 2009-02-06 01:03:16
|
Revision: 10644
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=10644&view=rev
Author: tpratkanis
Date: 2009-02-06 01:03:13 +0000 (Fri, 06 Feb 2009)
Log Message:
-----------
PARALLEL_JOBS -> ROS_PARALLEL_JOBS
Modified Paths:
--------------
pkg/trunk/3rdparty/trex/make_trex
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/run-jam
pkg/trunk/highlevel/test_executive_trex_pr2/run-jam
Modified: pkg/trunk/3rdparty/trex/make_trex
===================================================================
--- pkg/trunk/3rdparty/trex/make_trex 2009-02-06 00:54:00 UTC (rev 10643)
+++ pkg/trunk/3rdparty/trex/make_trex 2009-02-06 01:03:13 UTC (rev 10644)
@@ -10,7 +10,7 @@
cd TREX
# Build the nddl jar file used to parse input files
-jam $PARALLEL_JOBS -q nddl.jar
+jam $ROS_PARALLEL_JOBS -q nddl.jar
if [ $? -ne 0 ] ; then
echo "Jam of nddl.jar failed."
@@ -19,9 +19,9 @@
# Build the debug version
if [ `uname` = Darwin ]; then
- jam $PARALLEL_JOBS -q libTREX_g.dylib
+ jam $ROS_PARALLEL_JOBS -q libTREX_g.dylib
else
- jam $PARALLEL_JOBS -q libTREX_g.so
+ jam $ROS_PARALLEL_JOBS -q libTREX_g.so
fi
if [ $? -ne 0 ] ; then
@@ -31,9 +31,9 @@
# Build the optimized version
if [ `uname` = Darwin ]; then
- jam $PARALLEL_JOBS -sVARIANTS=OPTIMIZED -q libTREX_o.dylib
+ jam $ROS_PARALLEL_JOBS -sVARIANTS=OPTIMIZED -q libTREX_o.dylib
else
- jam $PARALLEL_JOBS -sVARIANTS=OPTIMIZED -q libTREX_o.so
+ jam $ROS_PARALLEL_JOBS -sVARIANTS=OPTIMIZED -q libTREX_o.so
fi
if [ $? -ne 0 ] ; then
Modified: pkg/trunk/highlevel/executive_trex/executive_trex_pr2/run-jam
===================================================================
--- pkg/trunk/highlevel/executive_trex/executive_trex_pr2/run-jam 2009-02-06 00:54:00 UTC (rev 10643)
+++ pkg/trunk/highlevel/executive_trex/executive_trex_pr2/run-jam 2009-02-06 01:03:13 UTC (rev 10644)
@@ -4,5 +4,5 @@
cd `rospack find executive_trex_pr2`
PLASMA_HOME=`rospack find trex`/PLASMA/
-jam $PARALLEL_JOBS exec_inputs
+jam $ROS_PARALLEL_JOBS exec_inputs
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/run-jam
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/run-jam 2009-02-06 00:54:00 UTC (rev 10643)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/run-jam 2009-02-06 01:03:13 UTC (rev 10644)
@@ -4,5 +4,5 @@
cd `rospack find test_executive_trex_pr2`
PLASMA_HOME=`rospack find trex`/PLASMA/
-jam $PARALLEL_JOBS exec_test_inputs
+jam $ROS_PARALLEL_JOBS exec_test_inputs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|