Merge branch 'marcel/ue5.3' of https://github.com/carla-simulator/carla into marcel/ue5.3

Configure.py

@@ -4,6 +4,7 @@ from collections import deque
 import subprocess, tarfile, zipfile, argparse, requests, psutil, shutil, glob, json, sys, os
 
 # Constants:
+FALLBACK_CARLA_VERSION_STRING = '0.9.15'
 EXE_EXT = '.exe' if os.name == 'nt' else ''
 LIB_PREFIX = '' if os.name == 'nt' else 'lib'
 LIB_EXT = '.lib' if os.name == 'nt' else '.a'
@@ -24,7 +25,6 @@ CARLA_UE_PLUGIN_DEPENDENCIES_PATH = CARLA_UE_PLUGIN_ROOT_PATH / 'CarlaDependenci
 CARLA_UE_CONTENT_PATH = CARLA_UE_PATH / 'Content'
 CARLA_UE_CONTENT_CARLA_PATH = CARLA_UE_CONTENT_PATH / 'Carla'
 CARLA_UE_CONTENT_VERSIONS_FILE_PATH = WORKSPACE_PATH / 'Util' / 'ContentVersions.json'
-FALLBACK_CARLA_VERSION_STRING = '0.9.15'
 LOGICAL_PROCESSOR_COUNT = psutil.cpu_count(logical = True)
 DEFAULT_PARALLELISM = LOGICAL_PROCESSOR_COUNT + (2 if LOGICAL_PROCESSOR_COUNT >= 8 else 0)
 READTHEDOCS_URL_SUFFIX = 'how_to_build_on_windows/\n' if os.name == "nt" else 'build_linux/\n'
