p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create UE path variable without /../

This commit is contained in:
Xavier Solé Nogués 2024-04-24 15:30:28 +02:00 committed by Blyron
parent f0db576510
commit e16d1d0edc
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Setup.bat
View File

@ -1,3 +1,5 @@
SETLOCAL EnableDelayedExpansion
echo Starting Content Download... echo Starting Content Download...
if not exist "Unreal\CarlaUnreal\Content" mkdir Unreal\CarlaUnreal\Content if not exist "Unreal\CarlaUnreal\Content" mkdir Unreal\CarlaUnreal\Content
start cmd /c git -C Unreal/CarlaUnreal/Content clone -b ue5-dev https://bitbucket.org/carla-simulator/carla-content.git Carla start cmd /c git -C Unreal/CarlaUnreal/Content clone -b ue5-dev https://bitbucket.org/carla-simulator/carla-content.git Carla
@ -56,8 +58,12 @@ if exist "%CARLA_UNREAL_ENGINE_PATH%" (
echo Found UnrealEngine5 %CARLA_UNREAL_ENGINE_PATH% - OK echo Found UnrealEngine5 %CARLA_UNREAL_ENGINE_PATH% - OK
) else if exist ..\UnrealEngine5_carla ( ) else if exist ..\UnrealEngine5_carla (
echo Found UnrealEngine5 ..\UnrealEngine5_carla - OK echo Found UnrealEngine5 ..\UnrealEngine5_carla - OK
set CARLA_UNREAL_ENGINE_PATH=%cd:\=\\%\\..\\UnrealEngine5_carla pushd ..
setx CARLA_UNREAL_ENGINE_PATH %cd:\=\\%\\..\\UnrealEngine5_carla pushd UnrealEngine5_carla
set CARLA_UNREAL_ENGINE_PATH=!cd!
setx CARLA_UNREAL_ENGINE_PATH !cd!
popd
popd
REM TODO: Check if UnrealEngine binary file exists and if not build it REM TODO: Check if UnrealEngine binary file exists and if not build it
) else ( ) else (
echo Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - FAIL echo Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - FAIL
@ -71,8 +77,8 @@ if exist "%CARLA_UNREAL_ENGINE_PATH%" (
call GenerateProjectFiles.bat || exit /b call GenerateProjectFiles.bat || exit /b
echo Opening Visual Studio 2022... echo Opening Visual Studio 2022...
msbuild Engine\Intermediate\ProjectFiles\UE5.vcxproj /property:Configuration="Development_Editor" /property:Platform="x64" || exit /b msbuild Engine\Intermediate\ProjectFiles\UE5.vcxproj /property:Configuration="Development_Editor" /property:Platform="x64" || exit /b
set CARLA_UNREAL_ENGINE_PATH=%cd:\=\\%\\..\\UnrealEngine5_carla set CARLA_UNREAL_ENGINE_PATH=!cd!
setx CARLA_UNREAL_ENGINE_PATH %cd:\=\\%\\..\\UnrealEngine5_carla setx CARLA_UNREAL_ENGINE_PATH !cd!
popd popd
popd popd
) )

6
Setup.sh
View File

@ -72,9 +72,13 @@ fi
if [ ! -z $CARLA_UNREAL_ENGINE_PATH ] && [ -d $CARLA_UNREAL_ENGINE_PATH ]; then if [ ! -z $CARLA_UNREAL_ENGINE_PATH ] && [ -d $CARLA_UNREAL_ENGINE_PATH ]; then
echo "Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - OK" echo "Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - OK"
elif [ -d ../UnrealEngine5_carla ]; then elif [ -d ../UnrealEngine5_carla ]; then
pushd ..
pushd UnrealEngine5_carla
echo "Found UnrealEngine5 ../UnrealEngine5_carla - OK" echo "Found UnrealEngine5 ../UnrealEngine5_carla - OK"
export CARLA_UNREAL_ENGINE_PATH=$PWD/../UnrealEngine5_carla export CARLA_UNREAL_ENGINE_PATH=$PWD
echo -e '\n#CARLA UnrealEngine5\nexport CARLA_UNREAL_ENGINE_PATH='$CARLA_UNREAL_ENGINE_PATH >> ~/.bashrc echo -e '\n#CARLA UnrealEngine5\nexport CARLA_UNREAL_ENGINE_PATH='$CARLA_UNREAL_ENGINE_PATH >> ~/.bashrc
popd
popd
#TODO: Check if UnrealEngine binary file exists and if not build it #TODO: Check if UnrealEngine binary file exists and if not build it
else else
echo "Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - FAIL" echo "Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - FAIL"