fix spinner asset paths (#31524)

pull/31526/head
Adeeb Shihadeh 1 year ago committed by GitHub
parent 1c794b710c
commit 27c56722cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      selfdrive/ui/.gitignore
  2. 4
      selfdrive/ui/SConscript
  3. 6
      selfdrive/ui/spinner
  4. 6
      selfdrive/ui/text

@ -3,12 +3,13 @@ moc_*
translations/main_test_en.*
_text
_spinner
ui
mui
watch3
installer/installers/*
qt/text
qt/spinner
qt/setup/setup
qt/setup/reset
qt/setup/wifi

@ -72,8 +72,8 @@ asset_obj = qt_env.Object("assets", assets)
qt_env.SharedLibrary("qt/python_helpers", ["qt/qt_window.cc"], LIBS=qt_libs)
# spinner and text window
qt_env.Program("qt/text", ["qt/text.cc"], LIBS=qt_libs)
qt_env.Program("qt/spinner", ["qt/spinner.cc"], LIBS=qt_libs)
qt_env.Program("_text", ["qt/text.cc"], LIBS=qt_libs)
qt_env.Program("_spinner", ["qt/spinner.cc"], LIBS=qt_libs)
# build main UI
qt_env.Program("ui", qt_src + [asset_obj], LIBS=qt_libs)

@ -1,7 +1,7 @@
#!/bin/sh
if [ -f /TICI ] && [ ! -f qt/spinner ]; then
cp qt/spinner_larch64 qt/spinner
if [ -f /TICI ] && [ ! -f _spinner ]; then
cp qt/spinner_larch64 _spinner
fi
exec ./qt/spinner "$1"
exec ./_spinner "$1"

@ -1,7 +1,7 @@
#!/bin/sh
if [ -f /TICI ] && [ ! -f qt/text ]; then
cp qt/text_larch64 qt/text
if [ -f /TICI ] && [ ! -f _text ]; then
cp qt/text_larch64 _text
fi
exec ./qt/text "$1"
exec ./_text "$1"

Loading…
Cancel
Save