Merge branch 'master' of...

Merge branch 'master' of ssh://gitlab.iri.upc.edu:2202/mobile_robotics/autonomous_driving/autonomous_driving_tools

.gitlab-ci.yml

-image: docker.io/labrobotica/labrobotica
+  image: docker.io/labrobotica/labrobotica:20.04
 
-stages:
-  - build
-  - test
-  - deploy
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+    FROM_RDEPENDS_CI: "false"
+    TAG_VERSION: $CI_COMMIT_TAG
+    PACKAGE_NAME: "autonomous-driving-tools"
 
-build-package:
-  stage: build
-  script:
-#  Uncomment to install dependencies
-#    - apt update
-#    - apt -y install iri-<package_name>-dev
-    - apt update
-    - apt -y install iri-iriutils-dev
-    - apt install -y libxerces-c-dev xsdcxx libeigen3-dev libboost-all-dev
-    - mkdir -pv build
-    - cd build
-    - cmake -D CMAKE_BUILD_TYPE=RELEASE -DCPACK_PACKAGE_VERSION=$CI_COMMIT_TAG ..
-    - make package -j $(nproc)
-  artifacts:
-    paths:
-      - build/*.deb
-    expire_in: 2 weeks
-  only:
-    - tags
-    
-update_repo:
-  stage: deploy
-  script:
-    - cd build
-    - "scp -i /root/.ssh/iriLabKeyNopwd -r *autonomous-driving-tools*.deb irilabo@labrepo.iri.upc.edu:packages/"
-    - "ssh irilabo@labrepo.iri.upc.edu -i /root/.ssh/iriLabKeyNopwd -tt /home/irilabo/repo_scripts/update_repo.sh autonomous-driving-tools $(lsb_release -cs)"
-  only:
-    - tags
+  include:
+    remote: 'https://gitlab.iri.upc.edu/labrobotica/packaging_ci/-/raw/master/packaging-ci.yml'

CMakeLists.txt

@@ -75,13 +75,14 @@ IF (UNIX)
   SET(CPACK_PACKAGING_INSTALL_PREFIX /usr)
   SET(CPACK_GENERATOR "DEB")
   SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "labrobotica - labrobotica@iri.upc.edu")
+  SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://gitlab.iri.upc.edu/mobile_robotics/autonomous_driving/autonomous_driving_tools")
 
   #Uncomment to add the necessary mantainer scripts
   SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/scripts/debian/postinst;${CMAKE_SOURCE_DIR}/scripts/debian/prerm")
   #SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/scripts/debian/preinst;${CMAKE_SOURCE_DIR}/scripts/debian/postinst;${CMAKE_SOURCE_DIR}/scripts/debian/prerm;${CMAKE_SOURCE_DIR}/scripts/debian/postrm")
 
   #Uncomment to add dependencies comma separated
-  #SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-dep1-dev (>= 1.0~${DISTRIB}), iri-dep2-dev (>= 1.0~${DISTRIB})")
+  SET(CPACK_DEBIAN_PACKAGE_DEPENDS "iri-iriutils-dev (>= 1.0~${DISTRIB}), libeigen3-dev (>= 1.0~${DISTRIB}), libprotozero-dev (>= 1.0~${DISTRIB}, libosmium2-dev (>= 1.0~${DISTRIB}), gdal-bin (>= 1.0~${DISTRIB})), libgdal-dev (>= 1.0~${DISTRIB}), libgeographic-dev (>= 1.0~${DISTRIB}), xsdcxx (>= 1.0~${DISTRIB})")
 
   INCLUDE(CPack)
 ELSE(UNIX)