blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Avoiding binary conflicts with existing AM

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe
2023-08-30 13:11:15 +08:00
committed by Comix
parent 3df26e4fc2
commit 0896f845a6
7 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
misc/CMakeLists.txt
View File

@ -5,13 +5,13 @@ include(GNUInstallDirs)
# # systemd service
configure_file(
systemd/user/org.deepin.dde.ApplicationManager.service.in
systemd/user/org.deepin.dde.ApplicationManager.service
systemd/user/org.deepin.dde.ApplicationManager1.service.in
systemd/user/org.deepin.dde.ApplicationManager1.service
@ONLY
)
set(SYSTEMD_USER_FILE
${CMAKE_CURRENT_BINARY_DIR}/systemd/user/org.deepin.dde.ApplicationManager.service
${CMAKE_CURRENT_BINARY_DIR}/systemd/user/org.deepin.dde.ApplicationManager1.service
)
install(FILES ${SYSTEMD_USER_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/user/)

2
misc/dbus/org.deepin.dde.ApplicationManager1.service.in
View File

@ -4,5 +4,5 @@
[D-BUS Service]
Name=org.deepin.dde.ApplicationManager1
Exec=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager
Exec=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager-reborn
SystemdService=org.deepin.dde.ApplicationManager1.service

3
misc/systemd/user/org.deepin.dde.ApplicationManager.service.in → misc/systemd/user/org.deepin.dde.ApplicationManager1.service.in
View File

@ -8,5 +8,6 @@ Description=Deepin Application Manager
[Service]
Type=dbus
BusName=org.deepin.dde.ApplicationManager1
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/dde-application-manager-reborn
Restart=always
Environment=QT_LOGGING_RULES="*.debug=false"