[manylinux] Update urdfdom version to 4 and remove tinyxml dep

dartsim · Mar 23, 2024 · 39c20d6 · 39c20d6
1 parent 358074a
commit 39c20d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 50 deletions.
diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_aarch64-min b/docker/dev/v6.14/Dockerfile.manylinux_2_28_aarch64-min
@@ -62,20 +62,6 @@ RUN git clone https://github.com/bulletphysics/bullet3.git -b 3.25 \
     && cmake --build bullet3/build --target install -j${NUM_CORES} \
     && rm -rf bullet3
 
-# tinyxml
-# RUN wget https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz \
-#     && tar -xzf tinyxml_2_6_2.tar.gz \
-#     && cd tinyxml \
-#     && make \
-#     && make install \
-#     && cd .. \
-#     && rm -rf tinyxml
-RUN git clone https://github.com/jslee02/tinyxml.git \
-    && mkdir -p tinyxml/build \
-    && cmake tinyxml -B tinyxml/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
-    && cmake --build tinyxml/build --target install -j${NUM_CORES} \
-    && rm -rf tinyxml
-
 # tinyxml2
 RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \
     && mkdir -p tinyxml2/build \
@@ -91,14 +77,14 @@ RUN git clone https://github.com/ros/console_bridge.git -b 1.0.2 \
     && rm -rf console_bridge
 
 # urdfdom_headers
-RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.0.5 \
+RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.1.1\
     && mkdir -p urdfdom_headers/build \
     && cmake urdfdom_headers -B urdfdom_headers/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom_headers/build --target install -j${NUM_CORES} \
     && rm -rf urdfdom_headers
 
 # urdfdom
-RUN git clone https://github.com/ros/urdfdom.git -b 3.0.0 \
+RUN git clone https://github.com/ros/urdfdom.git -b 4.0.0 \
     && mkdir -p urdfdom/build \
     && cmake urdfdom -B urdfdom/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom/build --target install -j${NUM_CORES} \

diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_ppc64le-min b/docker/dev/v6.14/Dockerfile.manylinux_2_28_ppc64le-min
@@ -59,13 +59,6 @@ RUN git clone https://github.com/bulletphysics/bullet3.git -b 3.25 \
     && cmake --build bullet3/build --target install -j${NUM_CORES} \
     && rm -rf bullet3
 
-# tinyxml
-RUN git clone https://github.com/jslee02/tinyxml.git \
-    && mkdir -p tinyxml/build \
-    && cmake tinyxml -B tinyxml/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
-    && cmake --build tinyxml/build --target install -j${NUM_CORES} \
-    && rm -rf tinyxml
-
 # tinyxml2
 RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \
     && mkdir -p tinyxml2/build \
@@ -81,14 +74,14 @@ RUN git clone https://github.com/ros/console_bridge.git -b 1.0.2 \
     && rm -rf console_bridge
 
 # urdfdom_headers
-RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.0.5 \
+RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.1.1\
     && mkdir -p urdfdom_headers/build \
     && cmake urdfdom_headers -B urdfdom_headers/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom_headers/build --target install -j${NUM_CORES} \
     && rm -rf urdfdom_headers
 
 # urdfdom
-RUN git clone https://github.com/ros/urdfdom.git -b 3.0.0 \
+RUN git clone https://github.com/ros/urdfdom.git -b 4.0.0 \
     && mkdir -p urdfdom/build \
     && cmake urdfdom -B urdfdom/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom/build --target install -j${NUM_CORES} \

diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_s390x-min b/docker/dev/v6.14/Dockerfile.manylinux_2_28_s390x-min
@@ -59,13 +59,6 @@ RUN git clone https://github.com/bulletphysics/bullet3.git -b 3.25 \
     && cmake --build bullet3/build --target install -j${NUM_CORES} \
     && rm -rf bullet3
 
-# tinyxml
-RUN git clone https://github.com/jslee02/tinyxml.git \
-    && mkdir -p tinyxml/build \
-    && cmake tinyxml -B tinyxml/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
-    && cmake --build tinyxml/build --target install -j${NUM_CORES} \
-    && rm -rf tinyxml
-
 # tinyxml2
 RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \
     && mkdir -p tinyxml2/build \
@@ -81,14 +74,14 @@ RUN git clone https://github.com/ros/console_bridge.git -b 1.0.2 \
     && rm -rf console_bridge
 
 # urdfdom_headers
-RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.0.5 \
+RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.1.1\
     && mkdir -p urdfdom_headers/build \
     && cmake urdfdom_headers -B urdfdom_headers/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom_headers/build --target install -j${NUM_CORES} \
     && rm -rf urdfdom_headers
 
 # urdfdom
-RUN git clone https://github.com/ros/urdfdom.git -b 3.0.0 \
+RUN git clone https://github.com/ros/urdfdom.git -b 4.0.0 \
     && mkdir -p urdfdom/build \
     && cmake urdfdom -B urdfdom/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom/build --target install -j${NUM_CORES} \

diff --git a/docker/dev/v6.14/Dockerfile.manylinux_2_28_x86_64 b/docker/dev/v6.14/Dockerfile.manylinux_2_28_x86_64
@@ -56,20 +56,6 @@ RUN git clone https://github.com/flexible-collision-library/fcl.git -b '0.7.0' \
     && cmake --build fcl/build --target install -j${NUM_CORES} \
     && rm -rf fcl
 
-# tinyxml
-# RUN wget https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz \
-#     && tar -xzf tinyxml_2_6_2.tar.gz \
-#     && cd tinyxml \
-#     && make \
-#     && make install \
-#     && cd .. \
-#     && rm -rf tinyxml
-RUN git clone https://github.com/jslee02/tinyxml.git \
-    && mkdir -p tinyxml/build \
-    && cmake tinyxml -B tinyxml/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
-    && cmake --build tinyxml/build --target install -j${NUM_CORES} \
-    && rm -rf tinyxml
-
 # tinyxml2
 RUN git clone https://github.com/leethomason/tinyxml2.git -b '10.0.0' \
     && mkdir -p tinyxml2/build \
@@ -85,14 +71,14 @@ RUN git clone https://github.com/ros/console_bridge.git -b 1.0.2 \
     && rm -rf console_bridge
 
 # urdfdom_headers
-RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.0.5 \
+RUN git clone https://github.com/ros/urdfdom_headers.git -b 1.1.1\
     && mkdir -p urdfdom_headers/build \
     && cmake urdfdom_headers -B urdfdom_headers/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom_headers/build --target install -j${NUM_CORES} \
     && rm -rf urdfdom_headers
 
 # urdfdom
-RUN git clone https://github.com/ros/urdfdom.git -b 3.0.0 \
+RUN git clone https://github.com/ros/urdfdom.git -b 4.0.0 \
     && mkdir -p urdfdom/build \
     && cmake urdfdom -B urdfdom/build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
     && cmake --build urdfdom/build --target install -j${NUM_CORES} \