chore: rename project to dde-application-manager
rename project to dde-application-manager log:
This commit is contained in:
parent
d36a325b06
commit
80cf2501fa
@ -1,10 +1,12 @@
|
|||||||
cmake_minimum_required(VERSION 3.11)
|
cmake_minimum_required(VERSION 3.11)
|
||||||
|
|
||||||
project(deepin-application-manager)
|
project(dde-application-manager)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
#install settings
|
#install settings
|
||||||
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||||
set(CMAKE_INSTALL_PREFIX /usr)
|
set(CMAKE_INSTALL_PREFIX /usr)
|
||||||
@ -23,4 +25,4 @@ endif ()
|
|||||||
|
|
||||||
# qm files
|
# qm files
|
||||||
file(GLOB QM_FILES "translations/*.qm")
|
file(GLOB QM_FILES "translations/*.qm")
|
||||||
install(FILES ${QM_FILES} DESTINATION share/dde-application-manager/translations)
|
install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/dde-application-manager/translations)
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
add_subdirectory(systemd)
|
add_subdirectory(systemd)
|
||||||
add_subdirectory(dconf)
|
add_subdirectory(dconf)
|
||||||
add_subdirectory(service)
|
add_subdirectory(service)
|
||||||
|
|
||||||
|
@ -6,4 +6,4 @@ set(DCONFIG_FILES
|
|||||||
com.deepin.xsettings.json
|
com.deepin.xsettings.json
|
||||||
)
|
)
|
||||||
|
|
||||||
install(FILES ${DCONFIG_FILES} DESTINATION /usr/share/dsg/configs/dde-application-manager)
|
install(FILES ${DCONFIG_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/dsg/configs/dde-application-manager)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=dde application manager service
|
Description=DDE application manager service
|
||||||
RefuseManualStart=no
|
RefuseManualStart=no
|
||||||
RefuseManualStop=no
|
RefuseManualStop=no
|
||||||
#OnFailure=dde-session-shutdown.target
|
#OnFailure=dde-session-shutdown.target
|
||||||
@ -19,9 +19,8 @@ Before=dde-session-daemon.service
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
ExecStart=/usr/bin/deepin-application-manager
|
ExecStart=/usr/bin/dde-application-manager
|
||||||
TimeoutStartSec=infinity
|
TimeoutStartSec=infinity
|
||||||
Slice=components.slice
|
Slice=components.slice
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
RestartSec=300ms
|
RestartSec=300ms
|
||||||
|
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Deepin Application Loader is managing %I
|
Description=DDE Application Loader is managing %I
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
Environment="DAM_TASK_HASH=%I"
|
Environment="DAM_TASK_HASH=%I"
|
||||||
Environment="DAM_TASK_TYPE=freedesktop"
|
Environment="DAM_TASK_TYPE=freedesktop"
|
||||||
ExecStart=/usr/bin/deepin-application-loader
|
ExecStart=/usr/bin/dde-application-loader
|
||||||
Slice=applications.slice
|
Slice=applications.slice
|
@ -1,8 +1,8 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Deepin Application Manager service
|
Description=DDE Application Manager service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=DBus
|
Type=DBus
|
||||||
BusName=org.deepin.dde.Application1.Manager
|
BusName=org.deepin.dde.Application1.Manager
|
||||||
ExecStart=/usr/bin/deepin-application-manager
|
ExecStart=/usr/bin/dde-application-manager
|
||||||
Slice=services.slice
|
Slice=services.slice
|
@ -1,3 +1,5 @@
|
|||||||
|
set(BIN_NAME dde-application-loader)
|
||||||
|
|
||||||
pkg_check_modules(LIBCAP REQUIRED IMPORTED_TARGET libcap)
|
pkg_check_modules(LIBCAP REQUIRED IMPORTED_TARGET libcap)
|
||||||
|
|
||||||
set(SRCS
|
set(SRCS
|
||||||
@ -29,12 +31,12 @@ set(SRCS
|
|||||||
../modules/util/debug/debug.cpp
|
../modules/util/debug/debug.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(deepin-application-loader ${SRCS})
|
add_executable(${BIN_NAME} ${SRCS})
|
||||||
|
|
||||||
target_link_libraries(deepin-application-loader
|
target_link_libraries(${BIN_NAME}
|
||||||
pthread
|
pthread
|
||||||
PkgConfig::LIBCAP
|
PkgConfig::LIBCAP
|
||||||
stdc++fs
|
stdc++fs
|
||||||
Qt5::Core
|
Qt5::Core
|
||||||
)
|
)
|
||||||
install(TARGETS deepin-application-loader DESTINATION bin)
|
install(TARGETS ${BIN_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
|
@ -238,7 +238,7 @@ int main(int argc, char* argv[])
|
|||||||
}
|
}
|
||||||
|
|
||||||
char socketPath[50];
|
char socketPath[50];
|
||||||
sprintf(socketPath, "/run/user/%d/deepin-application-manager.socket", getuid());
|
sprintf(socketPath, "/run/user/%d/dde-application-manager.socket", getuid());
|
||||||
|
|
||||||
// register client and run quitConnect
|
// register client and run quitConnect
|
||||||
Socket::Client client;
|
Socket::Client client;
|
||||||
|
@ -2,6 +2,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
|
|
||||||
|
set(BIN_NAME dde-application-manager)
|
||||||
|
|
||||||
find_package(PkgConfig REQUIRED)
|
find_package(PkgConfig REQUIRED)
|
||||||
find_package(Qt5 REQUIRED COMPONENTS Core DBus Concurrent Gui)
|
find_package(Qt5 REQUIRED COMPONENTS Core DBus Concurrent Gui)
|
||||||
find_package(DtkCore REQUIRED)
|
find_package(DtkCore REQUIRED)
|
||||||
@ -41,27 +43,27 @@ file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../frameworkdbus/*.h" "../frameworkdbus/*.
|
|||||||
"../modules/*.h" "../modules/*.cpp" "../modules/*.hpp"
|
"../modules/*.h" "../modules/*.cpp" "../modules/*.hpp"
|
||||||
"../utils.h" "../utils/*.cpp")
|
"../utils.h" "../utils/*.cpp")
|
||||||
|
|
||||||
add_executable(deepin-application-manager
|
add_executable(${BIN_NAME}
|
||||||
${SRCS}
|
${SRCS}
|
||||||
${ADAPTER_SOURCES}
|
${ADAPTER_SOURCES}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(deepin-application-manager
|
target_link_libraries(${BIN_NAME}
|
||||||
Qt5::Core
|
Qt5::Core
|
||||||
Qt5::DBus
|
Qt5::DBus
|
||||||
Qt5::Concurrent
|
Qt5::Concurrent
|
||||||
${DtkCore_LIBRARIES}
|
Qt5::Gui
|
||||||
${DtkWidget_LIBRARIES}
|
Dtk::Core
|
||||||
pthread
|
pthread
|
||||||
PkgConfig::XCB
|
PkgConfig::XCB
|
||||||
PkgConfig::X11
|
PkgConfig::X11
|
||||||
PkgConfig::GIO
|
PkgConfig::GIO
|
||||||
PkgConfig::GLib
|
PkgConfig::GLib
|
||||||
PkgConfig::QGSettings
|
PkgConfig::QGSettings
|
||||||
${Qt5Gui_LIBRARIES}
|
${DtkWidget_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(deepin-application-manager PUBLIC
|
target_include_directories(${BIN_NAME} PUBLIC
|
||||||
PkgConfig::XCB
|
PkgConfig::XCB
|
||||||
PkgConfig::X11
|
PkgConfig::X11
|
||||||
PkgConfig::GIO
|
PkgConfig::GIO
|
||||||
@ -76,6 +78,6 @@ target_include_directories(deepin-application-manager PUBLIC
|
|||||||
)
|
)
|
||||||
|
|
||||||
# binary file
|
# binary file
|
||||||
install(TARGETS deepin-application-manager DESTINATION bin)
|
install(TARGETS ${BIN_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
|
|
||||||
add_definitions(-DQT_NO_KEYWORDS)
|
add_definitions(-DQT_NO_KEYWORDS)
|
||||||
|
@ -36,7 +36,7 @@ ApplicationManagerPrivate::ApplicationManagerPrivate(ApplicationManager* parent)
|
|||||||
, section("AppName")
|
, section("AppName")
|
||||||
, key("support")
|
, key("support")
|
||||||
{
|
{
|
||||||
const QString socketPath{QString("/run/user/%1/deepin-application-manager.socket").arg(getuid())};
|
const QString socketPath{QString("/run/user/%1/dde-application-manager.socket").arg(getuid())};
|
||||||
connect(&server, &Socket::Server::onReadyRead, this, &ApplicationManagerPrivate::recvClientData, Qt::QueuedConnection);
|
connect(&server, &Socket::Server::onReadyRead, this, &ApplicationManagerPrivate::recvClientData, Qt::QueuedConnection);
|
||||||
server.listen(socketPath.toStdString());
|
server.listen(socketPath.toStdString());
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user