diff --git a/debian/rules b/debian/rules index 759787c45..7cf1f90c6 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,9 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall export DEB_CXXFLAGS_MAINT_APPEND = -Wall export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-E +# reproducible编译参数 +DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_BUILD_RPATH=ON + VERSION = $(DEB_VERSION_UPSTREAM) PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}') # Fix: invalid digit "8" in octal constant. e.g. u008 ==> 008 ==> 8 @@ -17,4 +20,4 @@ BUILD_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$2}' | sed 's/[^0- dh $@ override_dh_auto_configure: - dh_auto_configure -- -DDS_VERSION=${PACK_VER} + dh_auto_configure -- $(DEB_CMAKE_EXTRA_FLAGS) -DDS_VERSION=${PACK_VER} diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt index 725b01f5f..3909c5f73 100644 --- a/panels/dock/CMakeLists.txt +++ b/panels/dock/CMakeLists.txt @@ -161,7 +161,10 @@ target_include_directories(dock-plugin ) install(TARGETS dock-plugin DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/dock/") -install(DIRECTORY "${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/" DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/dock/") +install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/ DESTINATION ${QML_INSTALL_DIR}/org/deepin/ds/dock/ + FILES_MATCHING PATTERN "qmldir" PATTERN "*.qmltypes" PATTERN "*.qml" PATTERN "*.js" +) + dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.json) # compat dtk_add_config_meta_files(APPID org.deepin.ds.dock FILES dconfig/org.deepin.ds.dock.tray.json) # compat dtk_add_config_meta_files(APPID org.deepin.dde.shell FILES dconfig/org.deepin.ds.dock.json) diff --git a/panels/dock/tray/CMakeLists.txt b/panels/dock/tray/CMakeLists.txt index 97032f74c..9710ace45 100644 --- a/panels/dock/tray/CMakeLists.txt +++ b/panels/dock/tray/CMakeLists.txt @@ -56,5 +56,9 @@ target_link_libraries(trayitem PRIVATE dde-shell-frame ) +install(TARGETS dock-tray DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/dock/tray/") +install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/tray/ DESTINATION ${QML_INSTALL_DIR}/org/deepin/ds/dock/tray/ + FILES_MATCHING PATTERN "qmldir" PATTERN "*.qmltypes" PATTERN "*.qml" PATTERN "*.js" +) ds_install_package(PACKAGE org.deepin.ds.dock.tray TARGET trayitem) ds_handle_package_translation(PACKAGE org.deepin.ds.dock.tray) diff --git a/panels/dock/tray/quickpanel/CMakeLists.txt b/panels/dock/tray/quickpanel/CMakeLists.txt index d292cb81a..ef2440601 100644 --- a/panels/dock/tray/quickpanel/CMakeLists.txt +++ b/panels/dock/tray/quickpanel/CMakeLists.txt @@ -25,3 +25,8 @@ qt_add_qml_module(tray-quickpanel target_link_libraries(tray-quickpanel PRIVATE Dtk${DTK_VERSION_MAJOR}::Core ) + +install(TARGETS tray-quickpanel DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/dock/tray/quickpanel/") +install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/tray/quickpanel/ DESTINATION ${QML_INSTALL_DIR}/org/deepin/ds/dock/tray/quickpanel/ + FILES_MATCHING PATTERN "qmldir" PATTERN "*.qmltypes" PATTERN "*.qml" PATTERN "*.js" +) diff --git a/panels/notification/center/CMakeLists.txt b/panels/notification/center/CMakeLists.txt index b0a17b12f..01e76a3c2 100644 --- a/panels/notification/center/CMakeLists.txt +++ b/panels/notification/center/CMakeLists.txt @@ -59,7 +59,9 @@ target_link_libraries(notificationcenterpanel ) install(TARGETS notificationcenterpanelplugin DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/notificationcenter/") -install(DIRECTORY "${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/notificationcenter/" DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/notificationcenter/") +install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/notificationcenter/ DESTINATION ${QML_INSTALL_DIR}/org/deepin/ds/notificationcenter/ + FILES_MATCHING PATTERN "qmldir" PATTERN "*.qmltypes" PATTERN "*.qml" PATTERN "*.js" +) ds_install_package(PACKAGE org.deepin.ds.notificationcenter TARGET notificationcenterpanel) ds_handle_package_translation(PACKAGE org.deepin.ds.notificationcenter) diff --git a/panels/notification/plugin/CMakeLists.txt b/panels/notification/plugin/CMakeLists.txt index 79025890c..ab0476b0b 100644 --- a/panels/notification/plugin/CMakeLists.txt +++ b/panels/notification/plugin/CMakeLists.txt @@ -24,4 +24,6 @@ qt_add_qml_module(notificationplugin ) install(TARGETS notificationplugin DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/notification/") -install(DIRECTORY "${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/notification/" DESTINATION "${QML_INSTALL_DIR}/org/deepin/ds/notification/") +install(DIRECTORY ${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/notification/ DESTINATION ${QML_INSTALL_DIR}/org/deepin/ds/notification/ + FILES_MATCHING PATTERN "qmldir" PATTERN "*.qmltypes" PATTERN "*.qml" PATTERN "*.js" +)