Skip to content

Commit 775a7d1

Browse files
revamp installation scripts to be cross-platform friendly
1 parent f5b02a8 commit 775a7d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1613
-37
lines changed

.gitignore

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.vscode/
2+
cache/
3+
Backups*
4+
Scripts/__pycache__
5+
Tools/Diagnostics/python/data/
6+
Tools/Diagnostics/results/
7+
Tools/LOD/WindowsLODs/
8+
Tools/LOD/WindowsLODs.zip
9+
Tools/LOD/LinuxLODs/
10+
Tools/LOD/LinuxLODs.zip
11+
Tools/LOD/OriginalLODs/
12+
Tools/LOD/OriginalLODs.zip

Configs/CarlaGameMode.uasset

-18.8 KB
Binary file not shown.

Docs/Install.md

+64-19

Makefile

+15-12
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,26 @@ default: help
33
help:
44
@less Scripts/DReyeVR.mk.help
55

6-
carla: install
6+
DReyeVR: install
77

88
install:
9-
@Scripts/install.sh --carla ${CARLA}
9+
python Scripts/install.py --carla ${CARLA} --scenario-runner ${SR}
1010

11-
# clean: # TODO: clean? (git reset --hard? git clean -fd?)
12-
# @Scripts/clean.sh
11+
clean:
12+
python Scripts/clean.py --carla ${CARLA} --scenario-runner ${SR} --verbose
1313

14-
# check: # TODO: make DReyeVR unit tests!
15-
# @Scripts/check.sh
14+
test:
15+
python Scripts/tests.py
1616

17-
sr: scenario-runner
18-
19-
scenario-runner:
20-
@Scripts/install.sh --scenario-runner ${SR}
17+
check: # TODO: make better DReyeVR unit tests!
18+
python Scripts/check_install.py --carla ${CARLA} --scenario-runner ${SR} --verbose
2119

2220
patch-sranipal:
23-
@Scripts/patch_sranipal.sh ${CARLA}
21+
python Scripts/patch_sranipal.py --carla ${CARLA}
22+
23+
rev: r-install
24+
25+
r-install:
26+
python Scripts/r-install.py --carla ${CARLA} --scenario-runner ${SR}
2427

25-
all: carla scenario-runner patch-sranipal
28+
all: install patch-sranipal check

Scripts/DReyeVR.mk.help

+25-6
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,40 @@ Use the following commands:
99

1010
Display this help message.
1111

12-
carla | install:
12+
DReyeVR | install:
1313

14-
Install necessary DReyeVR files to a working compatible CARLA installation.
15-
Requires a Carla path, use CARLA=/PATH/TO/CARLA
14+
Install necessary DReyeVR files to a working compatible CARLA/ScenarioRunner installation.
15+
Can specify Carla path with CARLA=/PATH/TO/CARLA
16+
Can specify ScenarioRunner path with SR=/PATH/TO/SCENARIO_RUNNER
17+
18+
check:
1619

17-
sr | scenario-runner
20+
Check a Carla/ScenarioRunner directory for the expected files in Scripts/Paths.
21+
Can specify Carla path with CARLA=/PATH/TO/CARLA
22+
Can specify ScenarioRunner path with SR=/PATH/TO/SCENARIO_RUNNER
1823

19-
Install necessary DReyeVR files to a working compatible ScenarioRunner installation.
20-
Requires a ScenarioRunner path, use SR=/PATH/TO/SCENARIO_RUNNER
24+
clean:
25+
26+
Clean a Carla/ScenarioRunner directory by replacing overwritten files with those in Backups/
27+
Also provides the option to hard-clean (use git to reset/clean) if desired.
28+
Can specify Carla path with CARLA=/PATH/TO/CARLA
29+
Can specify ScenarioRunner path with SR=/PATH/TO/SCENARIO_RUNNER
2130

2231
patch-sranipal:
2332

2433
Apply the patches required for building the SRanipal plugin in UE4.
2534
Requires a Carla path, use CARLA=/PATH/TO/CARLA
2635

36+
rev | r-install:
37+
38+
Copy files from the Carla/ScenarioRunner directory into DReyeVR. Useful for DReyeVR development.
39+
Can specify Carla path with CARLA=/PATH/TO/CARLA
40+
Can specify ScenarioRunner path with SR=/PATH/TO/SCENARIO_RUNNER
41+
42+
test:
43+
44+
Run the DReyeVR script unit tests
45+
2746
all:
2847

