Skip to content

Commit af2dd44

Browse files
author
Nader Thomas
committed
Merge branch 'master' into Extension_osi_hostvehicledata
2 parents 833492d + 692e89f commit af2dd44

20 files changed

+3396
-195
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ addons:
6161
- doxygen-gui
6262
- graphviz
6363
- python3-setuptools
64+
- python3-pip
65+
- python3-wheel
6466

6567

6668
jobs:
@@ -78,6 +80,8 @@ jobs:
7880
- cd ..
7981
- python3 setup.py build
8082
- python3 setup.py sdist
83+
- python3 -m pip install -U pip
84+
- python3 -m pip install .
8185
- cd build
8286
- cmake --build . --target install
8387
- cd ..
@@ -103,6 +107,8 @@ jobs:
103107
- cd ..
104108
- python3 setup.py build
105109
- python3 setup.py sdist
110+
- python3 -m pip install -U pip
111+
- python3 -m pip install .
106112
- cd build
107113
- cmake --build . --target install
108114
- cd ..
@@ -128,6 +134,8 @@ jobs:
128134
- cd ..
129135
- python3 setup.py build
130136
- python3 setup.py sdist
137+
- python3 -m pip install -U pip
138+
- python3 -m pip install .
131139
- cd build
132140
- cmake --build . --target install
133141
- cd ..

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ set(OSI_PROTO_FILES
6666
osi_hostvehicledata.proto
6767
osi_trafficsign.proto
6868
osi_trafficlight.proto
69+
osi_trafficupdate.proto
70+
osi_trafficcommand.proto
6971
osi_roadmarking.proto
7072
osi_lane.proto
7173
osi_featuredata.proto

doc/images/OSI_BaseMoving.svg

Lines changed: 203 additions & 159 deletions
Loading

0 commit comments

Comments
 (0)