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

Minor changes. Disable MakeFiles.

This commit is contained in:
Marcel Pi 2024-03-06 16:28:09 +01:00
parent d0dce22ba1
commit a09ce91376
16 changed files with 83 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMake/CarlaDependencies.cmake
View File

@ -57,6 +57,7 @@ macro (carla_dependency_add NAME URL TAG)
GIT_REPOSITORY ${URL} GIT_REPOSITORY ${URL}
GIT_TAG ${TAG} GIT_TAG ${TAG}
OVERRIDE_FIND_PACKAGE OVERRIDE_FIND_PACKAGE
${ARGN}
) )
list (APPEND CARLA_DEPENDENCIES ${NAME}) list (APPEND CARLA_DEPENDENCIES ${NAME})
endmacro () endmacro ()
@ -169,6 +170,15 @@ if (BUILD_OSM_WORLD_RENDERER)
) )
endif () endif ()
if (BUILD_CARLA_UE)
carla_dependency_add (
StreetMap
https://github.com/carla-simulator/StreetMap.git
${CARLA_STREETMAP_TAG}
SOURCE_DIR ${CARLA_WORKSPACE_PATH}/Unreal/CarlaUnreal/Plugins/StreetMap
)
endif ()
# carla_dependency_add ( # carla_dependency_add (
# gtest # gtest
# https://github.com/google/googletest.git # https://github.com/google/googletest.git

15
CMake/CarlaOptions.cmake
View File

@ -250,3 +250,18 @@ carla_string_option (
"Target libosmscout git tag." "Target libosmscout git tag."
${CARLA_LIBOSMSCOUT_VERSION} ${CARLA_LIBOSMSCOUT_VERSION}
) )
# ==== STREETMAP ====
carla_string_option (
CARLA_STREETMAP_VERSION
"Target StreetMap version."
UE5Native
)
carla_string_option (
CARLA_STREETMAP_TAG
"Target StreetMap git tag."
${CARLA_LIBOSMSCOUT_VERSION}
)

2
Configure.py
View File

