Commit 5a79cd0f authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

OSG, OSG-Qt & pythonqt → robotpkg

parent 55e04bff
......@@ -30,8 +30,9 @@ RUN apt-get update -qqy \
libgraphviz-dev \
libltdl-dev \
libomniorb4-dev \
libopenscenegraph-dev \
libpcre3-dev \
libpythonqt-qtall-qt5-python2-dev \
libpythonqt-qtall-qt5-python3-dev \
libqt4-opengl-dev \
libqtgui4 \
libqtwebkit-dev \
......@@ -39,7 +40,6 @@ RUN apt-get update -qqy \
liburdfdom-dev \
libxml2 \
omniorb-nameserver \
openscenegraph \
oxygen-icon-theme \
python-matplotlib \
python-omniorb \
......@@ -47,11 +47,13 @@ RUN apt-get update -qqy \
qtbase5-dev \
qttools5-dev \
robotpkg-omniorb \
robotpkg-openscenegraph \
robotpkg-qpoases+doc \
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
robotpkg-romeo-description \
robotpkg-py36-omniorbpy \
robotpkg-qt5-osgqt \
ros-${ROS}-octomap \
ros-${ROS}-pr2-description \
ros-${ROS}-resource-retriever \
......
......@@ -31,7 +31,6 @@ RUN apt-get update -qqy \
libgraphviz-dev \
libltdl-dev \
libomniorb4-dev \
libopenscenegraph-dev \
libpcre3-dev \
libqt5svg5-dev \
libqt5webkit5-dev \
......@@ -40,7 +39,6 @@ RUN apt-get update -qqy \
liburdfdom-dev \
libxml2 \
omniorb-nameserver \
openscenegraph \
oxygen-icon-theme \
pyqt5-dev \
python-is-python3 \
......@@ -50,11 +48,13 @@ RUN apt-get update -qqy \
qtbase5-private-dev \
qtmultimedia5-dev \
robotpkg-omniorb \
robotpkg-openscenegraph \
robotpkg-qpoases+doc \
robotpkg-roboptim-core \
robotpkg-roboptim-trajectory \
robotpkg-romeo-description \
robotpkg-py38-omniorbpy \
robotpkg-py38-pythonqt \
robotpkg-qt5-osgqt \
ros-${ROS}-octomap \
ros-${ROS}-resource-retriever \
......
......@@ -223,10 +223,6 @@ endif
gepetto-viewer-corba_branch=${HPP_VERSION}
gepetto-viewer-corba_repository=${GEPETTO_REPO}
pythonqt_branch=qt${QT_VERSION}
pythonqt_repository=${GEPETTO_REPO}
pythonqt_extra_flags= -DPythonQt_Wrap_QtAll=ON -DPythonQt_Extensions=ON
qgv_branch=devel
qgv_repository=${HPP_REPO}
ifeq (${QT_VERSION}, 5)
......@@ -299,7 +295,6 @@ hpp-corbaserver.configure.dep: hpp-core.install hpp-template-corba.install \
hpp-constraints.install hpp-corbaserver.checkout
hpp-template-corba.configure.dep: hpp-util.install hpp-template-corba.checkout
qgv.configure.dep: qgv.checkout
pythonqt.configure.dep: pythonqt.checkout
robot_model_py.configure.dep: robot_model_py.checkout
robot_capsule_urdf.configure.dep: robot_model_py.install \
robot_capsule_urdf.checkout
......@@ -317,9 +312,9 @@ osg-dae.configure.dep: collada-dom.install \
osg-dae.checkout
OpenSceneGraph-3.4.0.configure.dep: collada-dom.install \
OpenSceneGraph-3.4.0.checkout
gepetto-viewer.configure.dep: pythonqt.install gepetto-viewer.checkout
gepetto-viewer.configure.dep: gepetto-viewer.checkout
gepetto-viewer-corba.configure.dep: gepetto-viewer.install \
pythonqt.install gepetto-viewer-corba.checkout
gepetto-viewer-corba.checkout
hpp-gepetto-viewer.configure.dep: gepetto-viewer-corba.install \
hpp-corbaserver.install \
hpp-gepetto-viewer.checkout
......
......@@ -224,10 +224,6 @@ endif
gepetto-viewer-corba_branch=v5.5.1
gepetto-viewer-corba_repository=${GEPETTO_REPO}
pythonqt_branch=qt${QT_VERSION}
pythonqt_repository=${GEPETTO_REPO}
pythonqt_extra_flags= -DPythonQt_Wrap_QtAll=ON -DPythonQt_Extensions=ON
qgv_branch=v1.3.0
qgv_repository=${HPP_REPO}
ifeq (${QT_VERSION}, 5)
......@@ -300,7 +296,6 @@ hpp-corbaserver.configure.dep: hpp-core.install hpp-template-corba.install \
hpp-constraints.install hpp-corbaserver.checkout
hpp-template-corba.configure.dep: hpp-util.install hpp-template-corba.checkout
qgv.configure.dep: qgv.checkout
pythonqt.configure.dep: pythonqt.checkout
robot_model_py.configure.dep: robot_model_py.checkout
robot_capsule_urdf.configure.dep: robot_model_py.install \
robot_capsule_urdf.checkout
......@@ -318,9 +313,9 @@ osg-dae.configure.dep: collada-dom.install \
osg-dae.checkout
OpenSceneGraph-3.4.0.configure.dep: collada-dom.install \
OpenSceneGraph-3.4.0.checkout
gepetto-viewer.configure.dep: pythonqt.install gepetto-viewer.checkout
gepetto-viewer.configure.dep: gepetto-viewer.checkout
gepetto-viewer-corba.configure.dep: gepetto-viewer.install \
pythonqt.install gepetto-viewer-corba.checkout
gepetto-viewer-corba.checkout
hpp-gepetto-viewer.configure.dep: gepetto-viewer-corba.install \
hpp-corbaserver.install \
hpp-gepetto-viewer.checkout
......
......@@ -25,10 +25,10 @@ case $HOST_DIST in
ros-melodic-resource-retriever ros-melodic-srdfdom \
ros-melodic-pr2-description git libomniorb4-dev omniorb-nameserver \
libltdl-dev python-matplotlib python-omniorb \
libxml2 \
libxml2 robotpkg-openscenegraph robotpkg-qt5-osgqt \
libtinyxml2-dev qt4-dev-tools libqt4-opengl-dev libqtgui4 \
libqtwebkit-dev oxygen-icon-theme libopenscenegraph-dev \
openscenegraph libpcre3-dev libcdd-dev wget"
libqtwebkit-dev oxygen-icon-theme \
libpcre3-dev libcdd-dev wget"
APT_BUILD_DEP=""
CONFIG_FILE="ubuntu-18.04-melodic.sh"
;;
......@@ -39,8 +39,8 @@ case $HOST_DIST in
ros-noetic-xacro libccd-dev ros-noetic-octomap \
ros-noetic-resource-retriever ros-noetic-srdfdom \
ros-noetic-pr2-description git libltdl-dev \
python3-matplotlib qtbase5-private-dev qtdeclarative5-dev
qtmultimedia5-dev libqt5svg5-dev libxml2 libtinyxml2-dev
python3-matplotlib qtbase5-private-dev qtdeclarative5-dev \
qtmultimedia5-dev libqt5svg5-dev libxml2 libtinyxml2-dev robotpkg-qt5-osgqt \
oxygen-icon-theme robotpkg-openscenegraph libpcre3-dev wget libcdd-dev"
APT_BUILD_DEP=""
CONFIG_FILE="ubuntu-20.04-noetic.sh"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment