Skip to content

Commit c4b9b36

Browse files
Merge pull request #31 from ci-group/py2to3
Revolve on Gazebo9 and Python3
2 parents 7764d3f + f93bde2 commit c4b9b36

File tree

246 files changed

+7754
-1879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+7754
-1879
lines changed

.gitignore

+12-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ __pycache__/
44

55
# C extensions
66
*.so
7+
*.dylib
78

89
# Distribution / packaging
910
.Python
1011
env/
1112
/build/
13+
/cmake-build-*/
14+
/output*/
1215
develop-eggs/
1316
dist/
1417
downloads/
@@ -59,5 +62,13 @@ target/
5962
# PyCharm project files
6063
.idea
6164

65+
# Visual Studio Code
66+
/.vscode/
67+
6268
# Virtual env
63-
.venv
69+
.venv*/
70+
71+
# Revolve related
72+
*.sdf
73+
*.urdf
74+
*.yaml

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ cmake_minimum_required(VERSION 2.8.12)
22

33
project(revolve)
44

5-
add_subdirectory(cpp)
5+
add_subdirectory(cpprevolve)

Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
FROM cigroup/gazebo:gazebo6-revolve
1+
FROM ubuntu:bionic
22

33
# Dependencies
44
RUN apt-get update
55
RUN apt-get install -y build-essential \
6+
libboost-all-dev \
67
cmake \
8+
curl \
79
cppcheck \
810
doxygen \
911
git \
1012
gsl-bin libgsl0-dev \
1113
mercurial \
14+
pkg-config \
1215
python \
1316
python-pip \
1417
xsltproc
18+
RUN apt-get install -y libgazebo9-dev gazebo9
1519

1620
ADD . /revolve
1721
RUN /revolve/docker/build_revolve.sh

cpp/revolve/gazebo/plugin/BodyAnalyzer.cpp

-303
This file was deleted.

0 commit comments

Comments
 (0)