sync: from linuxdeepin/dde-session-shell

.github/workflows/call-update-changelog.yml

@@ -0,0 +1,53 @@
+name: Call update changelog
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Target version; leave empty to auto bump"
+        required: false
+        type: string
+      name:
+        description: "Maintainer name used in debian/changelog"
+        required: true
+        type: string
+      email:
+        description: "Maintainer email used in debian/changelog"
+        required: true
+        type: string
+      base_branch:
+        description: "Base branch to read and target"
+        required: false
+        default: master
+        type: string
+      distribution:
+        description: "Changelog distribution"
+        required: false
+        default: unstable
+        type: string
+      create_pr:
+        description: "Create a pull request after generating changelog"
+        required: false
+        default: true
+        type: boolean
+
+jobs:
+  update_changelog:
+    uses: linuxdeepin/.github/.github/workflows/update-changelog.yml@master
+    with:
+      version: ${{ inputs.version }}
+      name: ${{ inputs.name }}
+      email: ${{ inputs.email }}
+      base_branch: ${{ inputs.base_branch }}
+      distribution: ${{ inputs.distribution }}
+      create_pr: ${{ inputs.create_pr }}
+    secrets: inherit
+
+  show_result:
+    runs-on: ubuntu-latest
+    needs: update_changelog
+    steps:
+      - name: Show update changelog result
+        run: |
+          echo "Version: ${{ needs.update_changelog.outputs.version }}"
+          echo "Pull Request URL: ${{ needs.update_changelog.outputs.pr_url }}"

CMakeLists.txt

@@ -6,6 +6,8 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX /usr)
 endif ()
 
+add_definitions(-DCMAKE_INSTALL_FULL_LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\")
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)

plugins/assist_login/CMakeLists.txt

@@ -20,4 +20,4 @@ aux_source_directory(. SRCS)
 add_library(${LIB_NAME} SHARED ${SRCS})
 
 add_subdirectory(interface)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/assist_login/interface/CMakeLists.txt

@@ -28,4 +28,4 @@ link_libraries(
 
 # 安装/user/lib
 install(FILES include/assist_login_interface.h DESTINATION /usr/include/dde-session-shell)
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-basic/CMakeLists.txt

@@ -81,4 +81,4 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
 set(CMAKE_INSTALL_PREFIX "/usr")
 
 # 设置执行 make install 时哪个目标应该被 install 到哪个位置
-install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-complex/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-fullManaged/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/login-plugins/login-udcp/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS} login-plugin.qrc)
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/tray-plugins/network/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/examples/tray-plugins/webview/CMakeLists.txt

@@ -23,4 +23,4 @@ target_link_libraries(${LIB_NAME} PRIVATE
     Qt${QT_VERSION_MAJOR}::WebEngineWidgets
 )
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

plugins/one-key-login/CMakeLists.txt

@@ -12,4 +12,4 @@ aux_source_directory(. SRCS)
 
 add_library(${LIB_NAME} SHARED ${SRCS})
 
-install(TARGETS ${LIB_NAME} LIBRARY DESTINATION lib/dde-session-shell/modules)
+install(TARGETS ${LIB_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dde-session-shell/modules)

src/global_util/plugin_manager/modules_loader.cpp

@@ -14,10 +14,10 @@
 #include <QMutexLocker>
 #include <QDBusInterface>
 
 #include <unistd.h>
 
-const QString ModulesDir = "/usr/lib/dde-session-shell/modules";
-const QString ModulesConfigDir = "/usr/lib/dde-session-shell/modules/config.d/";
+const QString ModulesDir = QString("%1/dde-session-shell/modules").arg(CMAKE_INSTALL_FULL_LIBDIR);
+const QString ModulesConfigDir = QString("%1/dde-session-shell/modules/config.d/").arg(CMAKE_INSTALL_FULL_LIBDIR);
 const QString LOWEST_VERSION = "1.1.0";
 const QString LoginType = "Login";
 const QString TrayType = "Tray";