2948
Runs the carla installation, then scenario-runner, then the patche(s).

Scripts/Other/.gitignore

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
Build
2+
Dist
3+
Doxygen
4+
Deprecated/PythonClient/dist
5+
TrafficManager/build
6+
Util/Build
7+
Install
8+
Plugins
9+
# added by DReyeVR so only Carla plugins are tracked
10+
!Unreal/CarlaUE4/Plugins/Carla*
11+
12+
# added by DReyeVR so old builds can be ignored
13+
Build*
14+
15+
# added by DReyeVR so the frame captures are ignored
16+
Unreal/CarlaUE4/FrameCap
17+
18+
# added by DReyeVR to MacOS builds don't track the .xcworkspace
19+
Unreal/CarlaUE4/CarlaUE4.xcworkspace
20+
21+
# added by DReyeVR to ignore this auto-generated file
22+
Unreal/CarlaUE4/Config/OptionalModules.ini
23+
24+
/ExportedMaps
25+
/Import/*
26+
!/Import/README.md
27+
28+
*.VC.db
29+
*.VC.opendb
30+
*.a
31+
*.egg-info
32+
*.kdev4
33+
*.log
34+
*.o
35+
*.pb.cc
36+
*.pb.h
37+
*.pid
38+
*.pri
39+
*.pro
40+
*.py[cod]
41+
*.sln
42+
*.so
43+
*.stackdump
44+
*.sublime-workspace
45+
*.workspace
46+
*CodeCompletionFolders.txt
47+
*CodeLitePreProcessor.txt
48+
.aria2c.input
49+
.codelite
50+
.gdb_history
51+
.gtest
52+
.idea
53+
.tags*
54+
.vs
55+
.vscode
56+
__pycache__
57+
_benchmarks_results
58+
_images*
59+
_out*
60+
_site
61+
core
62+
profiler.csv

Scripts/Paths/DReyeVR.csv

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
DReyeVR,Unreal/CarlaUE4/Source/CarlaUE4/
2+
Configs/CarlaUE4.Build.cs,Unreal/CarlaUE4/Source/CarlaUE4
3+
Configs/Default*.ini,Unreal/CarlaUE4/Config/
4+
Configs/DReyeVRConfig.ini,Unreal/CarlaUE4/Config/
5+
Configs/CarlaUE4.uproject,Unreal/CarlaUE4/
6+
Blueprints/Vehicles,Unreal/CarlaUE4/Content/Carla/Blueprints/
7+
Blueprints/Game,Unreal/CarlaUE4/Content/Carla/Blueprints/
8+
Content/DReyeVR_Signs/*,Unreal/CarlaUE4/Content/DReyeVR/DReyeVR_Signs/
9+
Content/Custom/*,Unreal/CarlaUE4/Content/DReyeVR/Custom/
10+
Content/Default.Package.json,Unreal/CarlaUE4/Content/Carla/Config/
11+
Maps/*,Unreal/CarlaUE4/Content/Carla/Maps/
12+
LibCarla/Sensor/data/*,LibCarla/source/carla/sensor/data/
13+
LibCarla/Sensor/s11n/*,LibCarla/source/carla/sensor/s11n/
14+
LibCarla/SensorRegistry.h,LibCarla/source/carla/sensor/
15+
LibCarla/SensorData.cpp,PythonAPI/carla/source/libcarla/
16+
PythonAPI/*,PythonAPI/examples/
17+
Carla/Vehicle/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/
18+
Carla/Sensor/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/
19+
Carla/Game/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Game/
20+
Carla/Settings/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Settings/
21+
Carla/Traffic/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Traffic/
22+
Carla/Actor/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/
23+
Carla/Recorder/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Recorder/
24+
Carla/Weather/*,Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Weather/
25+
Tools/BuildTools/*.sh,Util/BuildTools/
26+
Tools/BuildTools/test_streaming.cpp,LibCarla/source/test/common/
27+
Scripts/Other/.gitignore,/

Scripts/Paths/README.md

+37

Scripts/Paths/ScenarioRunner.csv

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ScenarioRunner/run_experiment.py,/
2+
ScenarioRunner/route_scenario.py,srunner/scenarios
3+
ScenarioRunner/carla_data_provider.py,srunner/scenariomanager

0 commit comments

Comments
 (0)