From f5ba304cd6786337bb8bc1654d453de4d2ca370e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 27 Apr 2024 03:12:24 -0500 Subject: [PATCH] wip --- SConstruct | 26 ++++---------------------- update_and_launch.sh | 2 ++ 2 files changed, 6 insertions(+), 22 deletions(-) create mode 100644 update_and_launch.sh diff --git a/SConstruct b/SConstruct index b10a8f0..50dbda4 100644 --- a/SConstruct +++ b/SConstruct @@ -70,10 +70,6 @@ AddOption('--minimal', default=os.path.islink(Dir('#rednose/').abspath), # minimal by default on release branch (where rednose is not a link) help='the minimum build to run openpilot. no tests, tools, etc.') -AddOption('--nosr', - action='store_true', - help="don't build the screen recorder") - ## Architecture name breakdown (arch) ## - larch64: linux tici aarch64 ## - aarch64: linux pc aarch64 @@ -100,8 +96,6 @@ lenv = { rpath = lenv["LD_LIBRARY_PATH"].copy() if arch == "larch64": - lenv["LD_LIBRARY_PATH"] += ['/data/data/com.termux/files/usr/lib'] - cpppath = [ "#third_party/opencl/include", ] @@ -364,13 +358,6 @@ Export('common', 'gpucommon') # Build cereal and messaging SConscript(['cereal/SConscript']) -cereal = [File('#cereal/libcereal.a')] -messaging = [File('#cereal/libmessaging.a')] -visionipc = [File('#cereal/libvisionipc.a')] -messaging_python = [File('#cereal/messaging/messaging_pyx.so')] - -Export('cereal', 'messaging', 'messaging_python', 'visionipc') - # Build other submodules SConscript([ 'body/board/SConscript', @@ -397,17 +384,12 @@ if arch != "Darwin": # Build openpilot SConscript(['third_party/SConscript']) -SConscript(['selfdrive/boardd/SConscript']) -SConscript(['selfdrive/controls/lib/lateral_mpc_lib/SConscript']) -SConscript(['selfdrive/controls/lib/longitudinal_mpc_lib/SConscript']) -SConscript(['selfdrive/locationd/SConscript']) -SConscript(['selfdrive/navd/SConscript']) -SConscript(['selfdrive/modeld/SConscript']) -SConscript(['selfdrive/ui/SConscript']) +SConscript(['selfdrive/SConscript']) -if arch in ['x86_64', 'aarch64', 'Darwin'] and Dir('#tools/cabana/').exists() and GetOption('extras'): +if Dir('#tools/cabana/').exists() and GetOption('extras'): SConscript(['tools/replay/SConscript']) - SConscript(['tools/cabana/SConscript']) + if arch != "larch64": + SConscript(['tools/cabana/SConscript']) external_sconscript = GetOption('external_sconscript') if external_sconscript: diff --git a/update_and_launch.sh b/update_and_launch.sh new file mode 100644 index 0000000..a5b3f34 --- /dev/null +++ b/update_and_launch.sh @@ -0,0 +1,2 @@ +bash update.sh +bash launch_openpilot.sh