Cook maps one by one in windows (slower but can package unlimited maps)

Jenkinsfile

@@ -94,8 +94,8 @@ pipeline
                         {
                             steps
                             {
-                                sh 'make package ARGS="--python-version=3.7,2 --chrono"'
-                                sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2"'
+                                sh 'make package ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"'
+                                sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2"'
                                 sh 'make examples ARGS="localhost 3654"'
                             }
                             post
@@ -298,7 +298,7 @@ pipeline
                                 """
                                 bat """
                                     call ../setEnv64.bat
-                                    make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt --target-archive=AdditionalMaps --clean-intermediate"
+                                    make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11 --target-archive=AdditionalMaps --clean-intermediate"
                                 """
                             }
                             post {

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Commandlet/PrepareAssetsForCookingCommandlet.cpp

@@ -485,10 +485,12 @@ void UPrepareAssetsForCookingCommandlet::GenerateMapPathsFile(
     const FString &PropsMapPath)
 {
   FString MapPathData;
+  FString MapPathDataLinux;
   IFileManager &FileManager = IFileManager::Get();
   for (const auto &Map : AssetsPaths.MapsPaths)
   {
-    MapPathData.Append(Map.Path + TEXT("/") + Map.Name + TEXT("+"));
+    MapPathData.Append(Map.Path + TEXT("/") + Map.Name + TEXT("\n"));
+    MapPathDataLinux.Append(Map.Path + TEXT("/") + Map.Name + TEXT("+"));
     TArray<FAssetData> AssetsData;
     UObjectLibrary* ObjectLibrary = UObjectLibrary::CreateLibrary(UWorld::StaticClass(), true, true);
     ObjectLibrary->LoadAssetDataFromPath(Map.Path);
@@ -499,7 +501,8 @@ void UPrepareAssetsForCookingCommandlet::GenerateMapPathsFile(
       FString AssetName = AssetData.AssetName.ToString();
       if (AssetName.Contains(Map.Name + "_Tile_"))
       {
-        MapPathData.Append(Map.Path + TEXT("/") + AssetName + TEXT("+"));
+        MapPathData.Append(Map.Path + TEXT("/") + AssetName + TEXT("\n"));
+        MapPathDataLinux.Append(Map.Path + TEXT("/") + AssetName + TEXT("+"));
         NumTiles++;
       }
     }
@@ -512,12 +515,14 @@ void UPrepareAssetsForCookingCommandlet::GenerateMapPathsFile(
   }
   else
   {
-    MapPathData.RemoveFromEnd(TEXT("+"));
+    MapPathDataLinux.RemoveFromEnd(TEXT("+"));
   }
 
   const FString SaveDirectory = FPaths::ProjectContentDir();
   const FString FileName = FString("MapPaths.txt");
+  const FString FileNameLinux = FString("MapPathsLinux.txt");
   SaveStringTextToFile(SaveDirectory, FileName, MapPathData, true);
+  SaveStringTextToFile(SaveDirectory, FileNameLinux, MapPathDataLinux, true);
 }
 
 void UPrepareAssetsForCookingCommandlet::GeneratePackagePathFile(const FString &PackageName)

Util/BuildTools/Package.bat

@@ -275,7 +275,7 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do (
 
         echo   - prepare
         REM # Prepare cooking of package
-        echo call "%UE4_ROOT%/Engine/Binaries/Win64/UE4Editor.exe " "%CARLAUE4_ROOT_FOLDER%/CarlaUE4.uproject" -run=PrepareAssetsForCooking -PackageName=!PACKAGE_NAME! -OnlyPrepareMaps=false
+        echo Prepare cooking of package: !PACKAGE_NAME!
         call "%UE4_ROOT%/Engine/Binaries/Win64/UE4Editor.exe "^
         "%CARLAUE4_ROOT_FOLDER%/CarlaUE4.uproject"^
         -run=PrepareAssetsForCooking^
@@ -286,15 +286,18 @@ for /f "tokens=* delims=" %%i in ("!PACKAGES!") do (
         set /p MAPS_TO_COOK=<%MAP_LIST_FILE%
 
         echo   - cook
-        REM # Cook maps
-        echo call "%UE4_ROOT%/Engine/Binaries/Win64/UE4Editor.exe " "%CARLAUE4_ROOT_FOLDER%/CarlaUE4.uproject" -run=cook -map="!MAPS_TO_COOK!" -cooksinglepackage -targetplatform="WindowsNoEditor" -OutputDir="!BUILD_FOLDER!"
-        call "%UE4_ROOT%/Engine/Binaries/Win64/UE4Editor.exe "^
-        "%CARLAUE4_ROOT_FOLDER%/CarlaUE4.uproject"^
-        -run=cook^
-        -map="!MAPS_TO_COOK!"^
-        -cooksinglepackage^
-        -targetplatform="WindowsNoEditor"^
-        -OutputDir="!BUILD_FOLDER!"
+        for /f "tokens=*" %%a in (%MAP_LIST_FILE%) do (
+            REM # Cook maps
+            echo Cooking: %%a
+            call "%UE4_ROOT%/Engine/Binaries/Win64/UE4Editor.exe "^
+            "%CARLAUE4_ROOT_FOLDER%/CarlaUE4.uproject"^
+            -run=cook^
+            -map="%%a"^
+            -targetplatform="WindowsNoEditor"^
+            -OutputDir="!BUILD_FOLDER!"^
+            -iterate^
+            -cooksinglepackage^
+        )
 
         REM remove the props folder if exist
         set PROPS_MAP_FOLDER="%PACKAGE_PATH%/Maps/PropsMap"

Util/BuildTools/Package.sh

@@ -215,7 +215,7 @@ fi
 # ==============================================================================
 
 PACKAGE_PATH_FILE=${CARLAUE4_ROOT_FOLDER}/Content/PackagePath.txt
-MAP_LIST_FILE=${CARLAUE4_ROOT_FOLDER}/Content/MapPaths.txt
+MAP_LIST_FILE=${CARLAUE4_ROOT_FOLDER}/Content/MapPathsLinux.txt
 
 for PACKAGE_NAME in "${PACKAGES[@]}" ; do if [[ ${PACKAGE_NAME} != "Carla" ]] ; then
 

Util/ContentVersions.txt

@@ -34,4 +34,4 @@
 0.9.9: 20200422_ea5179a
 0.9.10: 20200925_88f9ceb
 0.9.11: 20201222_232b876
-Latest: 20210728_075cb24
+Latest: 20210729_a572ad0