ign_common windows: use gdal (#624)

* ign_rendering windows: use gdal * ign_common windows: use gdal * Use --recurse with vcpkg install * Add gdal dependency to other windows CI scripts Signed-off-by: Steve Peters <[email protected]>
gazebo-tooling · Jan 21, 2022 · 0767374 · 0767374
1 parent 5271d46
commit 0767374
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 2 deletions.
diff --git a/jenkins-scripts/ign_common-default-devel-windows-amd64.bat b/jenkins-scripts/ign_common-default-devel-windows-amd64.bat
@@ -5,6 +5,11 @@ set PLATFORM_TO_BUILD=x86_amd64
 set IGN_CLEAN_WORKSPACE=true
 
 set DEPEN_PKGS=ffmpeg freeimage gts tinyxml2
+for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
+if %IGN_MAJOR_VERSION% GEQ 5 (
+  set DEPEN_PKGS=%DEPEN_PKGS% gdal
+)
+
 set COLCON_PACKAGE=ignition-common
 set COLCON_AUTO_MAJOR_VERSION=true
 

diff --git a/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat b/jenkins-scripts/ign_gazebo-default-devel-windows-amd64.bat
@@ -6,6 +6,10 @@ set PLATFORM_TO_BUILD=x86_amd64
 set IGN_CLEAN_WORKSPACE=true
 :: dlfcn
 set DEPEN_PKGS=dlfcn-win32 cuda cppzmq curl openssl jsoncpp ffmpeg freeimage ogre ogre2 ogre22 qt5 qwt gts glib fcl eigen3 ccd assimp libyaml libzip gflags protobuf tinyxml2 zeromq
+for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
+if %IGN_MAJOR_VERSION% GEQ 7 (
+  set DEPEN_PKGS=%DEPEN_PKGS% gdal
+)
 :: This needs to be migrated to DSL to get multi-major versions correctly
 set COLCON_PACKAGE=ignition-gazebo
 set COLCON_AUTO_MAJOR_VERSION=true

diff --git a/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat b/jenkins-scripts/ign_gui-default-devel-windows-amd64.bat
@@ -7,6 +7,10 @@ set IGN_CLEAN_WORKSPACE=true
 
 :: ogre2 from vcpkg-ports
 set DEPEN_PKGS=qt5 qt5-winextras qwt protobuf tinyxml2 freeimage ogre ogre22
+for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
+if %IGN_MAJOR_VERSION% GEQ 7 (
+  set DEPEN_PKGS=%DEPEN_PKGS% gdal
+)
 :: This needs to be migrated to DSL to get multi-major versions correctly
 set COLCON_PACKAGE=ignition-gui
 set COLCON_AUTO_MAJOR_VERSION=true

diff --git a/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat b/jenkins-scripts/ign_launch-default-devel-windows-amd64.bat
@@ -5,6 +5,10 @@ set PLATFORM_TO_BUILD=x86_amd64
 set IGN_CLEAN_WORKSPACE=true
 
 set DEPEN_PKGS=dlfcn-win32 cuda cppzmq curl openssl jsoncpp ffmpeg freeimage ogre ogre2 ogre22 qt5 qwt gts glib fcl eigen3 ccd assimp libyaml libzip gflags protobuf tinyxml2 zeromq
+for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
+if %IGN_MAJOR_VERSION% GEQ 6 (
+  set DEPEN_PKGS=%DEPEN_PKGS% gdal
+)
 set COLCON_PACKAGE=ignition-launch
 set COLCON_AUTO_MAJOR_VERSION=true
 

diff --git a/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat b/jenkins-scripts/ign_physics-default-devel-windows-amd64.bat
@@ -5,6 +5,10 @@ set PLATFORM_TO_BUILD=x86_amd64
 set IGN_CLEAN_WORKSPACE=true
 
 set DEPEN_PKGS=eigen3 tinyxml2
+for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
+if %IGN_MAJOR_VERSION% GEQ 6 (
+  set DEPEN_PKGS=%DEPEN_PKGS% gdal
+)
 :: This needs to be migrated to DSL to get multi-major versions correctly
 set COLCON_PACKAGE=ignition-physics
 set COLCON_AUTO_MAJOR_VERSION=true

diff --git a/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat b/jenkins-scripts/ign_rendering-default-devel-windows-amd64.bat
@@ -5,11 +5,14 @@ set VCS_DIRECTORY=ign-rendering
 set PLATFORM_TO_BUILD=x86_amd64
 set IGN_CLEAN_WORKSPACE=true
 
-set DEPEN_PKGS=boost-core dlfcn-win32 cuda eigen3 freeimage ogre ogre2 gts glib
+set DEPEN_PKGS=boost-core cuda dlfcn-win32 eigen3 freeimage glib gts ogre ogre2
 for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
 if %IGN_MAJOR_VERSION% GEQ 5 (
   set DEPEN_PKGS=%DEPEN_PKGS% ogre22
 )
+if %IGN_MAJOR_VERSION% GEQ 7 (
+  set DEPEN_PKGS=%DEPEN_PKGS% gdal
+)
 
 :: This needs to be migrated to DSL to get multi-major versions correctly
 set COLCON_PACKAGE=ignition-rendering

diff --git a/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat b/jenkins-scripts/ign_sensors-default-devel-windows-amd64.bat
@@ -6,6 +6,10 @@ set PLATFORM_TO_BUILD=x86_amd64
 set IGN_CLEAN_WORKSPACE=true
 
 set DEPEN_PKGS=protobuf tinyxml2
+for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%%i
+if %IGN_MAJOR_VERSION% GEQ 7 (
+  set DEPEN_PKGS=%DEPEN_PKGS% gdal
+)
 :: This needs to be migrated to DSL to get multi-major versions correctly
 set COLCON_PACKAGE=ignition-sensors
 set COLCON_AUTO_MAJOR_VERSION=true

diff --git a/jenkins-scripts/lib/windows_library.bat b/jenkins-scripts/lib/windows_library.bat
@@ -264,7 +264,7 @@ cd %VCPKG_OSRF_DIR%
 git pull origin master || goto :error
 popd
 
-%VCPKG_CMD% install "%1" --overlay-ports="%VCPKG_OSRF_DIR%"
+%VCPKG_CMD% install --recurse "%1" --overlay-ports="%VCPKG_OSRF_DIR%"
 goto :EOF
 
 :: ##################################