@ -1385,7 +1385,7 @@ def BuildCarlaUEMain():
if os.name == 'nt': if os.name == 'nt':
LaunchSubprocessImmediate([ LaunchSubprocessImmediate([
UNREAL_ENGINE_PATH / 'Engine' / 'Build' / 'BatchFiles' / 'Build.bat', UNREAL_ENGINE_PATH / 'Engine' / 'Build' / 'BatchFiles' / 'Build.bat',
'CarlaUE4Editor', 'CarlaUnrealEditor',
'Win64', 'Win64',
'Development', 'Development',
'-WaitMutex', '-WaitMutex',

2
Docs/build_faq.md
View File

@ -386,7 +386,7 @@ CARLA forum</a>
> This happens from time to time due to Linux updates. There is a special target in the Makefile for this issue. It takes a long time but fixes the issue: > This happens from time to time due to Linux updates. There is a special target in the Makefile for this issue. It takes a long time but fixes the issue:
> >
> make hard-clean > make hard-clean
> make CarlaUE4Editor > make CarlaUnrealEditor
<!-- ======================================================================= --> <!-- ======================================================================= -->

4
Docs/build_system.md
View File

@ -2,7 +2,7 @@
* [__Setup__](#setup) * [__Setup__](#setup)
* [__LibCarla__](#libcarla) * [__LibCarla__](#libcarla)
* [__CarlaUE4 and Carla plugin__](#carlaue4-and-carla-plugin) * [__CarlaUnreal and Carla plugin__](#carlaue4-and-carla-plugin)
* [__PythonAPI__](#pythonapi) * [__PythonAPI__](#pythonapi)
- [Versions 0.9.12+](#versions-0912) - [Versions 0.9.12+](#versions-0912)
- [Versions prior to 0.9.12](#versions-prior-to-0912) - [Versions prior to 0.9.12](#versions-prior-to-0912)
@ -65,7 +65,7 @@ Both compiled at the same step with Unreal Engine build tool. They require the `
Command Command
```sh ```sh
make CarlaUE4Editor make CarlaUnrealEditor
``` ```
To launch Unreal Engine's Editor run To launch Unreal Engine's Editor run

4
Jenkinsfile vendored
View File

@ -53,7 +53,7 @@ pipeline
{ {
sh 'make LibCarla' sh 'make LibCarla'
sh 'make PythonAPI ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' sh 'make PythonAPI ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"'
sh 'make CarlaUE4Editor ARGS="--chrono"' sh 'make CarlaUnrealEditor ARGS="--chrono"'
sh 'make plugins' sh 'make plugins'
sh 'make examples' sh 'make examples'
} }
@ -262,7 +262,7 @@ pipeline
""" """
bat """ bat """
call ../setEnv64.bat call ../setEnv64.bat
make CarlaUE4Editor ARGS="--chrono" make CarlaUnrealEditor ARGS="--chrono"
""" """
bat """ bat """
call ../setEnv64.bat call ../setEnv64.bat

15
Makefile
View File

@ -1,6 +1,9 @@
include Util/BuildTools/Vars.mk launch PythonAPI LibCarla CarlaUE4Editor CarlaUnrealEditor launch-only:
ifeq ($(OS),Windows_NT) @echo "MakeFile build is currently disabled."
include Util/BuildTools/Windows.mk
else # include Util/BuildTools/Vars.mk
include Util/BuildTools/Linux.mk # ifeq ($(OS),Windows_NT)
endif # include Util/BuildTools/Windows.mk
# else
# include Util/BuildTools/Linux.mk
# endif

30
Unreal/CMakeLists.txt
View File

@ -24,33 +24,29 @@ set (
${CARLA_UE_PATH}/CarlaUnreal.uproject ${CARLA_UE_PATH}/CarlaUnreal.uproject
) )
add_custom_target ( execute_process (
carla-ue-generate-project-files
ALL
DEPENDS
carla-server
COMMENT
"Generating Carla UE project files..."
COMMAND COMMAND
${CARLA_UE_GENERATE_PROJECT_SCRIPT} ${CARLA_UE_GENERATE_PROJECT_SCRIPT}
-project=${CARLA_UE_PROJECT_PATH} -project=${CARLA_UE_PROJECT_PATH}
-game -game
-engine -engine
-makefiles -makefiles
RESULT_VARIABLE
GENERATE_RPJECT_FILES_RESULT
) )
add_custom_target ( if (NOT ${GENERATE_RPJECT_FILES_RESULT})
carla-ue-build message (
ALL FATAL_ERROR
DEPENDS "Could not generate Unreal Engine project files."
carla-ue-generate-project-files )
COMMENT endif ()
"Building Carla UE..."
COMMAND
make -C ${CARLA_UE_PROJECT_PATH} CarlaUE4Editor
)
file ( file (
MAKE_DIRECTORY MAKE_DIRECTORY
${CARLA_UE_PATH}/Content/Carla/ExportedMaps ${CARLA_UE_PATH}/Content/Carla/ExportedMaps
)
add_subdirectory (
CarlaUnreal
) )

2
Util/BuildTools/BuildCarlaUE4.bat
View File

@ -184,7 +184,7 @@ if %BUILD_UE4_EDITOR% == true (
echo %FILE_N% Building Unreal Editor... echo %FILE_N% Building Unreal Editor...
call "%UE4_ROOT%Engine\Build\BatchFiles\Build.bat"^ call "%UE4_ROOT%Engine\Build\BatchFiles\Build.bat"^
CarlaUE4Editor^ CarlaUnrealEditor^
Win64^ Win64^
Development^ Development^
-WaitMutex^ -WaitMutex^

4
Util/BuildTools/BuildCarlaUE4.sh
View File

@ -114,7 +114,7 @@ if ${HARD_CLEAN} ; then
log "Doing a \"hard\" clean of the Unreal Engine project." log "Doing a \"hard\" clean of the Unreal Engine project."
make CarlaUE4Editor ARGS=-clean make CarlaUnrealEditor ARGS=-clean
fi fi
@ -200,7 +200,7 @@ if ${BUILD_CARLAUE4} ; then
fi fi
log "Build CarlaUnreal project." log "Build CarlaUnreal project."
make CarlaUE4Editor make CarlaUnrealEditor
#Providing the user with the ExportedMaps folder #Providing the user with the ExportedMaps folder
EXPORTED_MAPS="${CARLAUE4_ROOT_FOLDER}/Content/Carla/ExportedMaps" EXPORTED_MAPS="${CARLAUE4_ROOT_FOLDER}/Content/Carla/ExportedMaps"

24
Util/BuildTools/Linux.mk
View File

@ -5,18 +5,18 @@ help:
launch: LibCarla.server.release osm2odr downloadplugins launch: LibCarla.server.release osm2odr downloadplugins
@${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS)
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build --launch $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --build --launch $(ARGS)
launch-only: launch-only:
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --launch $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --launch $(ARGS)
import: CarlaUE4Editor PythonAPI import: CarlaUnrealEditor PythonAPI
@${CARLA_BUILD_TOOLS_FOLDER}/Import.sh $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/Import.sh $(ARGS)
package: CarlaUE4Editor PythonAPI package: CarlaUnrealEditor PythonAPI
@${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS)
package.rss: CarlaUE4Editor PythonAPI.rss.rebuild package.rss: CarlaUnrealEditor PythonAPI.rss.rebuild
@${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS)
docs: docs:
@ -27,23 +27,23 @@ clean.LibCarla:
@${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean
clean.PythonAPI: clean.PythonAPI:
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean
clean.CarlaUE4Editor: clean.CarlaUnrealEditor:
@${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS)
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --clean
clean.osm2odr: clean.osm2odr:
@${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean
clean: clean.CarlaUE4Editor clean.PythonAPI clean.LibCarla clean.osm2odr clean: clean.CarlaUnrealEditor clean.PythonAPI clean.LibCarla clean.osm2odr
rebuild: setup rebuild: setup
@${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --rebuild @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --rebuild
@${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --rebuild @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --rebuild
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild $(ARGS)
@${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --rebuild $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --rebuild $(ARGS)
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --rebuild $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --rebuild $(ARGS)
hard-clean: hard-clean:
@${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --clean $(ARGS)
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --hard-clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --hard-clean
@${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.sh --clean
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean
@${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean @${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean
@ -83,9 +83,9 @@ examples:
run-examples: run-examples:
@for D in ${CARLA_EXAMPLES_FOLDER}/*; do [ -d "$${D}" ] && make -C $${D} run.only; done @for D in ${CARLA_EXAMPLES_FOLDER}/*; do [ -d "$${D}" ] && make -C $${D} run.only; done
CarlaUE4Editor: LibCarla.server.release osm2odr downloadplugins CarlaUnrealEditor: LibCarla.server.release osm2odr downloadplugins
@${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildUE4Plugins.sh --build $(ARGS)
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --build $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.sh --build $(ARGS)
.PHONY: PythonAPI .PHONY: PythonAPI
PythonAPI: LibCarla.client.release osm2odr PythonAPI: LibCarla.client.release osm2odr

4
Util/BuildTools/Linux.mk.help
View File

@ -71,7 +71,7 @@ for developers:
Build (and run) the C++ client examples. Build (and run) the C++ client examples.
CarlaUE4Editor: CarlaUnrealEditor:
Build CarlaUnreal project, but do not launch the editor. Build CarlaUnreal project, but do not launch the editor.
@ -83,7 +83,7 @@ for developers:
Build LibCarla, "Server" and/or "Client" configurations. Build LibCarla, "Server" and/or "Client" configurations.
clean.(LibCarla|PythonAPI|CarlaUE4Editor) clean.(LibCarla|PythonAPI|CarlaUnrealEditor)
Remove intermediate build files for the specific module. Remove intermediate build files for the specific module.

4
Util/BuildTools/Package.bat
View File

@ -129,7 +129,7 @@ if %DO_PACKAGE%==true (
if not exist "!BUILD_FOLDER!" mkdir "!BUILD_FOLDER!" if not exist "!BUILD_FOLDER!" mkdir "!BUILD_FOLDER!"
call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^ call "%UE4_ROOT%\Engine\Build\BatchFiles\Build.bat"^
CarlaUE4Editor^ CarlaUnrealEditor^
Win64^ Win64^
Development^ Development^
-WaitMutex^ -WaitMutex^
@ -457,7 +457,7 @@ rem ============================================================================
:error_build_editor :error_build_editor
echo. echo.
echo %FILE_N% [ERROR] There was a problem while building the CarlaUE4Editor. echo %FILE_N% [ERROR] There was a problem while building the CarlaUnrealEditor.
echo [ERROR] Please read the screen log for more information. echo [ERROR] Please read the screen log for more information.
goto bad_exit goto bad_exit

16
Util/BuildTools/Windows.mk
View File

@ -16,17 +16,17 @@ help:
import: server import: server
@"${CARLA_BUILD_TOOLS_FOLDER}/Import.py" $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/Import.py" $(ARGS)
CarlaUE4Editor: LibCarla osm2odr CarlaUnrealEditor: LibCarla osm2odr
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --build $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --build $(ARGS)
launch: CarlaUE4Editor launch: CarlaUnrealEditor
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --launch $(ARGS)
launch-only: launch-only:
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --launch $(ARGS)
package: PythonAPI package: PythonAPI
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --at-least-write-optionalmodules $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --at-least-write-optionalmodules $(ARGS)
@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.26 $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.26 $(ARGS)
.PHONY: docs .PHONY: docs
@ -40,13 +40,13 @@ PythonAPI.docs:
clean: clean:
@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.26 @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.26
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --clean
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --clean
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --clean
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --clean
rebuild: setup rebuild: setup
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUnreal.bat" --rebuild
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --rebuild
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildOSM2ODR.bat" --rebuild
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --rebuild @"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --rebuild

4
Util/CARLA.sublime-project
View File

@ -59,13 +59,13 @@
"build_systems": "build_systems":
[ [
{ {
"name": "CARLA - make CarlaUE4Editor", "name": "CARLA - make CarlaUnrealEditor",
"working_dir": "${project_path}/..", "working_dir": "${project_path}/..",
"file_regex": "(Unreal\\/CarlaUnreal\\/[^:]*):([0-9]+):?([0-9]+)?:? (.*)$", "file_regex": "(Unreal\\/CarlaUnreal\\/[^:]*):([0-9]+):?([0-9]+)?:? (.*)$",
"syntax": "Packages/Makefile/Make Output.sublime-syntax", "syntax": "Packages/Makefile/Make Output.sublime-syntax",
"linux": "linux":
{ {
"shell_cmd": "CARLA_BUILD_NO_COLOR=true make CarlaUE4Editor" "shell_cmd": "CARLA_BUILD_NO_COLOR=true make CarlaUnrealEditor"
} }
}, },
{ {

2
Util/Docker/Carla.Dockerfile
View File

@ -10,7 +10,7 @@ RUN cd /home/carla/ && \
else git clone --depth 1 --branch $GIT_BRANCH https://github.com/carla-simulator/carla.git; fi && \ else git clone --depth 1 --branch $GIT_BRANCH https://github.com/carla-simulator/carla.git; fi && \
cd /home/carla/carla && \ cd /home/carla/carla && \
./Update.sh && \ ./Update.sh && \
make CarlaUE4Editor && \ make CarlaUnrealEditor && \
make PythonAPI && \ make PythonAPI && \
make build.utils && \ make build.utils && \
make package && \ make package && \