set path for extra qt bins on device (#27022)

* set path for extra qt bins on device

* no print

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: e883976a32
beeps
Adeeb Shihadeh 2 years ago committed by GitHub
parent ee307600e9
commit 6ab6b643a8
  1. 1
      SConstruct
  2. 11
      selfdrive/ui/SConscript

@ -311,6 +311,7 @@ else:
qt_libs = [f"Qt5{m}" for m in qt_modules] qt_libs = [f"Qt5{m}" for m in qt_modules]
if arch == "larch64": if arch == "larch64":
qt_libs += ["GLESv2", "wayland-client"] qt_libs += ["GLESv2", "wayland-client"]
qt_env.PrependENVPath('PATH', Dir("#third_party/qt5/larch64/bin/").abspath)
elif arch != "Darwin": elif arch != "Darwin":
qt_libs += ["GL"] qt_libs += ["GL"]

@ -74,13 +74,12 @@ translation_sources = [f"#selfdrive/ui/translations/{l}.ts" for l in languages.v
translation_targets = [src.replace(".ts", ".qm") for src in translation_sources] translation_targets = [src.replace(".ts", ".qm") for src in translation_sources]
lrelease_bin = 'third_party/qt5/larch64/bin/lrelease' if arch == 'larch64' else 'lrelease' lrelease_bin = 'third_party/qt5/larch64/bin/lrelease' if arch == 'larch64' else 'lrelease'
lupdate = qt_env.Command(translation_sources, qt_src, "selfdrive/ui/update_translations.py")
lrelease = qt_env.Command(translation_targets, translation_sources, f"{lrelease_bin} $SOURCES") lrelease = qt_env.Command(translation_targets, translation_sources, f"{lrelease_bin} $SOURCES")
if arch != 'larch64': qt_env.Depends(lrelease, lupdate)
lupdate = qt_env.Command(translation_sources, qt_src, "selfdrive/ui/update_translations.py") qt_env.NoClean(translation_sources)
qt_env.Depends(lrelease, lupdate) qt_env.Precious(translation_sources)
qt_env.NoClean(translation_sources) qt_env.NoCache(lupdate)
qt_env.Precious(translation_sources)
qt_env.NoCache(lupdate)
# setup and factory resetter # setup and factory resetter
if GetOption('extras'): if GetOption('extras'):

Loading…
Cancel
Save