@@ -58,16 +58,16 @@ def FindExecutable(candidates : list):
   return None
 
 DEFAULT_C_COMPILER = FindExecutable([
-  'cl',
   'clang-cl',
+  'cl',
 ] if os.name == 'nt' else [
   'clang',
   'gcc',
 ])
 
 DEFAULT_CPP_COMPILER = FindExecutable([
-  'cl',
   'clang-cl',
+  'cl',
 ] if os.name == 'nt' else [
   'clang++',
   'g++',
@@ -281,7 +281,7 @@ ENABLE_RSS = ARGV.rss
 
 UPDATE_DEPENDENCIES = ARGV.update_deps
 BUILD_DEPENDENCIES = ARGV.build_deps
-UPDATE_CARLA_UE_ASSETS = ARGV.update_ue_assets or True
+UPDATE_CARLA_UE_ASSETS = ARGV.update_ue_assets
 PARALLELISM = ARGV.parallelism
 # Root paths:
 CARLA_VERSION_STRING = ARGV.version
@@ -607,7 +607,7 @@ CARLA_UE_ASSETS_DEPENDENCIES = [
   Dependency(
     'Carla',
     GitRepository(
-      'https://MarcelPi@bitbucket.org/carla-simulator/carla-content.git',
+      'https://bitbucket.org/carla-simulator/carla-content.git',
       tag_or_branch = 'marcel/5.3' # @CARLAUE5 This branch should be removed once merged.
     ))
 ]
@@ -696,14 +696,12 @@ class TaskGraph:
     return '\n'.join([ e.ToString() for e in self.tasks ])
   
   def Print(self):
-    print(self.ToString())
+    Log(self.ToString())
 
   def Execute(self, sequential : bool = False):
     if len(self.tasks) == 0:
       return
-    print(
-      '-- Running task graph --\n'
-      '')
+    Log('-- Running task graph --')
     self.Print()
     assert self.Validate()
     prior_sequential = self.sequential
@@ -771,7 +769,7 @@ class TaskGraph:
         Log(f'> {len(self.tasks) - done_count} did not complete: {pending_tasks}.')
         assert False
     finally:
-      print('-- Done --')
+      Log('-- Done --')
       self.sequential = prior_sequential
       self.Reset()
 
@@ -952,10 +950,12 @@ def BuildSQLite():
       cmd.extend([ '-o', SQLITE_EXE_PATH ])
     LaunchSubprocessImmediate(cmd, log_name = 'sqlite-exe-build')
   if not SQLITE_LIB_PATH.exists():
-    if C_COMPILER_IS_CLANG:
+    objs = []
+    BUILD_TEMP_PATH.mkdir(exist_ok = True)
+    for e in sqlite_sources:
       cmd = [
         C_COMPILER,
-        f'-fuse-ld={LIB}',
+        '-c' if C_COMPILER_CLI_TYPE == 'gnu' else '/c',
       ]
       cmd.extend([
         f'-std=c{C_STANDARD}',
@@ -968,42 +968,19 @@ def BuildSQLite():
         '/MD',
         '/EHsc',
       ])
-      if C_ENABLE_MARCH_NATIVE:
-        cmd.append('-march=native')
-      cmd.extend(sqlite_sources)
-      cmd.extend([ '/Fo:' if C_COMPILER_CLI_TYPE == 'msvc' else '-o', SQLITE_LIB_PATH ])
-      LaunchSubprocessImmediate(
-        cmd,
-        log_name = 'sqlite-lib-build')
-    else:
-      objs = []
-      BUILD_TEMP_PATH.mkdir(exist_ok = True)
-      for e in sqlite_sources:
-        cmd = [
-          C_COMPILER,
-          '-c' if C_COMPILER_CLI_TYPE == 'gnu' else '/c',
-        ]
-        cmd.extend([
-          f'-std=c{C_STANDARD}',
-          '-march=native',
-          '-O2',
-        ] if C_COMPILER_CLI_TYPE == 'gnu' else [
-          f'/std:c{C_STANDARD}',
-          '/O2',
-          '/Qvec',
-          '/MD',
-          '/EHsc',
-        ])
-        obj_path = BUILD_TEMP_PATH / f'{e.name}{OBJ_EXT}'
-        cmd.extend([ e, '/Fo:' if C_COMPILER_CLI_TYPE == 'msvc' else '-o', obj_path ])
-        LaunchSubprocessImmediate(cmd, log_name = f'sqlite-{e.stem}-build')
-        objs.append(obj_path)
-      cmd = [
-        LIB,
-        f'/OUT:{SQLITE_LIB_PATH}',
-      ]
-      cmd.extend(objs)
-      LaunchSubprocessImmediate(cmd, log_name = 'sqlite-lib-build')
+      obj_path = BUILD_TEMP_PATH / f'{e.name}{OBJ_EXT}'
+      if C_COMPILER_CLI_TYPE:
+        cmd.extend([ e, f'/Fo{obj_path}' ])
+      else:
+        cmd.extend([ e, '-o', obj_path ])
+      LaunchSubprocessImmediate(cmd, log_name = f'sqlite-{e.stem}-build')
+      objs.append(obj_path)
+    cmd = [
+      LIB,
+      f'/OUT:{SQLITE_LIB_PATH}',
+    ]
+    cmd.extend(objs)
+    LaunchSubprocessImmediate(cmd, log_name = 'sqlite-lib-build')
 
 
 
@@ -1348,7 +1325,7 @@ def SetupUnrealEngine(task_graph : TaskGraph):
 
 def UpdateCarlaUEAssets(task_graph : TaskGraph):
   CARLA_UE_CONTENT_PATH.mkdir(parents = True, exist_ok = True)
-  print('Cloning CARLA UE content...')
+  Log('Cloning CARLA UE content...')
   for e in CARLA_UE_ASSETS_DEPENDENCIES:
     UpdateDependency(e, CARLA_UE_CONTENT_CARLA_PATH)
     

PythonAPI/carla/setup.py.in

@@ -148,6 +148,7 @@ setup(
     license = LICENSE,
     description = 'Python API for communicating with the CARLA server.',
     long_description = readme,
+    long_description_content_type = 'text/markdown',
     url = 'https://github.com/carla-simulator/carla',
     author = 'The CARLA team',
     author_email = 'carla.simulator@gmail.com',

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs

@@ -7,6 +7,7 @@ using System.Diagnostics;
 using System.Collections.Generic;
 using UnrealBuildTool;
 using EpicGames.Core;
+using System.Xml.Linq;
 
 public class Carla :
 	ModuleRules
@@ -183,7 +184,7 @@ public class Carla :
             var LibPath = Path.Combine(InstallPath, "lib");
             var Candidates = Directory.GetFiles(LibPath, GetLibraryName(pattern));
 			if (Candidates.Length == 0)
-				Console.WriteLine(string.Format("Could not find any matching libraries for \"{0}\" using pattern \"{1}\"", name, pattern));
+                throw new FileNotFoundException(string.Format("Could not find any matching libraries for \"{0}\" using pattern \"{1}\"", name, pattern));
 			Array.Sort(Candidates);
 			return Candidates;
         };
@@ -221,16 +222,24 @@ public class Carla :
         }
 
         var SQLiteBuildPath = Path.Combine(DependenciesInstallPath, "sqlite-build");
-		var SQLiteLibrary = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("sqlite*"))[0];
+		var SQLiteLibraryCandidates = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("sqlite*"));
+        if (SQLiteLibraryCandidates.Length == 0)
+            throw new FileNotFoundException("Could not find any matching libraries for SQLite");
+		var RPCLibCandidates = FindLibraries("rpclib", "rpc");
+		var XercesCCandidates = FindLibraries("xercesc", "xerces-c*");
+		var PROJCandidates = FindLibraries("proj", "proj");
+		var ZlibCandidates = FindLibraries("zlib", "zlibstatic*");
+
 		var AdditionalLibraries = new List<string>
         {
             LibCarlaServerPath,
-            SQLiteLibrary,
-            FindLibraries("rpclib", "rpc")[0],
-            FindLibraries("xercesc", "xerces-c*")[0],
-            FindLibraries("proj", "proj")[0],
-            FindLibraries("zlib", "zlibstatic*")[0],
+			SQLiteLibraryCandidates[0],
+            RPCLibCandidates[0],
+            XercesCCandidates[0],
+            PROJCandidates[0],
+            ZlibCandidates[0],
         };
