openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

refactor: set const for Reverse FQDN name to use for deployment on linux

Browse Source
This commit is contained in:
sithlord48
2025-09-29 19:00:18 -04:00
committed by Chris Rizzitello
parent dc86538456
commit 6f574a3076
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -89,6 +89,7 @@ set(CMAKE_PROJECT_PROPER_NAME "Deskflow")
set(CMAKE_PROJECT_VENDOR "${CMAKE_PROJECT_PROPER_NAME} Devs")
set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 ${CMAKE_PROJECT_VENDOR}")
set(CMAKE_PROJECT_CONTACT "${CMAKE_PROJECT_PROPER_NAME} <maintainers@deskflow.org>")
set(CMAKE_PROJECT_REV_FQDN "org.deskflow.deskflow")
#Unset the vars used in the project call
unset(DESKFLOW_VERSION_MAJOR)

6
deploy/linux/deploy.cmake
View File

@ -7,7 +7,7 @@ set(MY_DIR ${CMAKE_CURRENT_LIST_DIR})
# Install our desktop file
install(
FILES ${MY_DIR}/org.deskflow.deskflow.desktop
FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.desktop
DESTINATION share/applications
)
@ -15,12 +15,12 @@ install(
install(
FILES ${MY_DIR}/deskflow.png
DESTINATION share/icons/hicolor/512x512/apps/
RENAME org.deskflow.deskflow.png
RENAME ${CMAKE_PROJECT_REV_FQDN}.png
)
# Install our metainfo
install(
FILES ${MY_DIR}/org.deskflow.deskflow.metainfo.xml
FILES ${MY_DIR}/${CMAKE_PROJECT_REV_FQDN}.metainfo.xml
DESTINATION share/metainfo/
)

2
src/apps/deskflow-gui/CMakeLists.txt
View File

@ -20,7 +20,7 @@ elseif(APPLE)
set(BUNDLE_EXECUTABLE_NAME "${target}")
set(BUNDLE_BUNDLE_NAME "${target}")
set(BUNDLE_DISPLAY_NAME "${target}")
set(BUNDLE_GUI_IDENTIFIER "org.deskflow.deskflow")
set(BUNDLE_GUI_IDENTIFIER "${CMAKE_PROJECT_REV_FQDN}")
set(BUNDLE_ICON_FILE ${target}.icns)
set(BUNDLE_INFO_STRING "${CMAKE_PROJECT_DESCRIPTION}")
set(BUNDLE_COPYRIGHT "${CMAKE_PROJECT_COPYRIGHT}")

2
src/apps/deskflow-gui/deskflow-gui.cpp
View File

@ -59,7 +59,7 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationName(kAppName);
QCoreApplication::setApplicationVersion(kVersion);
QCoreApplication::setOrganizationDomain(kOrgDomain); // used in prefix, can't be a url
QGuiApplication::setDesktopFileName(QStringLiteral("org.deskflow.deskflow"));
QGuiApplication::setDesktopFileName(kRevFqdnName);
QApplication app(argc, argv);

1
src/lib/common/Constants.h.in
View File

@ -14,6 +14,7 @@ const auto kDaemonBinName = "@CMAKE_PROJECT_NAME@-daemon";
const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon";
const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log";
const auto kDefaultLogFile = "@CMAKE_PROJECT_NAME@.log";
const auto kRevFqdnName = "@CMAKE_PROJECT_REV_FQDN@";
const auto kCopyright = //
"Copyright @CMAKE_PROJECT_COPYRIGHT@\n"

3
src/lib/platform/XDGPortalRegistry.h
View File

@ -10,6 +10,7 @@
#include <QDBusInterface>
#include <QDBusReply>
#include "common/Constants.h"
#include "platform/Wayland.h"
namespace deskflow::platform {
@ -35,7 +36,7 @@ inline void setAppId()
return;
}
std::ignore = i->call("Register", "org.deskflow.deskflow", QVariantMap{});
std::ignore = i->call("Register", kRevFqdnName, QVariantMap{});
}
} // namespace deskflow::platform