diff --git a/selfdrive/ui/.gitignore b/selfdrive/ui/.gitignore index f7178d8061..098cc6ef10 100644 --- a/selfdrive/ui/.gitignore +++ b/selfdrive/ui/.gitignore @@ -4,4 +4,4 @@ moc_* qt/text qt/spinner qt/setup/setup -qt/setup/installer +qt/setup/installer* diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index d91db27ebd..b8f3593e74 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -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) diff --git a/selfdrive/ui/qt/setup/installer.cc b/selfdrive/ui/qt/setup/installer.cc index ad0d1644b5..40b57a78e4 100644 --- a/selfdrive/ui/qt/setup/installer.cc +++ b/selfdrive/ui/qt/setup/installer.cc @@ -43,7 +43,7 @@ int fresh_clone() { return 0; } -int install() { +int install() { int err; // TODO: Disable SSH after install done