+
 		AdditionalLibraries.AddRange(BoostLibraries);
 
 		if (EnableOSM2ODR)

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Lights/CarlaLight.h

@@ -40,7 +40,7 @@ UENUM(BlueprintType, Meta = (Bitflags))
 enum class ECarlaLightFlags : uint8
 {
 	Default		= 0 UMETA(Hidden),
-	Registered	= 1,
+	Registered	= 1 UMETA(Hidden),
 	TurnedOn	= 2
 };
 

Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs

@@ -168,6 +168,8 @@ public class CarlaTools :
             var InstallPath = Path.Combine(DependenciesInstallPath, name + "-install");
             var LibPath = Path.Combine(InstallPath, "lib");
             var Candidates = Directory.GetFiles(LibPath, GetLibraryName(pattern));
+            if (Candidates.Length == 0)
+                throw new FileNotFoundException(string.Format("Could not find any matching libraries for \"{0}\" using pattern \"{1}\"", name, pattern));
             Array.Sort(Candidates);
             return Candidates;
         };
@@ -202,17 +204,22 @@ public class CarlaTools :
                 BoostLibraries.Add(Candidates[0]);
         }
 
-        // SQLite
         var SQLiteBuildPath = Path.Combine(DependenciesInstallPath, "sqlite-build");
-        var SQLiteLibrary = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("sqlite*"))[0];
-        
+        var SQLiteLibraryCandidates = Directory.GetFiles(SQLiteBuildPath, GetLibraryName("sqlite*"));
+        if (SQLiteLibraryCandidates.Length == 0)
+            throw new FileNotFoundException("Could not find any matching libraries for SQLite");
+        var RPCLibCandidates = FindLibraries("rpclib", "rpc");
+        var XercesCCandidates = FindLibraries("xercesc", "xerces-c*");
+        var PROJCandidates = FindLibraries("proj", "proj");
+        var ZlibCandidates = FindLibraries("zlib", "zlibstatic*");
+
         var AdditionalLibraries = new List<string>
         {
-            SQLiteLibrary,
-            FindLibraries("rpclib", "rpc")[0],
-            FindLibraries("xercesc", "xerces-c*")[0],
-            FindLibraries("proj", "proj")[0],
-            FindLibraries("zlib", "zlibstatic*")[0],
+            SQLiteLibraryCandidates[0],
+            RPCLibCandidates[0],
+            XercesCCandidates[0],
+            PROJCandidates[0],
+            ZlibCandidates[0],
         };
 
         if (EnableOSM2ODR)

requirements.txt

@@ -1 +1,2 @@
-psutil
+psutil
+requests