setup rest of installers

pull/2670/head
Adeeb Shihadeh 4 years ago
parent a5132e44f9
commit c01e2df2c0
  1. 2
      selfdrive/ui/.gitignore
  2. 11
      selfdrive/ui/SConscript
  3. 2
      selfdrive/ui/qt/setup/installer.cc

@ -4,4 +4,4 @@ moc_*
qt/text
qt/spinner
qt/setup/setup
qt/setup/installer
qt/setup/installer*

@ -88,4 +88,13 @@ else:
# setup and installer
if "BUILD_SETUP" in os.environ:
qt_env.Program("qt/setup/setup", ["qt/setup/setup.cc"], LIBS=qt_libs + ['curl'])
qt_env.Program("qt/setup/installer", ["qt/setup/installer.cc"], LIBS=qt_libs)
installers = [
("openpilot", "master"),
("openpilot_test", "master"),
#("dashcam", "dashcam"),
#("dashcam_test", "dashcam"),
]
for name, branch in installers:
flags = qt_env["CXXFLAGS"] + [f"-D{branch}"]
qt_env.Program(f"qt/setup/installer_{name}", ["qt/setup/installer.cc"], LIBS=qt_libs, CXXFLAGS=flags)

@ -43,7 +43,7 @@ int fresh_clone() {
return 0;
}
int install() {
int install() {
int err;
// TODO: Disable SSH after install done

Loading…
Cancel
Save