Merge branch 'dev' into berndgassmann/compile_ros2_against_unreal_dep…

…endencies

Util/BuildTools/BuildOSM2ODR.bat

@@ -99,12 +99,12 @@ if %REMOVE_INTERMEDIATE% == true (
 
 rem Build OSM2ODR
 if %BUILD_OSM2ODR% == true (
-
-    if  %GIT_PULL% == true (
-        if not exist "%OSM2ODR_SOURCE_PATH%" git clone --depth 1 -b %OSM2ODR_BRANCH% %OSM2ODR_REPO% %OSM2ODR_SOURCE_PATH%
-        cd "%OSM2ODR_SOURCE_PATH%"
-        git fetch
-        git checkout %CURRENT_OSM2ODR_COMMIT%
+    cd "%OSM2ODR_SOURCE_PATH%"
+    if not exist "%OSM2ODR_SOURCE_PATH%" (
+        curl --retry 5 --retry-max-time 120 -L -o OSM2ODR.zip https://github.com/carla-simulator/sumo/archive/%CURRENT_OSM2ODR_COMMIT%.zip
+        tar -xf OSM2ODR.zip
+        del OSM2ODR.zip
+        ren sumo-%CURRENT_OSM2ODR_COMMIT% %OSM2ODR_SOURCE_PATH%
     )
 
     if not exist "%OSM2ODR_VSPROJECT_PATH%" mkdir "%OSM2ODR_VSPROJECT_PATH%"

Util/BuildTools/BuildOSM2ODR.sh

@@ -91,14 +91,12 @@ if ${BUILD_OSM2ODR} ; then
         ${OSM2ODR_BASENAME}-server-install ${OSM2ODR_BASENAME}-client-install
 
     log "Building OSM2ODR."
-    if ${GIT_PULL} ; then
-      if [ ! -d ${OSM2ODR_BASENAME}-source ] ; then
-        git clone --depth 1 -b ${OSM2ODR_BRANCH} ${OSM2ODR_REPO} ${OSM2ODR_BASENAME}-source
-      fi
-      pushd ${OSM2ODR_BASENAME}-source >/dev/null
-      git fetch
-      git checkout ${CURRENT_OSM2ODR_COMMIT}
-      popd >/dev/null
+    if [ ! -d ${OSM2ODR_BASENAME}-source ] ; then
+      cd ${CARLA_BUILD_FOLDER}
+      curl --retry 5 --retry-max-time 120 -L -o OSM2ODR.zip https://github.com/carla-simulator/sumo/archive/${CURRENT_OSM2ODR_COMMIT}.zip
+      unzip -qq OSM2ODR.zip
+      rm -f OSM2ODR.zip
+      mv sumo-${CURRENT_OSM2ODR_COMMIT} ${OSM2ODR_BASENAME}-source
     fi
 
     mkdir -p ${OSM2ODR_BASENAME}-client-build