From 197687ac71deaa00d885f664de349cf6a116e008 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 16 Apr 2024 17:39:17 +0200 Subject: [PATCH 1/8] Duplicate packages.apt for new Noble Signed-off-by: Jose Luis Rivero --- .github/ci/packages-jammy.apt | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/ci/packages-jammy.apt diff --git a/.github/ci/packages-jammy.apt b/.github/ci/packages-jammy.apt new file mode 100644 index 0000000000..77df164d6e --- /dev/null +++ b/.github/ci/packages-jammy.apt @@ -0,0 +1,47 @@ +freeglut3-dev +libbenchmark-dev +libfreeimage-dev +libglew-dev +libgz-cmake3-dev +libgz-common5-dev +libgz-fuel-tools9-dev +libgz-gui8-dev +libgz-math7-eigen3-dev +libgz-msgs10-dev +libgz-physics7-dev +libgz-plugin2-dev +libgz-rendering8-dev +libgz-sensors8-dev +libgz-tools2-dev +libgz-transport13-dev +libgz-utils2-cli-dev +libogre-1.9-dev +libogre-next-2.3-dev +libprotobuf-dev +libprotoc-dev +libsdformat14-dev +libtinyxml2-dev +libxi-dev +libxmu-dev +libpython3-dev +python3-distutils +python3-gz-math7 +python3-gz-msgs10 +python3-gz-transport13 +python3-pybind11 +python3-pytest +python3-sdformat14 +qml-module-qt-labs-folderlistmodel +qml-module-qt-labs-settings +qml-module-qtgraphicaleffects +qml-module-qtqml-models2 +qml-module-qtquick-controls +qml-module-qtquick-controls2 +qml-module-qtquick-dialogs +qml-module-qtquick-layouts +qml-module-qtquick2 +qtbase5-dev +qtdeclarative5-dev +qtquickcontrols2-5-dev +uuid-dev +xvfb From b619794aafbc44af92fd6d95b4c3ffd9dd8b8688 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 16 Apr 2024 17:39:31 +0200 Subject: [PATCH 2/8] No distutils in noble Signed-off-by: Jose Luis Rivero --- .github/ci/packages.apt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 77df164d6e..9799421f24 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -24,7 +24,6 @@ libtinyxml2-dev libxi-dev libxmu-dev libpython3-dev -python3-distutils python3-gz-math7 python3-gz-msgs10 python3-gz-transport13 From 29d2a65115c8eac23f0d76fd809232d333fcbfa6 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 18 Apr 2024 16:12:55 +0200 Subject: [PATCH 3/8] Fix packages-jammy.apt with only the extra package Signed-off-by: Jose Luis Rivero --- .github/ci/packages-jammy.apt | 46 ----------------------------------- 1 file changed, 46 deletions(-) diff --git a/.github/ci/packages-jammy.apt b/.github/ci/packages-jammy.apt index 77df164d6e..8740549532 100644 --- a/.github/ci/packages-jammy.apt +++ b/.github/ci/packages-jammy.apt @@ -1,47 +1 @@ -freeglut3-dev -libbenchmark-dev -libfreeimage-dev -libglew-dev -libgz-cmake3-dev -libgz-common5-dev -libgz-fuel-tools9-dev -libgz-gui8-dev -libgz-math7-eigen3-dev -libgz-msgs10-dev -libgz-physics7-dev -libgz-plugin2-dev -libgz-rendering8-dev -libgz-sensors8-dev -libgz-tools2-dev -libgz-transport13-dev -libgz-utils2-cli-dev -libogre-1.9-dev -libogre-next-2.3-dev -libprotobuf-dev -libprotoc-dev -libsdformat14-dev -libtinyxml2-dev -libxi-dev -libxmu-dev -libpython3-dev python3-distutils -python3-gz-math7 -python3-gz-msgs10 -python3-gz-transport13 -python3-pybind11 -python3-pytest -python3-sdformat14 -qml-module-qt-labs-folderlistmodel -qml-module-qt-labs-settings -qml-module-qtgraphicaleffects -qml-module-qtqml-models2 -qml-module-qtquick-controls -qml-module-qtquick-controls2 -qml-module-qtquick-dialogs -qml-module-qtquick-layouts -qml-module-qtquick2 -qtbase5-dev -qtdeclarative5-dev -qtquickcontrols2-5-dev -uuid-dev -xvfb From aebfe555633073420104c9fa8653c61bea7cf17f Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 18 Apr 2024 16:20:31 +0200 Subject: [PATCH 4/8] Remove python code using distutils. Bump required to 3.22.1 Signed-off-by: Jose Luis Rivero --- CMakeLists.txt | 2 +- python/CMakeLists.txt | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 503f447c1b..6cb3fdbda6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) +cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) #============================================================================ # Initialize the project diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 3069e98752..2847cc8ba6 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -7,18 +7,7 @@ endif() if(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION) - if(${CMAKE_VERSION} VERSION_LESS "3.12.0") - execute_process( - COMMAND "${PYTHON_EXECUTABLE}" -c "if True: - from distutils import sysconfig as sc - print(sc.get_python_lib(plat_specific=True))" - OUTPUT_VARIABLE Python3_SITEARCH - OUTPUT_STRIP_TRAILING_WHITESPACE) - else() - # Get install variable from Python3 module - # Python3_SITEARCH is available from 3.12 on, workaround if needed: - find_package(Python3 COMPONENTS Interpreter) - endif() + find_package(Python3 COMPONENTS Interpreter) if(USE_DIST_PACKAGES_FOR_PYTHON) string(REPLACE "site-packages" "dist-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITEARCH}) From 83e5e3bc1ba808cc2185d2954354479618db1135 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Thu, 18 Apr 2024 19:37:54 +0200 Subject: [PATCH 5/8] Delete .github/ci/packages-jammy.apt Don't need it anymore Signed-off-by: Jose Luis Rivero --- .github/ci/packages-jammy.apt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/ci/packages-jammy.apt diff --git a/.github/ci/packages-jammy.apt b/.github/ci/packages-jammy.apt deleted file mode 100644 index 8740549532..0000000000 --- a/.github/ci/packages-jammy.apt +++ /dev/null @@ -1 +0,0 @@ -python3-distutils From 277b0108f95fa8b33ea0f0e86d5da4b0248650da Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 19 Apr 2024 15:01:48 +0200 Subject: [PATCH 6/8] Revert "Remove python code using distutils. Bump required to 3.22.1" This reverts commit aebfe555633073420104c9fa8653c61bea7cf17f. Signed-off-by: Jose Luis Rivero --- CMakeLists.txt | 2 +- python/CMakeLists.txt | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cb3fdbda6..503f447c1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 2847cc8ba6..3069e98752 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -7,7 +7,18 @@ endif() if(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION) - find_package(Python3 COMPONENTS Interpreter) + if(${CMAKE_VERSION} VERSION_LESS "3.12.0") + execute_process( + COMMAND "${PYTHON_EXECUTABLE}" -c "if True: + from distutils import sysconfig as sc + print(sc.get_python_lib(plat_specific=True))" + OUTPUT_VARIABLE Python3_SITEARCH + OUTPUT_STRIP_TRAILING_WHITESPACE) + else() + # Get install variable from Python3 module + # Python3_SITEARCH is available from 3.12 on, workaround if needed: + find_package(Python3 COMPONENTS Interpreter) + endif() if(USE_DIST_PACKAGES_FOR_PYTHON) string(REPLACE "site-packages" "dist-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITEARCH}) From 7918121ef7b911b0aef53c327d8ca06f6d90b87f Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 19 Apr 2024 15:04:02 +0200 Subject: [PATCH 7/8] Missed package jammy Signed-off-by: Jose Luis Rivero --- .github/ci/packages-jammy.apt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/ci/packages-jammy.apt diff --git a/.github/ci/packages-jammy.apt b/.github/ci/packages-jammy.apt new file mode 100644 index 0000000000..8740549532 --- /dev/null +++ b/.github/ci/packages-jammy.apt @@ -0,0 +1 @@ +python3-distutils From e45b04e0dae40b65e4319ac589a660ac7ee3a4f3 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Fri, 19 Apr 2024 18:54:45 +0200 Subject: [PATCH 8/8] Do not need distutils on jammy Signed-off-by: Jose Luis Rivero --- .github/ci/packages-jammy.apt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/ci/packages-jammy.apt diff --git a/.github/ci/packages-jammy.apt b/.github/ci/packages-jammy.apt deleted file mode 100644 index 8740549532..0000000000 --- a/.github/ci/packages-jammy.apt +++ /dev/null @@ -1 +0,0 @@ -python3-distutils