Skip to content

Commit 4334bda

Browse files
authored
Merge branch 'develop' into sync-master-1ad0a694f
2 parents 1ad0a69 + bdba49c commit 4334bda

File tree

370 files changed

+2977
-15258
lines changed

Some content is hidden

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

370 files changed

+2977
-15258
lines changed

.github/workflows/test_suite_linux.yml

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,14 @@ jobs:
3838
export LIBGL_ALWAYS_SOFTWARE=true
3939
xvfb-run --auto-servernum make webots_target -j4
4040
build:
41-
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
41+
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
4242
strategy:
4343
fail-fast: false
4444
matrix:
4545
os: [ubuntu-20.04, ubuntu-22.04]
4646
include:
4747
- os: ubuntu-20.04
4848
JAVA_VERSION: "16"
49-
ROS_DISTRO: "noetic"
5049
- os: ubuntu-22.04
5150
JAVA_VERSION: "18"
5251
runs-on: ${{ matrix.os }}
@@ -66,7 +65,6 @@ jobs:
6665
export JAVA_HOME=/usr/lib/jvm/java-${{ matrix.JAVA_VERSION }}-openjdk-amd64
6766
export PATH=$JAVA_HOME/bin:$PATH
6867
export LIBGL_ALWAYS_SOFTWARE=true
69-
export ROS_DISTRO=${{ matrix.ROS_DISTRO }}
7068
xvfb-run --auto-servernum make distrib -j4
7169
- name: Create/Update GitHub release
7270
if: ${{ matrix.os == 'ubuntu-20.04' && (github.event_name == 'push' || github.event_name == 'schedule') }}
@@ -75,14 +73,14 @@ jobs:
7573
pip install pyopenssl --upgrade
7674
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
7775
- uses: actions/upload-artifact@v4
78-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
76+
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
7977
with:
8078
name: build-${{ matrix.os }}
8179
path: |
8280
distribution/*.tar.bz2
8381
distribution/*.zip
8482
- uses: actions/upload-artifact@v4
85-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test ros') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
83+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
8684
with:
8785
name: build-${{ matrix.os }}
8886
path: |
@@ -107,7 +105,7 @@ jobs:
107105
- name: Extract Webots
108106
run: tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact
109107
- name: Install Webots Dependencies
110-
run: sudo scripts/install/linux_test_dependencies.sh --exclude-ros
108+
run: sudo scripts/install/linux_test_dependencies.sh
111109
- name: Set up Python 3.9
112110
uses: actions/setup-python@v4
113111
with:
@@ -127,44 +125,6 @@ jobs:
127125
name: test-results-${{ matrix.os }}
128126
path: |
129127
tests/
130-
test-ros:
131-
needs: build
132-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test ros') || github.event_name == 'schedule' }}
133-
strategy:
134-
fail-fast: false
135-
matrix:
136-
os: [ubuntu-20.04]
137-
include:
138-
- os: ubuntu-20.04
139-
ROS_DISTRO: noetic
140-
python: 3.8
141-
runs-on: ${{ matrix.os }}
142-
steps:
143-
- uses: actions/checkout@v3
144-
with:
145-
submodules: true
146-
- name: Download Artifacts
147-
uses: actions/[email protected]
148-
with:
149-
name: build-${{ matrix.os }}
150-
path: artifact
151-
- name: Extract Webots
152-
run: tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact
153-
- name: Install Webots Dependencies
154-
run: sudo scripts/install/linux_test_dependencies.sh
155-
- name: Set up Python ${{ matrix.python }}
156-
uses: actions/setup-python@v4
157-
with:
158-
python-version: ${{ matrix.python }}
159-
- name: Run Test
160-
run: |
161-
export WEBOTS_HOME=$PWD/artifact/webots
162-
export ROS_DISTRO=${{ matrix.ROS_DISTRO }}
163-
python -m pip install rospkg catkin_pkg empy defusedxml netifaces
164-
Xvfb :99 &
165-
export DISPLAY=:99
166-
./tests/ros.sh
167-
timeout-minutes: 15
168128
test-worlds:
169129
needs: build
170130
if: ${{ contains(github.event.pull_request.labels.*.name, 'test worlds') || github.event_name == 'schedule' }}
@@ -201,7 +161,7 @@ jobs:
201161
xvfb-run --auto-servernum python3 tests/test_worlds.py
202162
if [[ "$(diff -qr artifact/ untouched-artifact/ | wc -l)" -ne "0" ]]; then echo Some world and/or wbproj files are not up to date: "$(diff -qr artifact/ untouched-artifact/)"; exit 1; fi
203163
delete-artifacts:
204-
needs: [build, test-suite, test-ros, test-worlds]
164+
needs: [build, test-suite, test-worlds]
205165
if: ${{ always() && !contains(github.event.pull_request.labels.*.name, 'test distribution') && !contains(github.event.pull_request.labels.*.name, 'test webots build') }}
206166
strategy:
207167
matrix:

.github/workflows/test_suite_linux_develop.yml

Lines changed: 5 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@ jobs:
3333
export LIBGL_ALWAYS_SOFTWARE=true
3434
xvfb-run --auto-servernum make webots_target -j4
3535
build:
36-
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
36+
if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || contains(github.event.pull_request.labels.*.name, 'test distribution') || contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
3737
strategy:
3838
fail-fast: false
3939
matrix:
4040
os: [ubuntu-20.04, ubuntu-22.04]
4141
include:
4242
- os: ubuntu-20.04
4343
JAVA_VERSION: "16"
44-
ROS_DISTRO: "noetic"
4544
- os: ubuntu-22.04
4645
JAVA_VERSION: "18"
4746
runs-on: ${{ matrix.os }}
@@ -62,7 +61,6 @@ jobs:
6261
export JAVA_HOME=/usr/lib/jvm/java-${{ matrix.JAVA_VERSION }}-openjdk-amd64
6362
export PATH=$JAVA_HOME/bin:$PATH
6463
export LIBGL_ALWAYS_SOFTWARE=true
65-
export ROS_DISTRO=${{ matrix.ROS_DISTRO }}
6664
xvfb-run --auto-servernum make distrib -j4
6765
- name: Create/Update GitHub release
6866
if: ${{ matrix.os == 'ubuntu-20.04' && (github.event_name == 'push' || github.event_name == 'schedule') }}
@@ -71,14 +69,14 @@ jobs:
7169
pip install pyopenssl --upgrade
7270
scripts/packaging/publish_release.py --key=${{ secrets.GITHUB_TOKEN }} --repo=${{ github.repository }} --branch=${{ github.ref }} --commit=$(git log -1 --format='%H') --tag=${{ github.ref }}
7371
- uses: actions/upload-artifact@v4
74-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test ros') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
72+
if: ${{ contains(github.event.pull_request.labels.*.name, 'test suite') || contains(github.event.pull_request.labels.*.name, 'test worlds') }}
7573
with:
7674
name: build-${{ matrix.os }}
7775
path: |
7876
distribution/*.tar.bz2
7977
distribution/*.zip
8078
- uses: actions/upload-artifact@v4
81-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test ros') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
79+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'test suite') && !contains(github.event.pull_request.labels.*.name, 'test worlds') }}
8280
with:
8381
name: build-${{ matrix.os }}
8482
path: |
@@ -105,7 +103,7 @@ jobs:
105103
- name: Extract Webots
106104
run: tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact
107105
- name: Install Webots Dependencies
108-
run: sudo scripts/install/linux_test_dependencies.sh --exclude-ros
106+
run: sudo scripts/install/linux_test_dependencies.sh
109107
- name: Set up Python 3.9
110108
uses: actions/setup-python@v2
111109
with:
@@ -119,45 +117,6 @@ jobs:
119117
export TESTS_HOME=$PWD # required by cache group in the test suite
120118
export BRANCH_HASH=$(git log -1 --format='%H')
121119
xvfb-run --auto-servernum python tests/test_suite.py
122-
test-ros:
123-
needs: build
124-
if: ${{ contains(github.event.pull_request.labels.*.name, 'test ros') || github.event_name == 'schedule' }}
125-
strategy:
126-
fail-fast: false
127-
matrix:
128-
os: [ubuntu-20.04]
129-
include:
130-
- os: ubuntu-20.04
131-
ROS_DISTRO: noetic
132-
python: 3.8
133-
runs-on: ${{ matrix.os }}
134-
steps:
135-
- uses: actions/checkout@v3
136-
with:
137-
submodules: true
138-
ref: develop
139-
- name: Download Artifacts
140-
uses: actions/[email protected]
141-
with:
142-
name: build-${{ matrix.os }}
143-
path: artifact
144-
- name: Extract Webots
145-
run: tar xjf artifact/webots-*-x86-64*.tar.bz2 -C artifact
146-
- name: Install Webots Dependencies
147-
run: sudo scripts/install/linux_test_dependencies.sh
148-
- name: Set up Python ${{ matrix.python }}
149-
uses: actions/setup-python@v2
150-
with:
151-
python-version: ${{ matrix.python }}
152-
- name: Run Test
153-
run: |
154-
export WEBOTS_HOME=$PWD/artifact/webots
155-
export ROS_DISTRO=${{ matrix.ROS_DISTRO }}
156-
python -m pip install rospkg catkin_pkg empy defusedxml netifaces
157-
Xvfb :99 &
158-
export DISPLAY=:99
159-
./tests/ros.sh
160-
timeout-minutes: 15
161120
test-worlds:
162121
needs: build
163122
if: ${{ contains(github.event.pull_request.labels.*.name, 'test worlds') || github.event_name == 'schedule' }}
@@ -194,7 +153,7 @@ jobs:
194153
xvfb-run --auto-servernum python3 tests/test_worlds.py
195154
if [[ "$(diff -qr artifact/ untouched-artifact/ | wc -l)" -ne "0" ]]; then echo Some world and/or wbproj files are not up to date: "$(diff -qr artifact/ untouched-artifact/)"; exit 1; fi
196155
delete-artifacts:
197-
needs: [build, test-suite, test-ros, test-worlds]
156+
needs: [build, test-suite, test-worlds]
198157
if: ${{ always() && !contains(github.event.pull_request.labels.*.name, 'test distribution') && !contains(github.event.pull_request.labels.*.name, 'test webots build') }}
199158
strategy:
200159
matrix:

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44
[submodule "src/stb"]
55
path = src/stb
66
url = https://github.com/nothings/stb.git
7-
[submodule "resources/webots_ros"]
8-
path = resources/webots_ros
9-
url = https://github.com/cyberbotics/webots_ros

dependencies/Makefile.linux

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ QT_PACKAGE = webots-qt-$(QT_VERSION)-linux64-release.tar.bz2
1111
OIS_PACKAGE = libOIS.1.4.tar.bz2
1212
ASSIMP_PACKAGE = libassimp-5.2.3.tar.bz2
1313
PICO_PACKAGE = libpico.tar.bz2
14-
LUA_PACKAGE = lua-5.2.3.tar.gz
1514
OPENSSL_VERSION=3.0.14
1615
OPENSSL_SRC_PACKAGE=openssl-$(OPENSSL_VERSION).tar.gz
1716

18-
PACKAGES = qt open-al ois pico lua assimp
17+
PACKAGES = qt open-al ois pico assimp
1918
PACKAGES_CLEAN = $(addsuffix -clean, $(PACKAGES))
2019

2120
ifeq ($(UBUNTU_VERSION), 20.04)
@@ -113,24 +112,6 @@ $(WEBOTS_DEPENDENCY_PATH)/$(PICO_PACKAGE):
113112
@if [ "$$(md5sum $(PICO_PACKAGE) | awk '{print $$1;}')" != "13ce4d080f1db578cb2b73206b52e4cb" ]; then echo "MD5 checksum failed for $(PICO_PACKAGE)"; exit 1; fi
114113
@touch $(WEBOTS_DEPENDENCY_PATH)/$(PICO_PACKAGE)
115114

116-
lua-clean:
117-
@rm -rf $(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3 $(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE)
118-
119-
lua: $(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3/src/liblua.a
120-
121-
$(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3:
122-
@echo "# downloading $(LUA_PACKAGE)"
123-
@rm -f $(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE)
124-
@wget -qq https://www.lua.org/ftp/$(LUA_PACKAGE) -P $(WEBOTS_DEPENDENCY_PATH)
125-
@if [ "$$(md5sum $(LUA_PACKAGE) | awk '{print $$1;}')" != "dc7f94ec6ff15c985d2d6ad0f1b35654" ]; then echo "MD5 checksum failed for $(LUA_PACKAGE)"; exit 1; fi
126-
@echo "# uncompressing $(LUA_PACKAGE)"
127-
@tar xfm $(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE) -C $(WEBOTS_DEPENDENCY_PATH)
128-
@rm -f $(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE)
129-
130-
$(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3/src/liblua.a: $(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3
131-
@echo "# compiling lua"
132-
+@make --silent -C $(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3 linux 2> /dev/null
133-
134115
open-ssl-clean:
135116
@rm -rf $(WEBOTS_DEPENDENCY_PATH)/$(OPENSSL_SRC_PACKAGE) $(WEBOTS_DEPENDENCY_PATH)/openssl-$(OPENSSL_VERSION) $(WEBOTS_DEPENDENCY_PATH)/openssl-3.0 $(WEBOTS_HOME_LIB)/libcrypto.so* $(WEBOTS_HOME_LIB)/libssl.so*
136117

dependencies/Makefile.mac

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ QT_PACKAGE = qt-6.5.3-release.tar.bz2
1010
ASSIMP_PACKAGE = assimp-5.2.3.tar.bz2
1111
FFMPEG_PACKAGE = ffmpeg.tar.bz2
1212
FREETYPE_PACKAGE = freetype2.tar.bz2
13-
LUA_PACKAGE = liblua-5.2.3.tar.bz2
1413
OIS_PACKAGE = libOIS-1.3.tar.bz2
1514
PICO_PACKAGE = libpico-1.0.tar.bz2
1615

17-
PACKAGES = qt assimp ffmpeg freetype lua ois pico
16+
PACKAGES = qt assimp ffmpeg freetype ois pico
1817
PACKAGES_CLEAN = $(addsuffix -clean, $(PACKAGES))
1918

2019
.PHONY: release debug distrib profile clean cleanse $(PACKAGES) $(PACKAGES_CLEAN)
@@ -126,30 +125,6 @@ freetype2:
126125
@tar xfm $(FREETYPE_PACKAGE)
127126
@rm -f $(FREETYPE_PACKAGE)
128127

129-
130-
lua-clean:
131-
@rm -rf $(WEBOTS_HOME_LIB)/liblua.dylib
132-
@rm -rf $(WEBOTS_HOME)/dependencies/lua-*
133-
@rm -rf $(WEBOTS_HOME)/dependencies/liblua-*.tar.bz2
134-
135-
lua: $(WEBOTS_HOME_LIB)/liblua.dylib
136-
137-
$(WEBOTS_HOME_LIB)/liblua.dylib: $(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE)
138-
@echo "# uncompressing $(LUA_PACKAGE)"
139-
@tar xfm $(LUA_PACKAGE) -C $(WEBOTS_HOME)/Contents
140-
@mv $(WEBOTS_HOME)/Contents/dependencies/lua-5.2.3 $(WEBOTS_HOME)/dependencies/
141-
@rmdir $(WEBOTS_HOME)/Contents/dependencies
142-
@install_name_tool -id @rpath/Contents/lib/webots/liblua.dylib $@
143-
@codesign --force -s - $@
144-
145-
146-
$(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE):
147-
@echo "# downloading $(LUA_PACKAGE)"
148-
@rm -f $(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE)
149-
@$(WGET) $(DEPENDENCIES_URL)/$(LUA_PACKAGE) -P $(WEBOTS_DEPENDENCY_PATH)
150-
@if [ "b81047a7d382c1531b5b18530c6578ad" != `md5 -q $(LUA_PACKAGE)` ]; then echo "MD5 checksum failed for $(LUA_PACKAGE)"; exit 1; fi
151-
@touch $@
152-
153128
ois-clean:
154129
@rm -rf $(WEBOTS_DEPENDENCY_PATH)/$(OIS_PACKAGE) $(WEBOTS_HOME_LIB)/*OIS.dylib $(WEBOTS_HOME)/include/libOIS
155130

dependencies/Makefile.windows

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ DEPENDENCIES_URL = https://cyberbotics.com/files/repository/dependencies/windows
77

88
ASSIMP_PACKAGE = assimp-5.2.3.zip
99
OPEN_VR_PACKAGE = openvr-1.0.7.zip
10-
LUA_PACKAGE = lua-5.2.3.tar.gz
1110
OIS_PACKAGE = libOIS.zip
1211
PICO_PACKAGE = libpico-1.0.zip
13-
LUA_GD_PACKAGE = lua-gd-windows.zip
1412

15-
PACKAGES = assimp open-vr lua ois pico lua-gd
13+
PACKAGES = assimp open-vr ois pico
1614
PACKAGES_CLEAN = $(addsuffix -clean, $(PACKAGES))
1715
null :=
1816
space := $(null) $(null)
@@ -99,30 +97,6 @@ $(WEBOTS_DEPENDENCY_PATH)/openvr-1.0.7:
9997
@rm -f "$(WEBOTS_DEPENDENCY_PATH)/$(OPEN_VR_PACKAGE)"
10098
@touch "$(WEBOTS_DEPENDENCY_PATH)/openvr-1.0.7"
10199

102-
lua-clean:
103-
@rm -rf $(TARGET_PATH)/lua52.dll "$(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3"
104-
105-
lua: $(TARGET_PATH)/lua52.dll
106-
107-
$(TARGET_PATH)/lua52.dll: $(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3/src/lua52.dll
108-
@echo "# copying lua dll"
109-
@mkdir -p $(TARGET_PATH)
110-
@cp "$(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3/src/lua52.dll" "$(TARGET_PATH)/"
111-
112-
$(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3:
113-
@rm -f "$(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE)"
114-
@echo "# downloading $(LUA_PACKAGE)"
115-
@wget -qq "https://www.lua.org/ftp/$(LUA_PACKAGE)" -P "$(WEBOTS_DEPENDENCY_PATH)"
116-
@if [ "$$(md5sum $(LUA_PACKAGE) | awk '{print $$1;}')" != "dc7f94ec6ff15c985d2d6ad0f1b35654" ]; then echo "MD5 checksum failed for $(LUA_PACKAGE)"; exit 1; fi
117-
@echo "# uncompressing $(LUA_PACKAGE)"
118-
@cd "$(WEBOTS_DEPENDENCY_PATH)"; tar xfm $(LUA_PACKAGE) -C "$(WEBOTS_DEPENDENCY_PATH)"
119-
@rm -f "$(WEBOTS_DEPENDENCY_PATH)/$(LUA_PACKAGE)"
120-
121-
$(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3/src/lua52.dll: $(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3
122-
@sed -i '/AR= ar rcu/c\AR= ar rc' lua-5.2.3/src/Makefile
123-
@echo "# compiling lua"
124-
+@make --silent -C "$(WEBOTS_DEPENDENCY_PATH)/lua-5.2.3" mingw
125-
126100
ois-clean:
127101
@rm -rf "$(WEBOTS_DEPENDENCY_PATH)/$(OIS_PACKAGE)" $(TARGET_PATH)/OIS.dll $(TARGET_PATH)/XInput9_1_0.dll "$(WEBOTS_HOME_PATH)/include/libOIS"
128102

@@ -161,21 +135,3 @@ $(WEBOTS_DEPENDENCY_PATH)/$(PICO_PACKAGE):
161135
@wget -qq "$(DEPENDENCIES_URL)/$(PICO_PACKAGE)" -P "$(WEBOTS_DEPENDENCY_PATH)"
162136
@if [ "$$(md5sum $(PICO_PACKAGE) | awk '{print $$1;}')" != "78a74b1190eb3a75bc0ae5360c699517" ]; then echo "MD5 checksum failed for $(PICO_PACKAGE)"; exit 1; fi
163137
@touch "$(WEBOTS_DEPENDENCY_PATH)/$(PICO_PACKAGE)"
164-
165-
lua-gd-clean:
166-
@rm -rf "$(WEBOTS_DEPENDENCY_PATH)/$(LUA_GD_PACKAGE)" $(TARGET_PATH)/gd.dll
167-
168-
lua-gd: $(TARGET_PATH)/gd.dll
169-
170-
$(TARGET_PATH)/gd.dll: $(WEBOTS_DEPENDENCY_PATH)/$(LUA_GD_PACKAGE)
171-
@echo "# uncompressing $(LUA_GD_PACKAGE)"
172-
@mkdir -p $(TARGET_PATH)
173-
@unzip -q -o "$(WEBOTS_DEPENDENCY_PATH)/$(LUA_GD_PACKAGE)" -d "$(WEBOTS_HOME_PATH)/msys64/mingw64/bin"
174-
@touch "$(TARGET_PATH)/gd.dll"
175-
176-
$(WEBOTS_DEPENDENCY_PATH)/$(LUA_GD_PACKAGE):
177-
@echo "# downloading $(LUA_GD_PACKAGE)"
178-
@rm -f "$(WEBOTS_DEPENDENCY_PATH)/$(LUA_GD_PACKAGE)"
179-
@wget -qq "$(DEPENDENCIES_URL)/$(LUA_GD_PACKAGE)" -P "$(WEBOTS_DEPENDENCY_PATH)"
180-
@if [ "$$(md5sum $(LUA_GD_PACKAGE) | awk '{print $$1;}')" != "0a54dcc518d331a853f77fb66ebf75e9" ]; then echo "MD5 checksum failed for $(LUA_GD_PACKAGE)"; exit 1; fi
181-
@touch "$(WEBOTS_DEPENDENCY_PATH)/$(LUA_GD_PACKAGE)"

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ pip install pycodestyle
8080
2. Run the tests:
8181

8282
```sh
83-
cd $WEBOTS_HOME/docs
83+
cd $WEBOTS_HOME/docs/tests
8484
python -m unittest discover
8585
```

docs/automobile/car-and-driver-libraries.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ This section presents and explains how to use these two libraries.
99
- [Driver library](driver-library.md)
1010
- [Car library](car-library.md)
1111
- [C++, Java and Python wrappers of the automobile libraries](cpp-java-and-python-wrappers-of-the-automobile-libraries.md)
12-
- [ROS support](ros-support.md)

0 commit comments

Comments
 (0)