Create carla package

Util/BuildTools/BuildCarlaUE4.bat

@@ -1,5 +1,4 @@
 @echo off
-
 setlocal
 
 set LOCAL_PATH=%~dp0
@@ -77,6 +76,13 @@ pushd "%CARLA_FOLDER%"
 
 if %REMOVE_INTERMEDIATE% == true (
     echo.
+
+    echo %FILE_N% cleaning "%CARLA_FOLDER%Saved"
+    if exist "%CARLA_FOLDER%Saved" rmdir /S /Q "%CARLA_FOLDER%Saved"
+
+    echo %FILE_N% cleaning "%CARLA_FOLDER%Build"
+    if exist "%CARLA_FOLDER%Build" rmdir /S /Q "%CARLA_FOLDER%Build"
+
     echo %FILE_N% cleaning "%CARLA_FOLDER%Binaries"
     if exist "%CARLA_FOLDER%Binaries" rmdir /S /Q "%CARLA_FOLDER%Binaries"
 
@@ -90,10 +96,6 @@ if %REMOVE_INTERMEDIATE% == true (
     if exist "%CARLA_FOLDER%Plugins\Carla\Intermediate" rmdir /S /Q "%CARLA_FOLDER%Plugins\Carla\Intermediate"
 )
 
-if %HARD_CLEAN% == true (
-    make CarlaUE4Editor
-)
-
 if %BUILD_CARLAUE4 == true (
     echo %FILE_N% Builing and launching Unreal Editor...
     call "%CARLA_FOLDER%CarlaUE4.uproject"

Util/BuildTools/BuildPythonAPI.bat

@@ -56,8 +56,8 @@ if not "%1"=="" (
 )
 
 set PYTHON_LIB_PATH=%ROOT_PATH%PythonAPI\
-set PYTHON_LIB_BUILD=%PYTHON_LIB_PATH%build
-set PYTHON_LIB_DEPENDENCIES=%PYTHON_LIB_PATH%dependencies
+set PYTHON_LIB_BUILD=%PYTHON_LIB_PATH%build\
+set PYTHON_LIB_DEPENDENCIES=%PYTHON_LIB_PATH%dependencies\
 
 if %REMOVE_INTERMEDIATE% == false (
     if %BUILD_FOR_PYTHON3% == false (
@@ -78,10 +78,11 @@ if %REMOVE_INTERMEDIATE% == true (
     if exist "%PYTHON_LIB_DEPENDENCIES%" rmdir /S /Q "%PYTHON_LIB_DEPENDENCIES%"
 
     echo %FILE_N% Cleaning "%PYTHON_LIB_PATH%\dist"
-    if exist "%PYTHON_LIB_PATH%\dist" rmdir /S /Q "%PYTHON_LIB_PATH%\dist"
+    if exist "%PYTHON_LIB_PATH%dist" rmdir /S /Q "%PYTHON_LIB_PATH%dist"
 )
 
 cd "%PYTHON_LIB_PATH%"
+if exist "%PYTHON_LIB_PATH%dist" goto already_installed
 
 rem ============================================================================
 rem -- Check for py ------------------------------------------------------------
@@ -111,7 +112,12 @@ rem ============================================================================
 
 :success
     echo.
-    if %BUILD_FOR_PYTHON3%==true echo %FILE_N% Carla lib for python has been successfully installed in "%PYTHON_LIB_PATH%\dist"!
+    if %BUILD_FOR_PYTHON3%==true echo %FILE_N% Carla lib for python has been successfully installed in "%PYTHON_LIB_PATH%dist"!
+    goto good_exit
+
+:already_installed
+    echo.
+    echo %FILE_N% already installed in "%PYTHON_LIB_PATH%dist"
     goto good_exit
 
 :py2_not_supported

Util/BuildTools/Package.bat

@@ -0,0 +1,88 @@
+@echo off
+setlocal enableextensions
+
+rem
+rem https://wiki.unrealengine.com/How_to_package_your_game_with_commands
+rem
+
+set LOCAL_PATH=%~dp0
+set "FILE_N=-[%~n0]:"
+
+
+rem Extract Unreal Engine root path
+rem
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\EpicGames\Unreal Engine\4.19"
+set VALUE_NAME=InstalledDirectory
+
+for /f %%i in ('git describe --tags --dirty --always') do set CARLA_VERSION=%%i
+if not defined CARLA_VERSION goto error_CARLA_VERSION
+
+for /f "usebackq tokens=3*" %%A in (`reg query %KEY_NAME%  /v %VALUE_NAME%`) do set UE4_ROOT=%%A%%B
+if not defined UE4_ROOT goto error_unreal_no_found
+
+set CARLA_OUTPUT_PATH=%INSTALLATION_DIR%UE4Carla/%CARLA_VERSION%
+if not exist "%CARLA_OUTPUT_PATH%" mkdir "%CARLA_OUTPUT_PATH%"
+
+rem ============================================================================
+rem -- Create Carla package ----------------------------------------------------
+rem ============================================================================
+
+call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^
+    CarlaUE4Editor^
+    Win64^
+    Development^
+    -WaitMutex^
+    -FromMsBuild^
+    "%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject"
+
+call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^
+    CarlaUE4^
+    Win64^
+    Development^
+    -WaitMutex^
+    -FromMsBuild^
+    "%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject"
+
+call "%UE4_ROOT%\Engine\Build\BatchFiles\RunUAT.bat"^
+    BuildCookRun^
+    -nocompileeditor^
+    -TargetPlatform=Win64^
+    -Platform=Win64^
+    -installed^
+    -nop4^
+    -project="%ROOT_PATH%Unreal/CarlaUE4/CarlaUE4.uproject"^
+    -cook^
+    -stage^
+    -build^
+    -archive^
+    -archivedirectory="%CARLA_OUTPUT_PATH%"^
+    -package^
+    -clientconfig=Development
+
+rem ============================================================================
+rem -- Messages and Errors -----------------------------------------------------
+rem ============================================================================
+
+:success
+    echo.
+    echo %FILE_N% Carla project successful exported to "%CARLA_OUTPUT_PATH%"!
+    goto good_exit
+
+:error_carla_version
+    echo.
+    echo Carla Version is not set
+    goto bad_exit
+
+:error_unreal_no_found
+    echo.
+    echo %FILE_N% Unreal Engine 4.19 not detected
+    goto bad_exit
+
+:good_exit
+    endlocal
+    exit /b 0
+
+:bad_exit
+    endlocal
+    exit /b 1
+

Util/BuildTools/Windows.mk

@@ -2,8 +2,11 @@ ARGS=--all
 
 default: help
 
-export ROOT_PATH=$(CURDIR)/# root of the project (makefile directory)
-export INSTALLATION_DIR=$(ROOT_PATH)Build/# dependecy install/build directory (rpclib, gtest, boost)
+# root of the project (makefile directory)
+export ROOT_PATH=$(CURDIR)/
+
+# dependecy install/build directory (rpclib, gtest, boost)
+export INSTALLATION_DIR=$(ROOT_PATH)Build/
 
 help:
 	@type "${CARLA_BUILD_TOOLS_FOLDER}\Linux.mk.help"
@@ -15,7 +18,7 @@ launch-only:
 	@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat --launch
 
 package: CarlaUE4Editor PythonAPI
-	@echo "Not implemented!"
+	@${CARLA_BUILD_TOOLS_FOLDER}/Package.bat
 
 docs:
 	@doxygen