From 2a4a438fd5a134a2402b80dd086da4f5eecbcc1f Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Thu, 30 Aug 2018 00:02:38 +0900
Subject: [PATCH] replace xacro.py to xacro --inorder

---
 dependencies/ur_description/launch/ur10_upload.launch | 4 ++--
 dependencies/ur_description/launch/ur5_upload.launch  | 4 ++--
 ur_driver/launch/ur10_real.launch                     | 4 ++--
 ur_driver/launch/ur10_sim.launch                      | 4 ++--
 ur_driver/launch/ur5_real.launch                      | 6 +++---
 ur_driver/launch/ur5_sim.launch                       | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dependencies/ur_description/launch/ur10_upload.launch b/dependencies/ur_description/launch/ur10_upload.launch
index 5cbb150..a96ee70 100644
--- a/dependencies/ur_description/launch/ur10_upload.launch
+++ b/dependencies/ur_description/launch/ur10_upload.launch
@@ -2,6 +2,6 @@
 <launch>
   <arg name="limited" default="false"/>
   
-  <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
-  <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" />
+  <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
+  <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" />
 </launch>
diff --git a/dependencies/ur_description/launch/ur5_upload.launch b/dependencies/ur_description/launch/ur5_upload.launch
index abe4b78..79f3310 100644
--- a/dependencies/ur_description/launch/ur5_upload.launch
+++ b/dependencies/ur_description/launch/ur5_upload.launch
@@ -2,6 +2,6 @@
 <launch>
   <arg name="limited" default="false"/>
   
-  <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
-  <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" />
+  <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
+  <param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" />
 </launch>
diff --git a/ur_driver/launch/ur10_real.launch b/ur_driver/launch/ur10_real.launch
index b317038..1885395 100644
--- a/ur_driver/launch/ur10_real.launch
+++ b/ur_driver/launch/ur10_real.launch
@@ -8,9 +8,9 @@
 	<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
 
 
-	<param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
+	<param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
 
-	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" />
+	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" />
 
 
 	<!-- load configuration -->
diff --git a/ur_driver/launch/ur10_sim.launch b/ur_driver/launch/ur10_sim.launch
index e9bdf6b..cc92cf5 100644
--- a/ur_driver/launch/ur10_sim.launch
+++ b/ur_driver/launch/ur10_sim.launch
@@ -8,9 +8,9 @@
 	<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
 
 
-	<param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
+	<param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
 
-	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" />
+	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur10_joint_limited_robot.urdf.xacro'" />
 
 
 	<!-- load configuration -->
diff --git a/ur_driver/launch/ur5_real.launch b/ur_driver/launch/ur5_real.launch
index bae3783..b233e12 100644
--- a/ur_driver/launch/ur5_real.launch
+++ b/ur_driver/launch/ur5_real.launch
@@ -3,10 +3,10 @@
     <arg name="limited" default="false"/>
 
     <!-- load robot model -->
-    <!--<param name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/cells/ipa325_ur5_empty.urdf.xacro'" />-->
-   	<param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
+    <!--<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/cells/ipa325_ur5_empty.urdf.xacro'" />-->
+   	<param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
 
-	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" />
+	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" />
 
     <!-- start robot state publisher -->
     <node name="robot_state_publisher" pkg="robot_state_publisher" type="robot_state_publisher" />
diff --git a/ur_driver/launch/ur5_sim.launch b/ur_driver/launch/ur5_sim.launch
index 32c7b0e..f3bc024 100644
--- a/ur_driver/launch/ur5_sim.launch
+++ b/ur_driver/launch/ur5_sim.launch
@@ -3,10 +3,10 @@
     <arg name="limited" default="false"/>
 
     <!-- load robot model -->
-    <!--<param name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/cells/ipa325_ur5_empty.urdf.xacro'" />-->
-    <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
+    <!--<param name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/cells/ipa325_ur5_empty.urdf.xacro'" />-->
+    <param unless="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
 
-	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" />
+	<param if="$(arg limited)" name="robot_description" command="$(find xacro)/xacro --inorder '$(find ur_description)/urdf/ur5_joint_limited_robot.urdf.xacro'" />
 
     <!-- start robot state publisher -->
     <node name="robot_state_publisher" pkg="robot_state_publisher" type="robot_state_publisher" />