Skip to content

Choose correct Core binary in Daemon #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbolton merged 6 commits into from
Apr 28, 2026
+25 −4
Merged

Choose correct Core binary in Daemon #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f98f7d1
Use unified core
OwenMPhillips Apr 28, 2026
ef9bfef
feat: implement unified build support for watchdog command
nbolton Apr 28, 2026
f1a2880
fix: replace add_definitions with add_compile_definitions for BUILD_U…
nbolton Apr 28, 2026
cea9165
fix: move add_compile_definitions for BUILD_UNIFIED to configure_opti…
nbolton Apr 28, 2026
6ff27dc
fix: add missing newline before binName declaration in applyWatchdogC…
nbolton Apr 28, 2026
8755223
fix: update applyWatchdogCommand to support unified build command format
nbolton Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmake/Definitions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,8 @@ macro(configure_options)
option(BUILD_UNIFIED "Build unified binary" ${DEFAULT_BUILD_UNIFIED})
option(ENABLE_COVERAGE "Enable test coverage" ${DEFAULT_ENABLE_COVERAGE})

if(BUILD_UNIFIED)
add_compile_definitions(BUILD_UNIFIED)
endif()

endmacro()
25 changes: 21 additions & 4 deletions src/lib/deskflow/win32/DaemonApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,37 @@ void DaemonApp::setElevate(bool elevate)
void DaemonApp::applyWatchdogCommand() const
{
#if SYSAPI_WIN32
if (m_mode != "server" && m_mode != "client") {
LOG_ERR("cannot apply watchdog command: invalid or unset mode: %s", m_mode.toUtf8().constData());
return;
}

const auto appDir = QCoreApplication::applicationDirPath();

#ifdef BUILD_UNIFIED
const auto binName = QStringLiteral(CORE_BINARY_NAME ".exe");
#else
QString binName;
if (m_mode == "server") {
binName = QStringLiteral(SERVER_BINARY_NAME ".exe");
} else if (m_mode == "client") {
binName = QStringLiteral(CLIENT_BINARY_NAME ".exe");
} else {
LOG_ERR("cannot apply watchdog command: invalid or unset mode: %s", m_mode.toUtf8().constData());
}
#endif

const auto binPath = QStringLiteral("%1/%2").arg(appDir, binName);
if (!std::filesystem::exists(binPath.toStdString())) {
LOG_ERR("cannot apply watchdog command: binary does not exist at path: %s", binPath.toUtf8().constData());
return;
}

const auto binPath = QStringLiteral("%1/%2").arg(QCoreApplication::applicationDirPath(), binName);
#ifdef BUILD_UNIFIED
const auto command = QStringLiteral("\"%1\" %2 %3").arg(binPath, m_mode, m_args).toStdString();
#else
const auto command = QStringLiteral("\"%1\" %2").arg(binPath, m_args).toStdString();
#endif

LOG_DEBUG("applying watchdog command (elevate: %s)", m_elevate ? "yes" : "no");
LOG_INFO("running command (%s): %s", m_elevate ? "elevated" : "non-elevated", command.c_str());
m_pWatchdog->setProcessConfig(command, m_elevate);
#else
LOG_ERR("applying watchdog command not implemented on this platform");
Expand Down
Loading