Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master v4.4.0 rev0 This PR contains the modifications required to match the CoppeliaSim 4.4.0 rev 0 #14

Merged
merged 5 commits into from
Oct 10, 2023
Merged

Master v4.4.0 rev0 This PR contains the modifications required to match the CoppeliaSim 4.4.0 rev 0 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5463a04
Set the head position of the submodules in coppeliasim-v4.4.0-rev0
juanjqo Oct 6, 2023
fd1e20c
[rules] Updated the file to match the coppeliasim version
juanjqo Oct 6, 2023
b942a53
[control] updated the control file according to the new version
juanjqo Oct 6, 2023
0939400
[changelog] updated the version of coppeliasim
juanjqo Oct 6, 2023
325ff22
[rules] Fixed tag in binary arch
juanjqo Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coppeliarobotics/include
Open in desktop
Submodule include updated 4 files
+1 −1 license.txt
+351 −95 simConst.h
+226 −150 simLib.h
+2 −0 simTypes.h
2 changes: 1 addition & 1 deletion coppeliarobotics/remoteApi
Open in desktop
Submodule remoteApi updated 2 files
+39 −0 extApi.c
+1 −1 license.txt
2 changes: 1 addition & 1 deletion debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
libdqrobotics-interface-vrep (19.10.0) UNRELEASED; urgency=medium
libdqrobotics-interface-vrep-4.4.0-0 (19.10.0) UNRELEASED; urgency=medium

* Initial release of 19.10.0

Expand Down
5 changes: 3 additions & 2 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Source: libdqrobotics-interface-vrep
Source: libdqrobotics-interface-vrep-4.4.0-0
Section: devel
Priority: optional
Maintainer: Murilo Marinho <murilo@g.ecc.u-tokyo.ac.jp>
Build-Depends: cmake, libeigen3-dev, git, libdqrobotics
Homepage: https://dqrobotics.github.io/

Package: libdqrobotics-interface-vrep
Package: libdqrobotics-interface-vrep-4.4.0-0
Conflicts: libdqrobotics-interface-vrep
Architecture: any
Depends: libdqrobotics
Description: DQ Robotics interface with V-REP
Expand Down
9 changes: 6 additions & 3 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/make -f

BUILDDIR = build_dir
COPPELIASIMTAG = coppeliasim-v4.4.0-rev0
# A more standardized naming of the version above
PACKAGETAG = 4.4.0-0

# secondly called by launchpad
build:
Expand All @@ -9,8 +12,8 @@ ifeq ($(CI),)
rm -rf coppeliarobotics/{*,.*}
rm -rf coppeliarobotics
mkdir -p coppeliarobotics
git clone --single-branch --branch coppeliasim-v4.2.0-rev5 https://git.launchpad.net/~dqrobotics-dev/dqrobotics/+git/coppelia-include coppeliarobotics/include
git clone --single-branch --branch coppeliasim-v4.2.0-rev5 https://git.launchpad.net/~dqrobotics-dev/dqrobotics/+git/coppelia-remoteApi coppeliarobotics/remoteApi
git clone --single-branch --branch $(COPPELIASIMTAG) https://git.launchpad.net/~dqrobotics-dev/dqrobotics/+git/coppelia-include coppeliarobotics/include
git clone --single-branch --branch $(COPPELIASIMTAG) https://git.launchpad.net/~dqrobotics-dev/dqrobotics/+git/coppelia-remoteApi coppeliarobotics/remoteApi
else
echo "CI detected, skipping manual submodule load"
endif
Expand All @@ -27,7 +30,7 @@ binary-indep:
binary-arch:
cd $(BUILDDIR); cmake -P cmake_install.cmake
mkdir -p debian/tmp/DEBIAN
dpkg-gencontrol -plibdqrobotics-interface-vrep
dpkg-gencontrol -plibdqrobotics-interface-vrep-$(PACKAGETAG)
dpkg --build debian/tmp ..

# firstly called by launchpad
Expand Down